Kaydet (Commit) 90b6e054 authored tarafından Caolán McNamara's avatar Caolán McNamara

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
(cherry picked from commit e9bb7c9e)
üst 4498247e
......@@ -3026,23 +3026,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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment