From e9bb7c9e69999467a8dd5aa1683563228c619edc Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 29 May 2015 15:03:44 +0100
Subject: fix base wizard size

if we are forced to fetch the theme early before the MiscSettings in svtools
sets it then don't cache the value so that when the MiscSettings kicks in that
the SettingsChanged signal is sent out and we get the right fontsize (or
something like that)

Change-Id: I0447c934ec184232591183c6c099a4d7217183fb
---
 vcl/source/app/settings.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'vcl/source/app')

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 5e67ba9c8204..0d324464cf9c 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -3028,23 +3028,23 @@ StyleSettings::SetIconTheme(const OUString& theme)
 OUString
 StyleSettings::DetermineIconTheme() const
 {
-    if (mxData->mIconTheme.isEmpty())
+    OUString sTheme(mxData->mIconTheme);
+    if (sTheme.isEmpty())
     {
         // read from the configuration, or fallback to what the desktop wants
         uno::Reference<uno::XComponentContext> xContext(comphelper::getProcessComponentContext());
         if (xContext.is())
         {
-            mxData->mIconTheme = officecfg::Office::Common::Misc::SymbolStyle::get(xContext);
+            sTheme = officecfg::Office::Common::Misc::SymbolStyle::get(xContext);
 
-            if (mxData->mIconTheme.isEmpty() || mxData->mIconTheme == "auto")
-                mxData->mIconTheme = GetAutomaticallyChosenIconTheme();
+            if (sTheme.isEmpty() || sTheme == "auto")
+                sTheme = GetAutomaticallyChosenIconTheme();
         }
     }
 
     OUString r = mxData->mIconThemeSelector->SelectIconTheme(
                         mxData->mIconThemeScanner->GetFoundIconThemes(),
-                        mxData->mIconTheme
-                        );
+                        sTheme);
     return r;
 }
 
-- 
cgit