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>

4 files changed, 10 insertions, 10 deletions

diff --git a/cui/source/dialogs/toolbarmodedlg.cxx b/cui/source/dialogs/toolbarmodedlg.cxx
index 7362ad22e54b..8c3e54bbe489 100644
--- a/cui/source/dialogs/toolbarmodedlg.cxx
+++ b/cui/source/dialogs/toolbarmodedlg.cxx
@@ -17,12 +17,12 @@
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/types.hxx>
 #include <dialmgr.hxx>
+#include <officecfg/Office/Common.hxx>
 #include <officecfg/Office/UI/ToolbarMode.hxx>
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <strings.hrc>
-#include <svtools/miscopt.hxx>
 #include <unotools/confignode.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/graphicfilter.hxx>
@@ -116,7 +116,7 @@ ToolbarmodeDialog::ToolbarmodeDialog(weld::Window* pParent)
     m_pApply->connect_clicked(LINK(this, ToolbarmodeDialog, OnApplyClick));
     m_pApplyAll->connect_clicked(LINK(this, ToolbarmodeDialog, OnApplyClick));
 
-    if (!SvtMiscOptions().IsExperimentalMode())
+    if (!officecfg::Office::Common::Misc::ExperimentalMode::get())
     {
         m_pRadioButtons[nGroupedbarFull]->set_visible(false);
         m_pRadioButtons[nContextualGroups]->set_visible(false);
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index b1b128a000c6..9685564187ea 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -277,7 +277,7 @@ OfaMiscTabPage::OfaMiscTabPage(weld::Container* pPage, weld::DialogController* p
 #if !ENABLE_GTK3
     m_xPrintDlgFrame->hide();
 #else
-    if (!SvtMiscOptions().IsExperimentalMode())
+    if (!officecfg::Office::Common::Misc::ExperimentalMode::get())
     {
         m_xPrintDlgFrame->hide();
     }
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 29b17c891c6b..3072fb71b757 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -472,8 +472,10 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
 
     if ( m_xExperimentalCB->get_state_changed_from_saved() )
     {
-        SvtMiscOptions aMiscOpt;
-        aMiscOpt.SetExperimentalMode( m_xExperimentalCB->get_active() );
+        std::shared_ptr< comphelper::ConfigurationChanges > xChanges(
+                comphelper::ConfigurationChanges::create());
+        officecfg::Office::Common::Misc::ExperimentalMode::set( m_xExperimentalCB->get_active(), xChanges );
+        xChanges->commit();
         bModified = true;
         RequestRestart( svtools::RESTART_REASON_EXP_FEATURES );
     }
@@ -582,7 +584,7 @@ void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/ )
     m_xJavaEnableCB->set_sensitive(false);
 #endif
 
-    m_xExperimentalCB->set_active( aMiscOpt.IsExperimentalMode() );
+    m_xExperimentalCB->set_active( officecfg::Office::Common::Misc::ExperimentalMode::get() );
     m_xExperimentalCB->save_state();
     m_xMacroCB->set_active(aMiscOpt.IsMacroRecorderMode());
     m_xMacroCB->save_state();
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index d4250052df3f..e2ec8ed927dd 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -91,7 +91,6 @@
 #include <svl/intitem.hxx>
 #include <svl/languageoptions.hxx>
 #include <svtools/helpopt.hxx>
-#include <svtools/miscopt.hxx>
 #include <svx/databaseregistrationui.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/urlobj.hxx>
@@ -1368,9 +1367,8 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
             // Disable Basic IDE options, if experimental features are not enabled
             if( RID_SVXPAGE_BASICIDE_OPTIONS == nPageId )
             {
-                    SvtMiscOptions aMiscOpt;
-                    if( ! aMiscOpt.IsExperimentalMode() )
-                        continue;
+                if( ! officecfg::Office::Common::Misc::ExperimentalMode::get() )
+                    continue;
             }
 
             AddTabPage( nPageId, sNewTitle, nGroup );