[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sfx2/source
ilhan (via logerrit)
logerrit at kemper.freedesktop.org
Thu Mar 26 11:51:23 UTC 2020
sfx2/source/sidebar/Tools.cxx | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 66ef006929f6ebf19cbf91b54529217774d36625
Author: ilhan <ilhanyesil at gmx.de>
AuthorDate: Wed Mar 25 14:01:57 2020 +0100
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Mar 26 12:50:48 2020 +0100
tdf#130310 Load Sidebar Icons for extensions
Changed else statement to include load of extension icons.
Change-Id: I76ad068825ad1406329ca3807b2a919988091cbd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91109
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx
index cebfc93013d9..dcd90eb29d3b 100644
--- a/sfx2/source/sidebar/Tools.cxx
+++ b/sfx2/source/sidebar/Tools.cxx
@@ -53,12 +53,10 @@ Image Tools::GetImage (
{
if (rsURL.getLength() > 0)
{
- OUString sPath;
-
if (rsURL.startsWith(".uno:"))
return vcl::CommandInfoProvider::GetImageForCommand(rsURL, rxFrame);
- else if (rsURL.startsWith("private:graphicrepository/", &sPath))
+ else
return Image(rsURL);
}
return Image();
More information about the Libreoffice-commits
mailing list