3 files changed, 8 insertions, 9 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 6e7ab0a96298..d44927415ed1 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -1130,8 +1130,7 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
 
                 case SID_TEMPLATE_MANAGER:
                     {
-                        SvtMiscOptions aMiscOptions;
-                        if ( !aMiscOptions.IsExperimentalMode() )
+                        if ( !officecfg::Office::Common::Misc::ExperimentalMode::get() )
                         {
                            rSet.DisableItem( nWhich );
                            rSet.Put( SfxVisibilityItem( nWhich, false ) );
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 68abca31ba61..256b328e4978 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/util/RevisionTag.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 
+#include <officecfg/Office/Common.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
@@ -242,8 +243,7 @@ void SfxVersionDialog::Init_Impl()
     m_xDeleteButton->set_sensitive(false);
     m_xCompareButton->set_sensitive(false);
 
-    SvtMiscOptions miscOptions;
-    if ( !miscOptions.IsExperimentalMode() )
+    if ( !officecfg::Office::Common::Misc::ExperimentalMode::get() )
         m_xCmisButton->hide( );
     uno::Reference<document::XCmisDocument> xCmisDoc(pObjShell->GetModel(), uno::UNO_QUERY);
     if (xCmisDoc && xCmisDoc->isVersionable())
diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx
index 6a383966c403..a1ff9752e1e0 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -22,6 +22,7 @@
 #include <sfx2/sidebar/ResourceManager.hxx>
 #include <sidebar/Tools.hxx>
 
+#include <officecfg/Office/Common.hxx>
 #include <officecfg/Office/UI/Sidebar.hxx>
 #include <unotools/confignode.hxx>
 #include <comphelper/lok.hxx>
@@ -99,8 +100,7 @@ css::uno::Sequence<OUString> BuildContextList (const ContextList& rContextList)
 ResourceManager::ResourceManager()
     : maDecks(),
       maPanels(),
-      maProcessedApplications(),
-      maMiscOptions()
+      maProcessedApplications()
 {
     ReadDeckList();
     ReadPanelList();
@@ -131,7 +131,7 @@ std::shared_ptr<DeckDescriptor> ResourceManager::ImplGetDeckDescriptor(const OUS
 {
     for (auto const& deck : maDecks)
     {
-        if (deck->mbExperimental && !maMiscOptions.IsExperimentalMode())
+        if (deck->mbExperimental && !officecfg::Office::Common::Misc::ExperimentalMode::get())
             continue;
         if (deck->msId == rsDeckId)
             return deck;
@@ -170,7 +170,7 @@ const ResourceManager::DeckContextDescriptorContainer& ResourceManager::GetMatch
     std::multimap<sal_Int32,DeckContextDescriptor> aOrderedIds;
     for (auto const& deck : maDecks)
     {
-        if (deck->mbExperimental && !maMiscOptions.IsExperimentalMode())
+        if (deck->mbExperimental && !officecfg::Office::Common::Misc::ExperimentalMode::get())
             continue;
 
         const DeckDescriptor& rDeckDescriptor (*deck);
@@ -207,7 +207,7 @@ const ResourceManager::PanelContextDescriptorContainer& ResourceManager::GetMatc
     for (auto const& panel : maPanels)
     {
         const PanelDescriptor& rPanelDescriptor (*panel);
-        if (rPanelDescriptor.mbExperimental && !maMiscOptions.IsExperimentalMode())
+        if (rPanelDescriptor.mbExperimental && !officecfg::Office::Common::Misc::ExperimentalMode::get())
             continue;
         if ( rPanelDescriptor.msDeckId != sDeckId )
             continue;