sd/source/filter/eppt/pptx-epptooxml.cxx | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
New commits:
commit 3ebee45e504abac356d68a4a79ee7a644e6c106d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Jul 3 14:26:14 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Jul 4 16:51:53 2021 +0200
cid#1486703 if bUsePlaceholderIndex is true then ePlaceholder != Outliner
so this is Logically dead code
Change-Id: Ieede7331bf2639610ad7a3a983a87263d291c75d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118352
Tested-by: Jenkins
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index ac7449fd38a6..6a7035347f20 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1568,17 +1568,10 @@ ShapeExport&
PowerPointShapeExport::WritePlaceholderShape(const Reference< XShap
SAL_INFO("sd.eppt", "write placeholder " << pType);
if (bUsePlaceholderIndex)
{
- if ((mePageType == PageType::LAYOUT || mePageType == PageType::NORMAL)
- && ePlaceholder == Outliner)
- mpFS->singleElementNS(
- XML_p, XML_ph, XML_idx,
- OString::number(
-
static_cast<PowerPointExport*>(GetFB())->CreateNewPlaceholderIndex(xShape)));
- else
- mpFS->singleElementNS(
- XML_p, XML_ph, XML_type, pType, XML_idx,
- OString::number(
-
static_cast<PowerPointExport*>(GetFB())->CreateNewPlaceholderIndex(xShape)));
+ mpFS->singleElementNS(
+ XML_p, XML_ph, XML_type, pType, XML_idx,
+ OString::number(
+
static_cast<PowerPointExport*>(GetFB())->CreateNewPlaceholderIndex(xShape)));
}
else
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
