use more officecfg for SvtMiscOptions

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

4 files changed, 17 insertions, 21 deletions

diff --git a/framework/source/uielement/FixedImageToolbarController.cxx b/framework/source/uielement/FixedImageToolbarController.cxx
index 303913432cd1..c694cda3b853 100644
--- a/framework/source/uielement/FixedImageToolbarController.cxx
+++ b/framework/source/uielement/FixedImageToolbarController.cxx
@@ -57,7 +57,7 @@ FixedImageControl::FixedImageControl(vcl::Window* pParent, const OUString& rComm
 
     m_xWidget->connect_key_press(LINK(this, FixedImageControl, KeyInputHdl));
 
-    bool bBigImages(SvtMiscOptions().AreCurrentSymbolsLarge());
+    bool bBigImages(SvtMiscOptions::AreCurrentSymbolsLarge());
     auto xImage
         = Graphic(AddonsOptions().GetImageFromURL(rCommand, bBigImages, true)).GetXGraphic();
     m_xWidget->set_image(xImage);
@@ -82,7 +82,7 @@ FixedImageToolbarController::FixedImageToolbarController(
     const Reference<XComponentContext>& rxContext, const Reference<XFrame>& rFrame,
     ToolBox* pToolbar, ToolBoxItemId nID, const OUString& rCommand)
     : ComplexToolbarController(rxContext, rFrame, pToolbar, nID, rCommand)
-    , m_eSymbolSize(SvtMiscOptions().GetCurrentSymbolsSize())
+    , m_eSymbolSize(SvtMiscOptions::GetCurrentSymbolsSize())
 {
     m_pFixedImageControl = VclPtr<FixedImageControl>::Create(m_xToolbar, rCommand);
     m_xToolbar->SetItemWindow(m_nID, m_pFixedImageControl);
@@ -106,8 +106,7 @@ void FixedImageToolbarController::CheckAndUpdateImages()
 {
     SolarMutexGuard aSolarMutexGuard;
 
-    SvtMiscOptions aMiscOptions;
-    const sal_Int16 eNewSymbolSize = aMiscOptions.GetCurrentSymbolsSize();
+    const sal_Int16 eNewSymbolSize = SvtMiscOptions::GetCurrentSymbolsSize();
 
     if (m_eSymbolSize == eNewSymbolSize)
         return;
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 1ab3c0cf8de1..a91b0123a597 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -61,7 +61,7 @@ ImageButtonToolbarController::ImageButtonToolbarController(
     const OUString&                          aCommand ) :
     ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand )
 {
-    bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
+    bool bBigImages( SvtMiscOptions::AreCurrentSymbolsLarge() );
 
     Image aImage(AddonsOptions().GetImageFromURL(aCommand, bBigImages, true));
 
@@ -97,7 +97,7 @@ void ImageButtonToolbarController::executeControlCommand( const css::frame::Cont
             SubstituteVariables( aURL );
 
             Image aImage;
-            if ( ReadImageFromURL( SvtMiscOptions().AreCurrentSymbolsLarge(),
+            if ( ReadImageFromURL( SvtMiscOptions::AreCurrentSymbolsLarge(),
                                    aURL,
                                    aImage ))
             {
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index b5608310188c..edbd88d2250c 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -93,7 +93,7 @@ MenuBarManager::MenuBarManager(
     , m_bHasMenuBar( bHasMenuBar )
     , m_xContext(rxContext)
     , m_xURLTransformer(_xURLTransformer)
-    , m_sIconTheme( SvtMiscOptions().GetIconTheme() )
+    , m_sIconTheme( SvtMiscOptions::GetIconTheme() )
     , m_aAsyncSettingsTimer( "framework::MenuBarManager::Deactivate m_aAsyncSettingsTimer" )
 {
     m_xPopupMenuControllerFactory = frame::thePopupMenuControllerFactory::get(m_xContext);
@@ -580,7 +580,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu, bool )
     m_bActive = true;
 
     // Check if some modes have changed so we have to update our menu images
-    OUString sIconTheme = SvtMiscOptions().GetIconTheme();
+    OUString sIconTheme = SvtMiscOptions::GetIconTheme();
 
     if ( m_bRetrieveImages ||
          bShowMenuImages != m_bShowMenuImages ||
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 5278906f8eae..51855edd6402 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -124,11 +124,11 @@ namespace
 
 sal_Int16 getCurrentImageType()
 {
-    SvtMiscOptions aMiscOptions;
     sal_Int16 nImageType = css::ui::ImageType::SIZE_DEFAULT;
-    if (aMiscOptions.GetCurrentSymbolsSize() == SFX_SYMBOLS_SIZE_LARGE)
+    sal_Int16 nCurrentSymbolSize = SvtMiscOptions::GetCurrentSymbolsSize();
+    if (nCurrentSymbolSize == SFX_SYMBOLS_SIZE_LARGE)
         nImageType |= css::ui::ImageType::SIZE_LARGE;
-    else if (aMiscOptions.GetCurrentSymbolsSize() == SFX_SYMBOLS_SIZE_32)
+    else if (nCurrentSymbolSize == SFX_SYMBOLS_SIZE_32)
         nImageType |= css::ui::ImageType::SIZE_32;
     return nImageType;
 }
@@ -538,7 +538,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
     m_bDisposed( false ),
     m_bFrameActionRegistered( false ),
     m_bUpdateControllers( false ),
-    m_eSymbolSize(SvtMiscOptions().GetCurrentSymbolsSize()),
+    m_eSymbolSize(SvtMiscOptions::GetCurrentSymbolsSize()),
     m_nContextMinPos(0),
     m_pImpl( new VclToolBarManager( pToolBar ) ),
     m_pToolBar( pToolBar ),
@@ -547,7 +547,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
     m_xFrame( rFrame ),
     m_xContext( rxContext ),
     m_aAsyncUpdateControllersTimer( "framework::ToolBarManager m_aAsyncUpdateControllersTimer" ),
-    m_sIconTheme( SvtMiscOptions().GetIconTheme() )
+    m_sIconTheme( SvtMiscOptions::GetIconTheme() )
 {
     Init();
 }
@@ -560,7 +560,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
     m_bDisposed( false ),
     m_bFrameActionRegistered( false ),
     m_bUpdateControllers( false ),
-    m_eSymbolSize( SvtMiscOptions().GetCurrentSymbolsSize() ),
+    m_eSymbolSize( SvtMiscOptions::GetCurrentSymbolsSize() ),
     m_nContextMinPos(0),
     m_pImpl( new WeldToolBarManager( pToolBar, pBuilder ) ),
     m_pWeldedToolBar( pToolBar ),
@@ -568,7 +568,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
     m_xFrame( rFrame ),
     m_xContext( rxContext ),
     m_aAsyncUpdateControllersTimer( "framework::ToolBarManager m_aAsyncUpdateControllersTimer" ),
-    m_sIconTheme( SvtMiscOptions().GetIconTheme() )
+    m_sIconTheme( SvtMiscOptions::GetIconTheme() )
 {
     Init();
 }
@@ -636,8 +636,7 @@ void ToolBarManager::CheckAndUpdateImages()
     SolarMutexGuard g;
     bool bRefreshImages = false;
 
-    SvtMiscOptions aMiscOptions;
-    sal_Int16 eNewSymbolSize = aMiscOptions.GetCurrentSymbolsSize();
+    sal_Int16 eNewSymbolSize = SvtMiscOptions::GetCurrentSymbolsSize();
 
     if (m_eSymbolSize != eNewSymbolSize )
     {
@@ -645,7 +644,7 @@ void ToolBarManager::CheckAndUpdateImages()
         m_eSymbolSize = eNewSymbolSize;
     }
 
-    const OUString& sCurrentIconTheme = aMiscOptions.GetIconTheme();
+    const OUString& sCurrentIconTheme = SvtMiscOptions::GetIconTheme();
     if ( m_sIconTheme != sCurrentIconTheme )
     {
         bRefreshImages = true;
@@ -1630,8 +1629,6 @@ void ToolBarManager::RequestImages()
     Sequence< Reference< XGraphic > > aDocGraphicSeq;
     Sequence< Reference< XGraphic > > aModGraphicSeq;
 
-    SvtMiscOptions aMiscOptions;
-
     sal_Int16 nImageType = getCurrentImageType();
 
     if ( m_xDocImageManager.is() )
@@ -1652,7 +1649,7 @@ void ToolBarManager::RequestImages()
             // Try also to query for add-on images before giving up and use an
             // empty image.
             if ( !aImage )
-                aImage = Image(framework::AddonsOptions().GetImageFromURL(aCmdURLSeq[i], aMiscOptions.AreCurrentSymbolsLarge()));
+                aImage = Image(framework::AddonsOptions().GetImageFromURL(aCmdURLSeq[i], SvtMiscOptions::AreCurrentSymbolsLarge()));
 
             pIter->second.nImageInfo = 1; // mark image as module based
         }