vcl/source/graphic/UnoGraphicProvider.cxx | 6 +++---
vcl/source/helper/commandinfoprovider.cxx | 11 ++++-------
2 files changed, 7 insertions(+), 10 deletions(-)
New commits:
commit cb8a05bfccf77d5217f4f2e20b5898d6a24f990d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Nov 9 12:34:06 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Nov 9 16:37:09 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>
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;
commit b2cde58886c8a08fe240f74af6c4f257c15d2835
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Nov 9 11:36:40 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Nov 9 16:36:54 2022 +0100
don't need to ctor and assign, just ctor
Change-Id: I0ad410205350c7d035c8e645f00344d3e5641def
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142483
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/helper/commandinfoprovider.cxx
b/vcl/source/helper/commandinfoprovider.cxx
index 5c280bb663c3..eb964b34b8ee 100644
--- a/vcl/source/helper/commandinfoprovider.cxx
+++ b/vcl/source/helper/commandinfoprovider.cxx
@@ -360,10 +360,9 @@ Reference<graphic::XGraphic> GetXGraphicForCommand(const
OUString& rsCommandName
Reference<ui::XUIConfigurationManager>
xDocUICfgMgr(xSupplier->getUIConfigurationManager());
Reference<ui::XImageManager>
xDocImgMgr(xDocUICfgMgr->getImageManager(), UNO_QUERY);
- Sequence< Reference<graphic::XGraphic> > aGraphicSeq;
Sequence<OUString> aImageCmdSeq { rsCommandName };
- aGraphicSeq = xDocImgMgr->getImages( nImageType, aImageCmdSeq );
+ Sequence<Reference<graphic::XGraphic>> aGraphicSeq =
xDocImgMgr->getImages(nImageType, aImageCmdSeq);
Reference<graphic::XGraphic> xGraphic = aGraphicSeq[0];
if (xGraphic.is())
return xGraphic;
@@ -373,17 +372,15 @@ Reference<graphic::XGraphic> GetXGraphicForCommand(const
OUString& rsCommandName
{
}
- try {
+ try
+ {
Reference<ui::XModuleUIConfigurationManagerSupplier>
xModuleCfgMgrSupplier(GetModuleConfigurationSupplier());
Reference<ui::XUIConfigurationManager>
xUICfgMgr(xModuleCfgMgrSupplier->getUIConfigurationManager(GetModuleIdentifier(rxFrame)));
-
- Sequence< Reference<graphic::XGraphic> > aGraphicSeq;
Reference<ui::XImageManager>
xModuleImageManager(xUICfgMgr->getImageManager(), UNO_QUERY);
Sequence<OUString> aImageCmdSeq { rsCommandName };
- aGraphicSeq = xModuleImageManager->getImages(nImageType, aImageCmdSeq);
-
+ Sequence<Reference<graphic::XGraphic>> aGraphicSeq =
xModuleImageManager->getImages(nImageType, aImageCmdSeq);
Reference<graphic::XGraphic> xGraphic(aGraphicSeq[0]);
return xGraphic;
