diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2018-11-26 16:59:42 +0000 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2019-11-05 17:15:31 +0100 |
| commit | 7fca2b0113c687098cfa6a5a4a9a8e4598f61284 (patch) | |
| tree | 9fe4bce5d9de62718dbf11f83fe0eae2c1b593a3 /include | |
| parent | tdf#125038 DOCX import: fix various issues with MERGEFIELD inside IF fields (diff) | |
| download | core-7fca2b0113c687098cfa6a5a4a9a8e4598f61284.tar.gz core-7fca2b0113c687098cfa6a5a4a9a8e4598f61284.zip | |
tdf#126293 Use lazy-loading stock Image to simplify fwk image lists
Project stock names through XGraphic via origin URL.
(cherry picked from commit 77b88eebaadebb626108172e4f2de36c60960051)
Reviewed-on: https://gerrit.libreoffice.org/79420
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit ac6fe36ac6ccebf3bf891b891bd47c8e3744a056)
Change-Id: Ib445694f7c142a163ef7e7bc0beea39b88b99e14
Reviewed-on: https://gerrit.libreoffice.org/81965
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/graph.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/image.hxx | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index d49a8a2ce512..3749d8550523 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -101,6 +101,7 @@ public: bool getSnapHorVerLines() const { return mbSnapHorVerLines; } }; +class Image; class VCL_DLLPUBLIC Graphic { private: @@ -118,6 +119,7 @@ public: Graphic( const Graphic& rGraphic ); Graphic( Graphic&& rGraphic ); Graphic( const Bitmap& rBmp ); + Graphic( const Image& rImage ); Graphic( const BitmapEx& rBmpEx ); Graphic( const VectorGraphicDataPtr& rVectorGraphicDataPtr ); Graphic( const Animation& rAnimation ); diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx index 4c5047518bf3..1267e1a439e5 100644 --- a/include/vcl/image.hxx +++ b/include/vcl/image.hxx @@ -51,7 +51,6 @@ enum class StockImage { Yes }; class SAL_WARN_UNUSED VCL_DLLPUBLIC Image { friend class ::OutputDevice; - public: Image(); explicit Image(BitmapEx const & rBitmapEx); @@ -72,6 +71,8 @@ public: return !(Image::operator==(rImage)); } + SAL_DLLPRIVATE OUString GetStock() const; + void Draw(OutputDevice* pOutDev, const Point& rPos, DrawImageFlags nStyle, const Size* pSize = nullptr); private: |