[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-5' - cui/source

[Libreoffice Gerrit user]

 cui/source/tabpages/numpages.cxx |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit bc549a6bf496bb1c787979538cea53fce317424a
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Fri Jan 25 12:11:04 2019 +0100
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Tue Jan 29 13:48:51 2019 +0100

    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 at cib.de>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

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;
             }