diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2018-11-26 16:59:42 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-12-06 10:51:34 +0100 |
| commit | ca936bb8b1728f470028e5ae0c55a808210f2b0c (patch) | |
| tree | defc6a2d3c3336488b950848304fc3bba39b3361 /sfx2 | |
| parent | 190fad517d66be7891d54d0731cecb148aff357d (diff) | |
Use lazy-loading stock Image to simplify framework image lists.
Project stock names through XGraphic via origin URL.
Change-Id: Ib445694f7c142a163ef7e7bc0beea39b88b99e14
(cherry picked from commit 77b88eebaadebb626108172e4f2de36c60960051)
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/Tools.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx index e246599fd9c0..f0b0c3021b56 100644 --- a/sfx2/source/sidebar/Tools.cxx +++ b/sfx2/source/sidebar/Tools.cxx @@ -55,11 +55,14 @@ Image Tools::GetImage ( { if (rsURL.getLength() > 0) { + OUString sPath; + if (rsURL.startsWith(".uno:")) - { - const Image aPanelImage(vcl::CommandInfoProvider::GetImageForCommand(rsURL, rxFrame)); - return aPanelImage; - } + return vcl::CommandInfoProvider::GetImageForCommand(rsURL, rxFrame); + + else if (rsURL.startsWith("private:graphicrepository/", &sPath)) + return Image(rsURL); + else { const Reference<XComponentContext> xContext (::comphelper::getProcessComponentContext()); @@ -70,8 +73,7 @@ Image Tools::GetImage ( const Reference<graphic::XGraphic> xGraphic ( xGraphicProvider->queryGraphic(aMediaProperties.getPropertyValues()), UNO_QUERY); - if (xGraphic.is()) - return Image(xGraphic); + return Image(xGraphic); } } return Image(); |