[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/graphic/UnoGraphicProvider.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 44463562732fb57c4009ecf54bb0c4ffa5df5034
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Nov 9 12:34:06 2022 +0000
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Mon Nov 14 06:32:15 2022 +0100

    Related: tdf#151898 set origin for implLoadRepositoryImage XGraphics
    
    like we do when we get one from Image so we can treat these with the
    same shortcuts we do for Image to have the option to pass the
    underlying svg data to the final widget it ends up in
    
    Change-Id: I13a5aecc73821e88f1958e1e1e9e7322628cce6e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142484
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    (cherry picked from commit cb8a05bfccf77d5217f4f2e20b5898d6a24f990d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142594
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/vcl/source/graphic/UnoGraphicProvider.cxx 
b/vcl/source/graphic/UnoGraphicProvider.cxx
index 1f33a14ea1bc..f0e0d12e7895 100644
--- a/vcl/source/graphic/UnoGraphicProvider.cxx
+++ b/vcl/source/graphic/UnoGraphicProvider.cxx
@@ -143,7 +143,6 @@ uno::Reference< ::graphic::XGraphic > 
GraphicProvider::implLoadMemory( std::u16s
     return xRet;
 }
 
-
 uno::Reference< ::graphic::XGraphic > 
GraphicProvider::implLoadRepositoryImage( std::u16string_view rResourceURL )
 {
     uno::Reference< ::graphic::XGraphic >   xRet;
@@ -154,13 +153,14 @@ uno::Reference< ::graphic::XGraphic > 
GraphicProvider::implLoadRepositoryImage(
         BitmapEx aBitmap;
         if ( vcl::ImageRepository::loadImage( OUString(sPathName), aBitmap ) )
         {
-            xRet = Graphic(aBitmap).GetXGraphic();
+            Graphic aGraphic(aBitmap);
+            aGraphic.setOriginURL(OUString(rResourceURL));
+            xRet = aGraphic.GetXGraphic();
         }
     }
     return xRet;
 }
 
-
 uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( 
std::u16string_view rResourceURL )
 {
     uno::Reference< ::graphic::XGraphic >   xRet;