summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2019-01-25 12:11:04 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2019-01-29 13:48:51 +0100
commitbc549a6bf496bb1c787979538cea53fce317424a (patch)
tree248903278bca62dab71b1b51d5dfa159cd7018f3
parent98daad73b52bdeebef137dd4791a8e072d7394f2 (diff)
tdf#122951: Fix insertion of graphics as bullets
Regression from 81260c448911069ce8cb051d3a973ec52b9b43a3 Change-Id: Iecf00ea8310a767ff7945e7c1a0efe9dca5edd20 Reviewed-on: https://gerrit.libreoffice.org/67007 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--cui/source/tabpages/numpages.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 3c31e11d4a4b..8ff1e9384512 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1998,12 +1998,14 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl, MenuButton *, void)
GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS);
Graphic aGraphic;
+ OUString sGrfName;
size_t i = 0;
for (auto & grfName : aGrfNames)
{
- INetURLObject aObj(grfName);
+ sGrfName = grfName;
+ INetURLObject aObj(sGrfName);
if(aObj.GetProtocol() == INetProtocol::File)
- grfName = aObj.PathToFileName();
+ sGrfName = aObj.PathToFileName();
if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, i, &aGraphic))
{
@@ -2020,13 +2022,13 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl, MenuButton *, void)
}
Image aImage(aBitmap);
- pPopup->InsertItem(MN_GALLERY_ENTRY + i, grfName, aImage );
+ pPopup->InsertItem(MN_GALLERY_ENTRY + i, sGrfName, aImage );
}
else
{
Image aImage;
pPopup->InsertItem(
- MN_GALLERY_ENTRY + i, grfName, aImage );
+ MN_GALLERY_ENTRY + i, sGrfName, aImage );
}
++i;
}