diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-09 15:24:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-10 09:48:06 +0200 |
| commit | 89dd3f80685c66883b6ed4efbf369f5aa2dc292e (patch) | |
| tree | 6edf1a741d079c88799df9219270798affd2ffa5 /sd/source/ui/docshell | |
| parent | 84482f5193ff0738563b6e91f66fc95fbc145de3 (diff) | |
convert SfxObjectCreateMode to scoped enum
and fix some dodgy usage in /sc in the process
Change-Id: Ia2bee267df31aba431fc8cb81195bb83e5b64deb
Diffstat (limited to 'sd/source/ui/docshell')
| -rw-r--r-- | sd/source/ui/docshell/docshel4.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/docshell/docshell.cxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 3eb55845f39e..f6531891be76 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -301,7 +301,7 @@ bool DrawDocShell::Load( SfxMedium& rMedium ) // space. Had to remove the check for empty VisArea below, // since XML load always sets a VisArea before. //TODO/LATER: looks a little bit strange! - if( ( GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) && SfxObjectShell::GetVisArea( ASPECT_CONTENT ).IsEmpty() ) + if( ( GetCreateMode() == SfxObjectCreateMode::EMBEDDED ) && SfxObjectShell::GetVisArea( ASPECT_CONTENT ).IsEmpty() ) { SdPage* pPage = mpDoc->GetSdPage( 0, PK_STANDARD ); @@ -517,7 +517,7 @@ bool DrawDocShell::Save() mpDoc->StopWorkStartupDelay(); //TODO/LATER: why this?! - if( GetCreateMode() == SFX_CREATE_MODE_STANDARD ) + if( GetCreateMode() == SfxObjectCreateMode::STANDARD ) SfxObjectShell::SetVisArea( Rectangle() ); bool bRet = SfxObjectShell::Save(); @@ -550,7 +550,7 @@ bool DrawDocShell::SaveAs( SfxMedium& rMedium ) mpDoc->StopWorkStartupDelay(); //TODO/LATER: why this?! - if( GetCreateMode() == SFX_CREATE_MODE_STANDARD ) + if( GetCreateMode() == SfxObjectCreateMode::STANDARD ) SfxObjectShell::SetVisArea( Rectangle() ); sal_uInt32 nVBWarning = ERRCODE_NONE; diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 5cdda0ff9bc5..8ad53d52e0a0 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -117,7 +117,7 @@ void DrawDocShell::Construct( bool bClipboard ) DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode, bool bDataObject, DocumentType eDocumentType) : - SfxObjectShell( eMode == SFX_CREATE_MODE_INTERNAL ? SFX_CREATE_MODE_EMBEDDED : eMode), + SfxObjectShell( eMode == SfxObjectCreateMode::INTERNAL ? SfxObjectCreateMode::EMBEDDED : eMode), mpDoc(NULL), mpUndoManager(NULL), mpPrinter(NULL), @@ -129,7 +129,7 @@ DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode, mbOwnPrinter(false), mbNewDocument( true ) { - Construct( eMode == SFX_CREATE_MODE_INTERNAL ); + Construct( eMode == SfxObjectCreateMode::INTERNAL ); } DrawDocShell::DrawDocShell( const sal_uInt64 nModelCreationFlags, bool bDataObject, DocumentType eDocumentType ) : @@ -151,7 +151,7 @@ DrawDocShell::DrawDocShell( const sal_uInt64 nModelCreationFlags, bool bDataObje DrawDocShell::DrawDocShell(SdDrawDocument* pDoc, SfxObjectCreateMode eMode, bool bDataObject, DocumentType eDocumentType) : - SfxObjectShell(eMode == SFX_CREATE_MODE_INTERNAL ? SFX_CREATE_MODE_EMBEDDED : eMode), + SfxObjectShell(eMode == SfxObjectCreateMode::INTERNAL ? SfxObjectCreateMode::EMBEDDED : eMode), mpDoc(pDoc), mpUndoManager(NULL), mpPrinter(NULL), @@ -163,7 +163,7 @@ DrawDocShell::DrawDocShell(SdDrawDocument* pDoc, SfxObjectCreateMode eMode, mbOwnPrinter(false), mbNewDocument( true ) { - Construct( eMode == SFX_CREATE_MODE_INTERNAL ); + Construct( eMode == SfxObjectCreateMode::INTERNAL ); } DrawDocShell::~DrawDocShell() |