[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

[Jan Holesovsky]

 vcl/source/app/settings.cxx |   13 +++++++++++++
 1 file changed, 13 insertions(+)

New commits:
commit 5397a8ad5306a670355824f703da702f7401524a
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon May 25 11:39:42 2015 +0200

    tdf#90127: Read icon theme from the config when called too early.
    
    Change-Id: I9999150cafde6b103cf1a80232113b7a3d11cfdb

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index ff49e02..0f1a4b7 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -3026,6 +3026,19 @@ StyleSettings::SetIconTheme(const OUString& theme)
 OUString
 StyleSettings::DetermineIconTheme() const
 {
+    if (mxData->mIconTheme.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);
+
+            if (mxData->mIconTheme.isEmpty() || mxData->mIconTheme == "auto")
+                mxData->mIconTheme = GetAutomaticallyChosenIconTheme();
+        }
+    }
+
     OUString r = mxData->mIconThemeSelector->SelectIconTheme(
                         mxData->mIconThemeScanner->GetFoundIconThemes(),
                         mxData->mIconTheme