diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 13:22:10 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 13:22:10 +0000 |
| commit | 633134d9d56f07140fa5348205993592acb517ea (patch) | |
| tree | 8394d3d6e933bb59ad9495f949737be497db69f8 /sd/source/filter/sdfilter.cxx | |
| parent | ef0d93551148f9bb178cd37a9bf7cfa25c08ea5a (diff) | |
INTEGRATION: CWS aw024 (1.10.12); FILE MERGED
2006/09/21 22:47:47 aw 1.10.12.4: RESYNC: (1.12-1.13); FILE MERGED
2005/11/18 14:18:07 aw 1.10.12.3: RESYNC: (1.11-1.12); FILE MERGED
2005/09/17 10:26:06 aw 1.10.12.2: RESYNC: (1.10-1.11); FILE MERGED
2005/08/04 14:49:36 sj 1.10.12.1: #48467# using GraphicExporter component for exports, graphic filter progress now works now via xStatusIndicater instead of callback mechanism
Diffstat (limited to 'sd/source/filter/sdfilter.cxx')
| -rw-r--r-- | sd/source/filter/sdfilter.cxx | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index 16fa895f7385..2d1729e43758 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sdfilter.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: obo $ $Date: 2006-09-16 18:19:23 $ + * last change: $Author: ihi $ $Date: 2006-11-14 14:22:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -90,7 +90,6 @@ SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool mrDocShell( rDocShell ), mrDocument( *rDocShell.GetDoc() ), mxModel( rDocShell.GetModel() ), - mpProgress( NULL ), mbIsDraw( rDocShell.GetDocumentType() == DOCUMENT_TYPE_DRAW ), mbShowProgress( bShowProgress ) { @@ -100,8 +99,6 @@ SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool SdFilter::~SdFilter() { - if( !mrDocShell.HasSpecialProgress() ) - delete mpProgress; } // ----------------------------------------------------------------------------- @@ -170,16 +167,3 @@ void SdFilter::CreateStatusIndicator() // } } -// ----------------------------------------------------------------------------- - -void SdFilter::CreateProgress() -{ - if( mrDocShell.HasSpecialProgress() ) - mpProgress = mrDocShell.GetSpecialProgress(); - else - { - mpProgress = new SfxProgress( &mrDocShell, String( SdResId( STR_OPEN_DOCUMENT ) ), 100 ); - mpProgress->SetState( 0, 100 ); - } -} - |