vcl/source/bitmap/CommandImageResolver.cxx | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 68fb533ed190d09b080b99fc80f5026afeae968d
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Thu Dec 10 12:30:44 2015 +0200
tdf#96357 Switching icon theme doesn't update toolbar or statusbar
Regression of 6480b4d11a0cf2dd489d30b6290aa6d831704a45
Change-Id: I00141b3d9c5ea8dc813530a2ee095d61a35b3c04
Reviewed-on: https://gerrit.libreoffice.org/20591
Reviewed-by: Maxim Monastirsky <momonas...@gmail.com>
Tested-by: Maxim Monastirsky <momonas...@gmail.com>
(cherry picked from commit f513a173152cb1c1afd7b700d1b264bc2ea6a5a8)
Reviewed-on: https://gerrit.libreoffice.org/20620
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/bitmap/CommandImageResolver.cxx
b/vcl/source/bitmap/CommandImageResolver.cxx
index 5c636d7..94bff8a 100644
--- a/vcl/source/bitmap/CommandImageResolver.cxx
+++ b/vcl/source/bitmap/CommandImageResolver.cxx
@@ -8,11 +8,10 @@
*/
#include <vcl/CommandImageResolver.hxx>
-
+#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
#include <rtl/ustrbuf.hxx>
#include <tools/urlobj.hxx>
-#include <svtools/miscopt.hxx>
-#include <officecfg/Office/Common.hxx>
using css::uno::Sequence;
@@ -124,11 +123,11 @@ bool CommandImageResolver::hasImage(const OUString&
rCommandURL)
ImageList* CommandImageResolver::getImageList(sal_Int16 nImageType)
{
- const OUString& rIconTheme =
officecfg::Office::Common::Misc::SymbolStyle::get();
+ const OUString sIconTheme =
Application::GetSettings().GetStyleSettings().DetermineIconTheme();
- if (rIconTheme != m_sIconTheme)
+ if (sIconTheme != m_sIconTheme)
{
- m_sIconTheme = rIconTheme;
+ m_sIconTheme = sIconTheme;
for (sal_Int32 n = 0; n < ImageType_COUNT; ++n)
{
delete m_pImageList[n];
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
