filter/source/msfilter/svdfppt.cxx | 7 +------
include/filter/msfilter/svdfppt.hxx | 1 -
2 files changed, 1 insertion(+), 7 deletions(-)
New commits:
commit 758f021601c25251f9cc5475570153022e140ee0
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Wed Sep 6 21:01:33 2017 +0200
bBObjIsTemporary is never read
since 2010-02-11
author Armin Le Grand <armin.le.gr...@sun.com> 2010-02-11 16:35:16 (GMT)
committer Armin Le Grand <armin.le.gr...@sun.com> 2010-02-11 16:35:16
(GMT)
commit a9626fc825840c49fd3135fbf4818e276cd347cb (patch)
tree 989109ecba1c8fdcc58b22974fa011cab299aca3
parent a4d83adbf01e4d8f935ad2ded82be80d13b7cdb1 (diff)
aw079 #i99386# cleanup of define and last change from CL
see
https://cgit.freedesktop.org/libreoffice/core/commit/?id=a9626fc825840c49fd3135fbf4818e276cd347cb
Change-Id: Ib430ddb01b40e1c2d0ef3b888ebb94ebf073b88c
Reviewed-on: https://gerrit.libreoffice.org/42024
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 17128c1cda12..924bcd9d72c5 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -507,7 +507,6 @@ PptSlidePersistEntry::PptSlidePersistEntry() :
nDrawingDgId ( 0xffffffff ),
pPresentationObjects ( nullptr ),
pBObj ( nullptr ),
- bBObjIsTemporary ( true ),
ePageKind ( PPT_MASTERPAGE ),
bNotesMaster ( false ),
bHandoutMaster ( false ),
@@ -2813,11 +2812,9 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet,
const PptSlidePersistEntry*
if ( pE->nBackgroundOffset )
{
// do not follow master
colorscheme?
- bool bTemporary = (
rSlidePersist.aSlideAtom.nFlags & 2 ) != 0;
sal_uInt32 nPos =
rStCtrl.Tell();
rStCtrl.Seek(
pE->nBackgroundOffset );
rSlidePersist.pBObj =
ImportObj( rStCtrl, static_cast<void*>(&aProcessData), aPageSize, aPageSize );
- rSlidePersist.bBObjIsTemporary
= bTemporary;
rStCtrl.Seek( nPos );
}
}
@@ -2834,7 +2831,6 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet,
const PptSlidePersistEntry*
{
aEscherObjListHd.SeekToBegOfRecord( rStCtrl );
rSlidePersist.pBObj =
ImportObj( rStCtrl, static_cast<void*>(&aProcessData), aPageSize, aPageSize );
- rSlidePersist.bBObjIsTemporary
= false;
}
}
}
@@ -2922,8 +2918,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet,
const PptSlidePersistEntry*
if ( rSlidePersist.pBObj )
{
// #i99386# transfer the attributes from the
temporary BackgroundObject
- // to the Page and delete it. Maybe
rSlidePersist.bBObjIsTemporary is
- // obsolete here, too.
+ // to the Page and delete it.
pRet->getSdrPageProperties().ClearItem();
pRet->getSdrPageProperties().PutItemSet(rSlidePersist.pBObj->GetMergedItemSet());
if (rSlidePersist.pSolverContainer)
diff --git a/include/filter/msfilter/svdfppt.hxx
b/include/filter/msfilter/svdfppt.hxx
index 20c681b7fb98..2be1cd00dbb0 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -369,7 +369,6 @@ struct PptSlidePersistEntry
pPresentationObjects; // if valid, this is a pointer
to an array that includes the offsets to the presentation objects
// on this masterpage for each
instance (0 - 8);
SdrObject* pBObj;
- bool bBObjIsTemporary;
PptPageKind ePageKind;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
