diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-03 16:02:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-04 07:12:28 +0100 |
| commit | f3ba759663b85381cf5abeaeee8ffa2c7ca59bc5 (patch) | |
| tree | 310a068646b0c057d69346d7fbb07c5a5733ddfb /include/sfx2 | |
| parent | e909028cabf6d575f525283d089184555d56418f (diff) | |
remove unused enum SfxObjectShellFlags
Change-Id: I594e7beb3fb320b70ffe4dd98fee46c833f443dc
Reviewed-on: https://gerrit.libreoffice.org/64453
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/docfac.hxx | 8 | ||||
| -rw-r--r-- | include/sfx2/objsh.hxx | 11 |
2 files changed, 3 insertions, 16 deletions
diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx index cdde177c02c8..1efdc6f90578 100644 --- a/include/sfx2/docfac.hxx +++ b/include/sfx2/docfac.hxx @@ -45,14 +45,12 @@ class SFX2_DLLPUBLIC SfxObjectFactory private: const OUString m_sFactoryName; std::unique_ptr<SfxObjectFactory_Impl> pImpl; // Additional Data - SfxObjectShellFlags const nFlags; public: - SfxObjectFactory( const SvGlobalName &rName, SfxObjectShellFlags nFlags, const OUString& sFactoryName ); + SfxObjectFactory( const SvGlobalName &rName, const OUString& sFactoryName ); ~SfxObjectFactory(); const SvGlobalName& GetClassId() const; - SfxObjectShellFlags GetFlags() { return nFlags; } OUString GetFactoryURL() const; // shortcut for "private:factory/GetShortName()" const OUString& GetFactoryName() const { return m_sFactoryName; } OUString GetModuleName() const; @@ -90,10 +88,10 @@ public: \ static SfxObjectFactory& Factory(); \ virtual SfxObjectFactory& GetFactory() const override { return Factory(); } -#define SFX_IMPL_OBJECTFACTORY(ClassName,GlobName,Flags,ShortName) \ +#define SFX_IMPL_OBJECTFACTORY(ClassName,GlobName,ShortName) \ SfxObjectFactory& ClassName::Factory() \ { \ - static SfxObjectFactory aObjectFactory(GlobName, Flags, ShortName); \ + static SfxObjectFactory aObjectFactory(GlobName, ShortName); \ return aObjectFactory; \ } #endif // INCLUDED_SFX2_DOCFAC_HXX diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 9d6428680804..4a0175776032 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -113,17 +113,6 @@ namespace com { namespace sun { namespace star { } } } } -enum class SfxObjectShellFlags -{ - STD_NORMAL = 0x0000000, - HASMENU = 0x0000004, - UNDEFINED = 0xf000000 -}; -namespace o3tl -{ - template<> struct typed_flags<SfxObjectShellFlags> : is_typed_flags<SfxObjectShellFlags, 0xf000004> {}; -} - #define SFX_TITLE_TITLE 0 #define SFX_TITLE_FILENAME 1 #define SFX_TITLE_FULLNAME 2 |