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 /sfx2 | |
| parent | 58d798ea44b9e2a57681e990a8acc747bc287c0b (diff) | |
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 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/Tools.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx index 0f0f596f936d..cebfc93013d9 100644 --- a/sfx2/source/sidebar/Tools.cxx +++ b/sfx2/source/sidebar/Tools.cxx @@ -53,14 +53,13 @@ Image Tools::GetImage ( { if (rsURL.getLength() > 0) { + OUString sPath; + if (rsURL.startsWith(".uno:")) - { return vcl::CommandInfoProvider::GetImageForCommand(rsURL, rxFrame); - } - else - { + + else if (rsURL.startsWith("private:graphicrepository/", &sPath)) return Image(rsURL); - } } return Image(); } |