commit bc549a6bf496bb1c787979538cea53fce317424a
author Xisco Fauli <xiscofauli@libreoffice.org> Fri Jan 25 12:11:04 2019 +0100
committer Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tue Jan 29 13:48:51 2019 +0100
tree 248903278bca62dab71b1b51d5dfa159cd7018f3
parent 98daad73b52bdeebef137dd4791a8e072d7394f2

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>

cui/source/tabpages/numpages.cxx

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 3c31e11..8ff1e93 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1998,12 +1998,14 @@
            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 @@
                    }
                    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;
            }