summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2016-04-24 00:50:53 +0200
committerAndras Timar <andras.timar@collabora.com>2016-07-06 15:12:04 +0200
commit74356ee6e6f1ea135b353ac640e2dcd379fa1fb1 (patch)
tree22c3e783dbd5f50ddb5eaf68f0e4459be6daf7e8 /sd
parentffc4b935547cc5f87a7604b2a591caa8886e3bba (diff)
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@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 618e7622d08b20f6ea5f38144b61a187aced86af) Reviewed-on: https://gerrit.libreoffice.org/24329 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit ad9e36fe992868c9a5bf2b457f55b93f44843447)
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/dlg/PhotoAlbumDialog.cxx1
1 files changed, 0 insertions, 1 deletions
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 962b05a72f15..4c968abd28f0 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -686,7 +686,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,