diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-26 17:55:14 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-26 17:55:14 +0100 |
| commit | 6948c546fdc00dddec7d58e03150dcc87921d6b2 (patch) | |
| tree | cb0afa155279289cb8853f02bfbca97415f6aad4 /vcl/source/gdi/bitmapex.cxx | |
| parent | f5174c89cd037d35b975590083cf91b36633808d (diff) | |
tdf#75637: Resolve help images via a vnd.libreoffice.image UCP
...which uses the logic already available in VCL's ImplImageTree to locate the
image zip files and find fallbacks for incomplete themes and for localized
images.
Change-Id: Ic1c15fcacb6596a27a2b051093232902202bf472
Diffstat (limited to 'vcl/source/gdi/bitmapex.cxx')
| -rw-r--r-- | vcl/source/gdi/bitmapex.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 804e64616757..8fa1211498c5 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -24,6 +24,7 @@ #include <tools/stream.hxx> #include <tools/debug.hxx> #include <tools/rc.h> +#include <vcl/implimagetree.hxx> #include <vcl/salbtype.hxx> #include <vcl/outdev.hxx> #include <vcl/alpha.hxx> @@ -36,7 +37,6 @@ #include <vcl/settings.hxx> #include <image.h> -#include <impimagetree.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> // BitmapEx::Create @@ -107,11 +107,9 @@ BitmapEx::BitmapEx( const ResId& rResId ) : void BitmapEx::loadFromIconTheme( const OUString& rIconName ) { - static ImplImageTreeSingletonRef aImageTree; - OUString aIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme(); - if( !aImageTree->loadImage( rIconName, aIconTheme, *this, true ) ) + if( !ImplImageTree::get().loadImage( rIconName, aIconTheme, *this, true ) ) { #ifdef DBG_UTIL OStringBuffer aErrorStr( |