summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2018-11-26 16:59:42 +0000
committerMichael Meeks <michael.meeks@collabora.com>2019-09-24 14:53:40 +0200
commitac6fe36ac6ccebf3bf891b891bd47c8e3744a056 (patch)
tree3676e69f33602592aec30b1998c978cb1b4fd778 /sfx2
parent6b82bbd9e7c3aab343c5e7e9e3fb0bcfc70e2cb7 (diff)
Use lazy-loading stock Image to simplify framework image lists.
Project stock names through XGraphic via origin URL. (cherry picked from commit 77b88eebaadebb626108172e4f2de36c60960051) Change-Id: Ib445694f7c142a163ef7e7bc0beea39b88b99e14 Reviewed-on: https://gerrit.libreoffice.org/79420 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/sidebar/Tools.cxx9
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();
}