summaryrefslogtreecommitdiff
path: root/vcl/source/app
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-05-29 15:03:44 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-05-29 15:05:25 +0100
commite9bb7c9e69999467a8dd5aa1683563228c619edc (patch)
tree2d254571a978ec3ab044118e1c342981de3ac99c /vcl/source/app
parent1950ad547462fface018aafe7b65d5ceb445648a (diff)
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
Diffstat (limited to 'vcl/source/app')
-rw-r--r--vcl/source/app/settings.cxx12
1 files changed, 6 insertions, 6 deletions
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;
}