diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2018-11-26 16:59:42 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2019-09-24 10:58:27 +0100 |
| commit | 973fd959be877c921ad6b13f622b36067d497f70 (patch) | |
| tree | 2e14147f3b82b9ecd01c1b134c6fbf6fb62d9267 /framework/source/uiconfiguration/ImageList.hxx | |
| parent | 0551d70b7d796907a6cdbbe0a51dde3fe932dfa9 (diff) | |
Use lazy-loading stock Image to simplify framework image lists.private/mmeeks/hidpi-bits
Project stock names through XGraphic via origin URL.
(cherry picked from commit 77b88eebaadebb626108172e4f2de36c60960051)
Change-Id: Ib445694f7c142a163ef7e7bc0beea39b88b99e14
Diffstat (limited to 'framework/source/uiconfiguration/ImageList.hxx')
| -rw-r--r-- | framework/source/uiconfiguration/ImageList.hxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/framework/source/uiconfiguration/ImageList.hxx b/framework/source/uiconfiguration/ImageList.hxx index f610692fb672..7f72c980fdb3 100644 --- a/framework/source/uiconfiguration/ImageList.hxx +++ b/framework/source/uiconfiguration/ImageList.hxx @@ -20,18 +20,16 @@ #ifndef FRAMEWORK_SOURCE_UICONFIGURATION_IMAGELIST_HXX #define FRAMEWORK_SOURCE_UICONFIGURATION_IMAGELIST_HXX -#include <vcl/bitmapex.hxx> +#include <vcl/image.hxx> #include <unordered_map> #include <vector> // Images identified by either name, or by id struct ImageAryData { - OUString maName; - sal_uInt16 mnId; - BitmapEx maBitmapEx; - - bool IsLoadable() { return maBitmapEx.IsEmpty() && !maName.isEmpty(); } + OUString maName; + sal_uInt16 mnId; + Image maImage; }; class ImageList @@ -69,7 +67,7 @@ private: Size maImageSize; sal_uInt16 ImplGetImageId( const OUString& rImageName ) const; - void ImplAddImage( const OUString &aName, sal_uInt16 nId, const BitmapEx &aBitmapEx ); + void ImplAddImage( const OUString &aPrefix, const OUString &aName, sal_uInt16 nId, const Image &aImage ); void ImplRemoveImage( sal_uInt16 nPos ); void ImplLoad(ImageAryData&) const; }; |