diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-12-10 12:30:44 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-12-10 15:39:15 +0000 |
| commit | 68fb533ed190d09b080b99fc80f5026afeae968d (patch) | |
| tree | 5cc550914e178bebd9780eaa0490c6f1deeafe02 | |
| parent | 7f3ea5e849356a4f1567121059570ce8ed28fedf (diff) | |
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 <momonasmon@gmail.com>
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
(cherry picked from commit f513a173152cb1c1afd7b700d1b264bc2ea6a5a8)
Reviewed-on: https://gerrit.libreoffice.org/20620
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/source/bitmap/CommandImageResolver.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/vcl/source/bitmap/CommandImageResolver.cxx b/vcl/source/bitmap/CommandImageResolver.cxx index 5c636d70c9bc..94bff8a93042 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]; |