diff options
| author | Tobias Lippert <drtl@fastmail.fm> | 2014-02-09 00:53:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-21 17:23:50 +0000 |
| commit | 076a7eacca48f203f0a8b9aa537e88fea9a88409 (patch) | |
| tree | cd95446ac0b80b29658fa2a44030dacb5304a63d /vcl/source/control/fixed.cxx | |
| parent | 1ec263e25d8606c70ac2089d5ceea22750d25daf (diff) | |
Bug #63962 Dynamically scan the config directory for icon themes
The hard-coded icon themes have been replaced by a dynamic list
which is filled by scanning the config directory
Conflicts:
include/vcl/settings.hxx
vcl/source/app/settings.cxx
vcl/source/window/window.cxx
Change-Id: Ie3680ffe27d06e375acf22753e036cb6ddabc4ed
Reviewed-on: https://gerrit.libreoffice.org/7935
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/control/fixed.cxx')
| -rw-r--r-- | vcl/source/control/fixed.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index fe988dd0637c..695d3ae6b8e7 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -1210,13 +1210,13 @@ const Image& FixedImage::GetModeImage( ) const Image FixedImage::loadThemeImage(const OString &rFileName) { static ImplImageTreeSingletonRef aImageTree; - OUString sCurrentSymbolsStyle = - Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); + OUString sIconTheme = + Application::GetSettings().GetStyleSettings().DetermineIconTheme(); const OUString sFileName(OStringToOUString(rFileName, RTL_TEXTENCODING_UTF8)); BitmapEx aBitmap; - bool bSuccess = aImageTree->loadImage(sFileName, sCurrentSymbolsStyle, aBitmap, true); + bool bSuccess = aImageTree->loadImage(sFileName, sIconTheme, aBitmap, true); SAL_WARN_IF(!bSuccess, "vcl.layout", "Unable to load " << sFileName - << " from theme " << sCurrentSymbolsStyle); + << " from theme " << sIconTheme); return Image(aBitmap); } |