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 /include/sfx2 | |
| parent | 84482f5193ff0738563b6e91f66fc95fbc145de3 (diff) | |
convert SfxObjectCreateMode to scoped enum
and fix some dodgy usage in /sc in the process
Change-Id: Ia2bee267df31aba431fc8cb81195bb83e5b64deb
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/objsh.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 423e0fb4b39b..32aabff6fcef 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -143,14 +143,14 @@ enum HiddenWarningFact WhenCreatingPDF }; -enum SfxObjectCreateMode +enum class SfxObjectCreateMode { - SFX_CREATE_MODE_EMBEDDED, - SFX_CREATE_MODE_STANDARD, - SFX_CREATE_MODE_PREVIEW, - SFX_CREATE_MODE_ORGANIZER, - SFX_CREATE_MODE_PLUGIN, - SFX_CREATE_MODE_INTERNAL + EMBEDDED, + STANDARD, + PREVIEW, + ORGANIZER, + PLUGIN, + INTERNAL }; /* @@ -506,8 +506,8 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames(); vcl::Window* GetDialogParent( SfxMedium* pMedium=0 ); - static SfxObjectShell* CreateObject( const OUString& rServiceName, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); - static SfxObjectShell* CreateObjectByFactoryName( const OUString& rURL, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); + static SfxObjectShell* CreateObject( const OUString& rServiceName, SfxObjectCreateMode = SfxObjectCreateMode::STANDARD ); + static SfxObjectShell* CreateObjectByFactoryName( const OUString& rURL, SfxObjectCreateMode = SfxObjectCreateMode::STANDARD ); static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > CreateAndLoadComponent( const SfxItemSet& rSet, SfxFrame* pFrame = NULL ); static SfxObjectShell* GetShellFromComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xComp ); |