commit c985db8b603d809d5896e42259e0768d607177f7
author Xisco Fauli <xiscofauli@libreoffice.org> Fri Jan 25 12:11:04 2019 +0100
committer Xisco Faulí <xiscofauli@libreoffice.org> Mon Jan 28 11:34:21 2019 +0100
tree d27b711817de470f45b282121c24e055c130f54f
parent 1d64946c073f5a244fd115ec1dfb3dcb09c9313d

tdf#122951: Fix insertion of graphics as bullets

Regression from 81260c448911069ce8cb051d3a973ec52b9b43a3

Change-Id: Iecf00ea8310a767ff7945e7c1a0efe9dca5edd20
Reviewed-on: https://gerrit.libreoffice.org/66903
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 265a4fd43d207cd6a99fdd9c23d54259428ed709)
Reviewed-on: https://gerrit.libreoffice.org/66905
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>

cui/source/tabpages/numpages.cxx

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index a6ea489..7f4fa43 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1910,14 +1910,16 @@
            GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS);

            Graphic aGraphic;
            OUString sGrfName;
            ScopedVclPtrInstance< VirtualDevice > pVD;
            size_t i = 0;
            for (auto & grfName : aGrfNames)
            {
                sGrfName = grfName;
                OUString sItemId = "gallery" + OUString::number(i);
                INetURLObject aObj(grfName);
                INetURLObject aObj(sGrfName);
                if(aObj.GetProtocol() == INetProtocol::File)
                    grfName = aObj.PathToFileName();
                    sGrfName = aObj.PathToFileName();
                if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, i, &aGraphic))
                {
                    BitmapEx aBitmap(aGraphic.GetBitmapEx());
@@ -1933,11 +1935,11 @@
                    }
                    pVD->SetOutputSizePixel(aBitmap.GetSizePixel(), false);
                    pVD->DrawBitmapEx(Point(), aBitmap);
                    m_xGalleryMenu->append(sItemId, grfName, *pVD);
                    m_xGalleryMenu->append(sItemId, sGrfName, *pVD);
                }
                else
                {
                    m_xGalleryMenu->append(sItemId, grfName);
                    m_xGalleryMenu->append(sItemId, sGrfName);
                }
                ++i;
            }