strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

errors at merge corrected (!?!)

Browse source
This commit is contained in:
Armin Weiss 2000-10-31 14:24:57 +00:00
parent 3b89de2358
commit 06fe02817c
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sd/source/ui/docshell/docshel4.cxx
View file

@ -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 <svx/svxmsbas.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_SAVEOPT_HXX
#include <svtools/saveopt.hxx>
#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();
}