use officecfg for Experimental flag

move IsShowOutlineContentVisibilityButton out of header to
avoid having to add extra include paths to all the unit
test makefiles.

Change-Id: I2763390e07cd85b8f09b6f2ad7702039daecb22f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105100
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 10 insertions, 14 deletions

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 97a9bf2d3040..6cdc10952c59 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -48,7 +48,6 @@
 #include <tools/urlobj.hxx>
 #include <rtl/math.hxx>
 #include <rtl/ustring.hxx>
-#include <svtools/miscopt.hxx>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
@@ -75,6 +74,7 @@
 #include <tokenarray.hxx>
 #include <scmatrix.hxx>
 #include <tokenstringcontext.hxx>
+#include <officecfg/Office/Common.hxx>
 
 using namespace formula;
 using namespace ::com::sun::star;
@@ -4304,8 +4304,7 @@ bool ScCompiler::NextNewToken( bool bInArray )
         bMayBeFuncName = rtl::isAsciiAlpha( cSymbol[0] );
         if (!bMayBeFuncName && (cSymbol[0] == '_' && cSymbol[1] == '_') && !utl::ConfigManager::IsFuzzing())
         {
-            SvtMiscOptions aOpt;
-            bMayBeFuncName = aOpt.IsExperimentalMode();
+            bMayBeFuncName = officecfg::Office::Common::Misc::ExperimentalMode::get();
         }
 
         bAsciiNonAlnum = !bMayBeFuncName && !rtl::isAsciiDigit( cSymbol[0] );
diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index 40fae3f3a9d0..b615830e4e56 100644
--- a/sc/source/core/tool/interpr7.cxx
+++ b/sc/source/core/tool/interpr7.cxx
@@ -16,13 +16,13 @@
 #include <formula/errorcodes.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/linkmgr.hxx>
-#include <svtools/miscopt.hxx>
 #include <tools/urlobj.hxx>
 
 #include <com/sun/star/ucb/XSimpleFileAccess3.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 
+#include <officecfg/Office/Common.hxx>
 #include <libxml/xpath.h>
 #include <datastreamgettime.hxx>
 #include <dpobject.hxx>
@@ -456,8 +456,7 @@ void ScInterpreter::ScDebugVar()
     // users.  This is a convenient way to extract arbitrary internal state to
     // a cell for easier debugging.
 
-    SvtMiscOptions aMiscOptions;
-    if (!aMiscOptions.IsExperimentalMode())
+    if (!officecfg::Office::Common::Misc::ExperimentalMode::get())
     {
         PushError(FormulaError::NoName);
         return;
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 636fa9dcc75c..96993618831c 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -116,7 +116,6 @@
 #include <comphelper/extract.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdocapt.hxx>
-#include <svtools/miscopt.hxx>
 #include <vcl/svapp.hxx>
 
 #include <comphelper/processfactory.hxx>
@@ -155,6 +154,7 @@
 #include <memory>
 #include <vector>
 #include <vbahelper/vbaaccesshelper.hxx>
+#include <officecfg/Office/Common.hxx>
 
 namespace com::sun::star::uno { class XComponentContext; }
 
@@ -4329,8 +4329,7 @@ void ScXMLExport::WriteDataStream()
     if (!pDoc)
         return;
 
-    SvtMiscOptions aMiscOptions;
-    if (!aMiscOptions.IsExperimentalMode())
+    if (!officecfg::Office::Common::Misc::ExperimentalMode::get())
         // Export this only in experimental mode.
         return;
 
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx
index fce701996f73..d1aaacf85ba0 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -13,7 +13,7 @@
 #include <sc.hrc>
 #include <defaultsoptions.hxx>
 #include <document.hxx>
-#include <svtools/miscopt.hxx>
+#include <officecfg/Office/Common.hxx>
 
 ScTpDefaultsOptions::ScTpDefaultsOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rCoreSet)
     : SfxTabPage(pPage, pController, "modules/scalc/ui/optdefaultpage.ui", "OptDefaultPage", &rCoreSet)
@@ -24,7 +24,7 @@ ScTpDefaultsOptions::ScTpDefaultsOptions(weld::Container* pPage, weld::DialogCon
     m_xEdNSheets->connect_changed( LINK(this, ScTpDefaultsOptions, NumModifiedHdl) );
     m_xEdSheetPrefix->connect_changed( LINK(this, ScTpDefaultsOptions, PrefixModifiedHdl) );
     m_xEdSheetPrefix->connect_focus_in( LINK(this, ScTpDefaultsOptions, PrefixEditOnFocusHdl) );
-    if (!SvtMiscOptions().IsExperimentalMode())
+    if (!officecfg::Office::Common::Misc::ExperimentalMode::get())
         m_xEdJumboSheets->hide();
 }
 
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 5866cad52d6b..f71b8f3678e4 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -31,7 +31,6 @@
 #include <svl/zforlist.hxx>
 #include <svl/stritem.hxx>
 #include <svl/visitem.hxx>
-#include <svtools/miscopt.hxx>
 #include <unotools/moduleoptions.hxx>
 
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
@@ -65,6 +64,7 @@
 #include <queryentry.hxx>
 #include <markdata.hxx>
 #include <documentlinkmgr.hxx>
+#include <officecfg/Office/Common.hxx>
 
 #include <o3tl/make_shared.hxx>
 #include <memory>
@@ -1199,8 +1199,7 @@ void ScCellShell::GetDBState( SfxItemSet& rSet )
             case SID_DATA_STREAMS_PLAY:
             case SID_DATA_STREAMS_STOP:
                 {
-                    SvtMiscOptions aMiscOptions;
-                    if ( !aMiscOptions.IsExperimentalMode() )
+                    if ( !officecfg::Office::Common::Misc::ExperimentalMode::get() )
                         rSet.DisableItem( nWhich );
                 }
                 break;