diff options
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/sdpptwrp.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/app/sdxfer.cxx | 16 | ||||
| -rw-r--r-- | sd/source/ui/docshell/docshel3.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/docshell/docshel4.cxx | 6 |
4 files changed, 0 insertions, 28 deletions
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index 0eaf9934a22b..e2966aab3e8b 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -148,8 +148,6 @@ bool SdPPTFilter::Export() if ( rFilterOptions.IsEnablePPTPreview() ) nCnvrtFlags |= 0x8000; - mrDocument.SetSwapGraphicsMode( SdrSwapGraphicsMode::TEMP ); - CreateStatusIndicator(); //OUString sBaseURI( "BaseURI"); diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 2c873604aa30..560f5f0bee7d 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -457,22 +457,11 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo } else if( mpOLEDataHelper && mpOLEDataHelper->HasFormat( rFlavor ) ) { - SdrSwapGraphicsMode nOldSwapMode(SdrSwapGraphicsMode::DEFAULT); - - if( mpSdDrawDocumentIntern ) - { - nOldSwapMode = mpSdDrawDocumentIntern->GetSwapGraphicsMode(); - mpSdDrawDocumentIntern->SetSwapGraphicsMode( SdrSwapGraphicsMode::PURGE ); - } - // TODO/LATER: support all the graphical formats, the embedded object scenario should not have separated handling if( nFormat == SotClipboardFormatId::GDIMETAFILE && mpGraphic ) bOK = SetGDIMetaFile( mpGraphic->GetGDIMetaFile() ); else bOK = SetAny( mpOLEDataHelper->GetAny(rFlavor, rDestDoc) ); - - if( mpSdDrawDocumentIntern ) - mpSdDrawDocumentIntern->SetSwapGraphicsMode( nOldSwapMode ); } else if( HasFormat( nFormat ) ) { @@ -551,9 +540,6 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo { if( mpSdDrawDocumentIntern ) { - SdrSwapGraphicsMode nOldSwapMode = mpSdDrawDocumentIntern->GetSwapGraphicsMode(); - mpSdDrawDocumentIntern->SetSwapGraphicsMode( SdrSwapGraphicsMode::PURGE ); - if( !maDocShellRef.is() ) { maDocShellRef = new ::sd::DrawDocShell( @@ -567,8 +553,6 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo maDocShellRef->SetVisArea( maVisArea ); bOK = SetObject( maDocShellRef.get(), SDTRANSFER_OBJECTTYPE_DRAWOLE, rFlavor ); - - mpSdDrawDocumentIntern->SetSwapGraphicsMode( nOldSwapMode ); } } } diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index a9925bf5f13b..deb709850f45 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -231,11 +231,7 @@ void DrawDocShell::Execute( SfxRequest& rReq ) case SID_VERSION: { - const SdrSwapGraphicsMode nOldSwapMode = mpDoc->GetSwapGraphicsMode(); - - mpDoc->SetSwapGraphicsMode( SdrSwapGraphicsMode::TEMP ); ExecuteSlot( rReq, SfxObjectShell::GetStaticInterface() ); - mpDoc->SetSwapGraphicsMode( nOldSwapMode ); } break; diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 5b72517cec98..15c76777a9b6 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -635,10 +635,6 @@ bool DrawDocShell::ConvertTo( SfxMedium& rMedium ) if (xFilter) { - const SdrSwapGraphicsMode nOldSwapMode = mpDoc->GetSwapGraphicsMode(); - - mpDoc->SetSwapGraphicsMode( SdrSwapGraphicsMode::TEMP ); - if ( mpViewShell ) { ::sd::View* pView = mpViewShell->GetView(); @@ -647,8 +643,6 @@ bool DrawDocShell::ConvertTo( SfxMedium& rMedium ) } bRet = xFilter->Export(); - if( !bRet ) - mpDoc->SetSwapGraphicsMode( nOldSwapMode ); } } |