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>

13 files changed, 11 insertions, 29 deletions

diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index 2c4654751908..e953c6ee8edb 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -38,7 +38,7 @@ namespace basctl
 {
 
 
-SFX_IMPL_OBJECTFACTORY( DocShell, SvGlobalName(), SfxObjectShellFlags::STD_NORMAL, "sbasic" )
+SFX_IMPL_OBJECTFACTORY( DocShell, SvGlobalName(), "sbasic" )
 
 SFX_IMPL_SUPERCLASS_INTERFACE(basctl_DocShell, SfxObjectShell)
 
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
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 608e995cf19a..fabc04732a5d 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -186,7 +186,7 @@ void ScDocShell::InitInterface_Impl()
 }
 
 //  GlobalName of the current version:
-SFX_IMPL_OBJECTFACTORY( ScDocShell, SvGlobalName(SO3_SC_CLASSID), SfxObjectShellFlags::STD_NORMAL, "scalc" )
+SFX_IMPL_OBJECTFACTORY( ScDocShell, SvGlobalName(SO3_SC_CLASSID), "scalc" )
 
 
 void ScDocShell::FillClass( SvGlobalName* pClassName,
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index ef981118f6d3..4675aeb151a6 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -94,7 +94,6 @@ namespace sd {
 SFX_IMPL_OBJECTFACTORY(
     DrawDocShell,
     SvGlobalName(SO3_SIMPRESS_CLASSID),
-    SfxObjectShellFlags::STD_NORMAL,
     "simpress" )
 
 void DrawDocShell::Construct( bool bClipboard )
diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx
index 67948cce3cb7..09f72bb40226 100644
--- a/sd/source/ui/docshell/grdocsh.cxx
+++ b/sd/source/ui/docshell/grdocsh.cxx
@@ -46,7 +46,7 @@ void GraphicDocShell::InitInterface_Impl()
     GetStaticInterface()->RegisterChildWindow(SID_SEARCH_DLG);
 }
 
-SFX_IMPL_OBJECTFACTORY( GraphicDocShell, SvGlobalName(SO3_SDRAW_CLASSID_60), SfxObjectShellFlags::STD_NORMAL, "sdraw" )
+SFX_IMPL_OBJECTFACTORY( GraphicDocShell, SvGlobalName(SO3_SDRAW_CLASSID_60), "sdraw" )
 
 GraphicDocShell::GraphicDocShell(SfxObjectCreateMode eMode) :
     DrawDocShell(eMode, /*bDataObject*/true, DocumentType::Draw)
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index ba045e50b803..dd7c6974d7d8 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -77,11 +77,9 @@ SfxFilterContainer* SfxObjectFactory::GetFilterContainer() const
 SfxObjectFactory::SfxObjectFactory
 (
     const SvGlobalName&     rName,
-    SfxObjectShellFlags     nFlagsP,
     const OUString&         sName
 ) :    m_sFactoryName( sName ),
-       pImpl( new SfxObjectFactory_Impl ),
-       nFlags( nFlagsP )
+       pImpl( new SfxObjectFactory_Impl )
 {
     pImpl->pFilterContainer = new SfxFilterContainer( m_sFactoryName );
     pImpl->aClassName = rName;
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 0a7325fd79e5..ac2fd4eca9d3 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -238,7 +238,6 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell )
     ,nFlagsInProgress( SfxLoadedFlags::NONE )
     ,bModalMode( false )
     ,bRunningMacro( false )
-    ,eFlags( SfxObjectShellFlags::UNDEFINED )
     ,bReadOnlyUI( false )
     ,nStyleFilter( 0 )
     ,m_bEnableSetModified( true )
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index 006b938664ea..4f883c2f8d53 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -101,7 +101,6 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
     SfxLoadedFlags      nFlagsInProgress;
     bool                bModalMode;
     bool                bRunningMacro;
-    SfxObjectShellFlags eFlags;
     bool                bReadOnlyUI;
     tools::SvRef<SvRefBase>  xHeaderAttributes;
     ::rtl::Reference< SfxBaseModel >
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index a32525745cf1..81ca45a18026 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -96,7 +96,7 @@ void SmDocShell::InitInterface_Impl()
     GetStaticInterface()->RegisterPopupMenu("view");
 }
 
-SFX_IMPL_OBJECTFACTORY(SmDocShell, SvGlobalName(SO3_SM_CLASSID), SfxObjectShellFlags::STD_NORMAL, "smath" )
+SFX_IMPL_OBJECTFACTORY(SmDocShell, SvGlobalName(SO3_SM_CLASSID), "smath" )
 
 void SmDocShell::Notify(SfxBroadcaster&, const SfxHint& rHint)
 {
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index b91e5a912218..807b9b18799e 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -145,7 +145,7 @@ void SwDocShell::InitInterface_Impl()
 }
 
 
-SFX_IMPL_OBJECTFACTORY(SwDocShell, SvGlobalName(SO3_SW_CLASSID), SfxObjectShellFlags::STD_NORMAL|SfxObjectShellFlags::HASMENU, "swriter"  )
+SFX_IMPL_OBJECTFACTORY(SwDocShell, SvGlobalName(SO3_SW_CLASSID), "swriter"  )
 
 bool SwDocShell::InsertGeneratedStream(SfxMedium & rMedium,
         uno::Reference<text::XTextRange> const& xInsertPosition)
diff --git a/sw/source/uibase/globdoc/globdoc.cxx b/sw/source/uibase/globdoc/globdoc.cxx
index edbab35994b7..8538886af262 100644
--- a/sw/source/uibase/globdoc/globdoc.cxx
+++ b/sw/source/uibase/globdoc/globdoc.cxx
@@ -32,7 +32,7 @@
 // Description: Register all filters
 
 
-SFX_IMPL_OBJECTFACTORY( SwGlobalDocShell, SvGlobalName(SO3_SWGLOB_CLASSID), SfxObjectShellFlags::STD_NORMAL|SfxObjectShellFlags::HASMENU, "swriter/GlobalDocument" )
+SFX_IMPL_OBJECTFACTORY( SwGlobalDocShell, SvGlobalName(SO3_SWGLOB_CLASSID), "swriter/GlobalDocument" )
 
 SwGlobalDocShell::SwGlobalDocShell(SfxObjectCreateMode eMode ) :
         SwDocShell(eMode)
diff --git a/sw/source/uibase/web/wdocsh.cxx b/sw/source/uibase/web/wdocsh.cxx
index a36e29cebe86..6e100b58345a 100644
--- a/sw/source/uibase/web/wdocsh.cxx
+++ b/sw/source/uibase/web/wdocsh.cxx
@@ -49,7 +49,7 @@ void SwWebDocShell::InitInterface_Impl()
 }
 
 
-SFX_IMPL_OBJECTFACTORY(SwWebDocShell, SvGlobalName(SO3_SWWEB_CLASSID), SfxObjectShellFlags::STD_NORMAL|SfxObjectShellFlags::HASMENU, "swriter/web" )
+SFX_IMPL_OBJECTFACTORY(SwWebDocShell, SvGlobalName(SO3_SWWEB_CLASSID), "swriter/web" )
 
 SwWebDocShell::SwWebDocShell()
     : SwDocShell(SfxObjectCreateMode::STANDARD)