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

[Julien Nabet]

 sd/source/ui/dlg/PhotoAlbumDialog.cxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 8dbca99ed148158924a5e4e29e43e87062f030b1
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Apr 24 00:50:53 2016 +0200

    tdf#99450/tdf#99462: fix insert twice the same object in Photo album
    
    For tdf#99450, see https://bugs.documentfoundation.org/show_bug.cgi?id=99450#c6 for full details
    
    tdf#99462 is also a consequence of this double insert.
    See https://bugs.documentfoundation.org/show_bug.cgi?id=99462#c2
    
    Change-Id: I474495457088b93e0e86ea2e504f61c383ba059d
    Reviewed-on: https://gerrit.libreoffice.org/24327
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 618e7622d08b20f6ea5f38144b61a187aced86af)
    Reviewed-on: https://gerrit.libreoffice.org/24330
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 2aa8be5936cab3fa2a0d895b414cd0dc9dc3f319)
    Reviewed-on: https://gerrit.libreoffice.org/24401
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index d5dcd09..115a377 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -694,7 +694,6 @@ void SdPhotoAlbumDialog::createCaption(const awt::Size& aPageSize )
     aSet.Put( XFillColorItem( "", Color(COL_BLACK) ) );
     aSet.Put( XFillTransparenceItem( 20 ) );
     pSdrObj->SetMergedItemSetAndBroadcast(aSet);
-    pSlide->InsertObject(pSdrObj);
 }
 
 Reference< graphic::XGraphic> SdPhotoAlbumDialog::createXGraphicFromUrl(const OUString& sUrl,