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

#79429#: must changes (SfxOptions removed)

Browse source
This commit is contained in:
Kai Ahrens 2000-10-12 07:50:16 +00:00
parent 93f300efbb
commit eda93f71c3
4 changed files with 40 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,9 +2,9 @@
*
* $RCSfile: docshel4.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: ka $ $Date: 2000-09-21 16:11:43 $
* last change: $Author: ka $ $Date: 2000-10-12 08:46:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -135,6 +135,9 @@
#ifndef _SVXMSBAS_HXX
#include <svx/svxmsbas.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_SAVEOPT_HXX
#include <svtools/saveopt.hxx>
#endif
#pragma hdrstop
@ -590,9 +593,12 @@ 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 )
@ -713,9 +719,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 )

16
sd/source/ui/inc/optsitem.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: optsitem.hxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: ka $ $Date: 2000-10-11 10:23:07 $
* last change: $Author: ka $ $Date: 2000-10-12 08:47:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -71,12 +71,22 @@
#ifndef _SFX_SAVEOPT_HXX //autogen
#include <sfx2/saveopt.hxx>
#endif
#ifndef _SFXMODULE_HXX
#include <sfx2/module.hxx>
#endif
#ifndef _SFXAPP_HXX
#include <sfx2/app.hxx>
#endif
#ifndef _SFXSIDS_HRC
#include <sfx2/sfxsids.hrc>
#endif
#ifndef _SVX_OPTGRID_HXX //autogen
#include <svx/optgrid.hxx>
#endif
#ifndef _SVX_DLGUTIL_HXX
#include <svx/dlgutil.hxx>
#endif
// -----------------
// - Option ranges -
@ -206,7 +216,7 @@ public:
BOOL IsDragStripes() const { Init(); return (BOOL) bDragStripes; }
BOOL IsHandlesBezier() const { Init(); return (BOOL) bHandlesBezier; }
BOOL IsHelplines() const { Init(); return (BOOL) bHelplines; }
UINT16 GetMetric() const { Init(); return( ( 0xffff == nMetric ) ? SFX_APP()->GetOptions().GetMetric() : nMetric ); }
UINT16 GetMetric() const { Init(); return( ( 0xffff == nMetric ) ? GetModuleFieldUnit() : nMetric ); }
UINT16 GetDefTab() const { Init(); return nDefTab; }
void SetRulerVisible( BOOL bOn = TRUE ) { if( bRuler != bOn ) { OptionsChanged(); bRuler = bOn; } }

5
sd/source/ui/view/drawview.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: drawview.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: ka $ $Date: 2000-09-21 16:12:20 $
* last change: $Author: ka $ $Date: 2000-10-12 08:50:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1146,7 +1146,6 @@ void SdDrawView::SetPixelMode(BOOL bOn)
pDoc->SetScaleUnit(eMapUnit);
pDoc->SetUIUnit(eFieldUnit);
pDoc->GetItemPool().SetDefaultMetric(eSfxMapUnit);
SFX_APP()->GetOptions().SetMetric(eFieldUnit);
MapMode aMapMode = pDocSh->GetFrame()->GetWindow().GetMapMode();
aMapMode.SetMapUnit(eMapUnit);

16
sd/source/ui/view/drviews1.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: drviews1.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: ka $ $Date: 2000-09-21 16:12:21 $
* last change: $Author: ka $ $Date: 2000-10-12 08:50:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -696,8 +696,10 @@ SvxRuler* SdDrawViewShell::CreateHRuler(SdWindow* pWin, BOOL bIsFirst)
// Metric ...
UINT16 nMetric = pDoc->GetUIUnit();
if( nMetric == 0xffff )
nMetric = SFX_APP()->GetOptions().GetMetric(); // Metric der Applikation
nMetric = GetModuleFieldUnit();
pRuler->SetUnit( FieldUnit( nMetric ) );
// ... und auch DefTab am Lineal einstellen
@ -727,10 +729,12 @@ SvxRuler* SdDrawViewShell::CreateVRuler(SdWindow* pWin)
pRuler->SetSourceUnit(pWin->GetMapMode().GetMapUnit());
// Metric am Lineal einstellen
SdOptions* pOptions = SD_MOD()->GetSdOptions( pDoc->GetDocumentType() );
UINT16 nMetric = pOptions->GetMetric();
SdOptions* pOptions = SD_MOD()->GetSdOptions( pDoc->GetDocumentType() );
UINT16 nMetric = pOptions->GetMetric();
if( nMetric == 0xffff )
nMetric = SFX_APP()->GetOptions().GetMetric(); // Metric der Applikation
nMetric = GetModuleFieldUnit();
pRuler->SetUnit( FieldUnit( nMetric ) );
Fraction aUIScale(pWin->GetMapMode().GetScaleY());