diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 2c201206e8f7..ac17cb50138e 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docshel4.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: aw $ $Date: 2000-10-30 11:42:48 $ + * last change: $Author: aw $ $Date: 2000-10-31 15:24:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -132,6 +132,9 @@ #ifndef _SVXMSBAS_HXX #include #endif +#ifndef INCLUDED_SVTOOLS_SAVEOPT_HXX +#include +#endif #pragma hdrstop @@ -597,14 +600,16 @@ BOOL SdDrawDocShell::Save() } // komprimiert/native speichern? - BOOL bSaveCompressed = SFX_APP()->GetOptions().IsSaveGraphicsCompressed(); + SvtSaveOptions aOptions; + const SvtSaveOptions::SaveGraphicsMode eSaveMode( aOptions.GetSaveGraphicsMode() ); + const BOOL bSaveCompressed = ( SvtSaveOptions::SaveGraphicsCompressed == eSaveMode ); + const BOOL bSaveNative = ( SvtSaveOptions::SaveGraphicsOriginal == eSaveMode ); + pDoc->SetSaveCompressed( bSaveCompressed ); - BOOL bSaveNative = SFX_APP()->GetOptions().IsSaveOriginalGraphics(); pDoc->SetSaveNative( bSaveNative ); if( bRet ) { - // prepare saving, pre-processing of objects //-/ pDoc->PrepareStore(); pDoc->PreSave(); @@ -683,7 +688,6 @@ BOOL SdDrawDocShell::Save() if (bRet && GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) AddXMLAsZipToTheStorage( *pStor ); - // save complete, post-process objects pDoc->PostSave(); } @@ -726,9 +730,12 @@ BOOL SdDrawDocShell::SaveAs( SvStorage * pStor ) } } // komprimiert/native speichern? - BOOL bSaveCompressed = SFX_APP()->GetOptions().IsSaveGraphicsCompressed(); + SvtSaveOptions aOptions; + const SvtSaveOptions::SaveGraphicsMode eSaveMode( aOptions.GetSaveGraphicsMode() ); + const BOOL bSaveCompressed = ( SvtSaveOptions::SaveGraphicsCompressed == eSaveMode ); + const BOOL bSaveNative = ( SvtSaveOptions::SaveGraphicsOriginal == eSaveMode ); + pDoc->SetSaveCompressed( bSaveCompressed ); - BOOL bSaveNative = SFX_APP()->GetOptions().IsSaveOriginalGraphics(); pDoc->SetSaveNative( bSaveNative ); if (GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) @@ -755,7 +762,6 @@ BOOL SdDrawDocShell::SaveAs( SvStorage * pStor ) if (bRet) { - // prepare saving, pre-processing of objects //-/ pDoc->PrepareStore(); pDoc->PreSave(); @@ -820,7 +826,6 @@ BOOL SdDrawDocShell::SaveAs( SvStorage * pStor ) SetError( aStm->GetErrorCode() ); } - // save complete, post-process objects pDoc->PostSave(); }