tdf#119276 Fix loading of images with internal LO URLs

Change-Id: I30556aba4490bef7f4a6e6b3899cc05f4b6a06d4
Reviewed-on: https://gerrit.libreoffice.org/59104
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

sfx2/source/sidebar/Tools.cxx

@@ -55,13 +55,11 @@ Image Tools::GetImage (
     {
         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"))
+        else
         {
-            const Image aPanelImage(rsURL);
-            return aPanelImage;
+            return Image(rsURL);
         }
     }
     return Image();

vcl/source/image/Image.cxx

@@ -67,10 +67,9 @@ Image::Image(const OUString & rFileUrl)
     }
     else
     {
-        OUString aPath;
-        osl::FileBase::getSystemPathFromFileURL(rFileUrl, aPath);
         Graphic aGraphic;
-        if (ERRCODE_NONE == GraphicFilter::LoadGraphic(aPath, IMP_PNG, aGraphic))
+
+        if (ERRCODE_NONE == GraphicFilter::LoadGraphic(rFileUrl, IMP_PNG, aGraphic))
         {
             ImplInit(aGraphic.GetBitmapEx());
         }