diff options
| author | Mark Hung <marklh9@gmail.com> | 2018-08-30 18:13:15 +0800 |
|---|---|---|
| committer | Mark Hung <marklh9@gmail.com> | 2018-08-31 07:44:39 +0200 |
| commit | 7321d7e34f8e2e886f11764cc432755040ea24cc (patch) | |
| tree | 9b7930273d5a7830469cf32e2b57559d5dd4b348 /sd | |
| parent | 8d9707e5f685c7f8824c752c086dd4727e989898 (diff) | |
sd/pptx export: remove parameter that is always true.
Caller of WriteAnimationNodeCommonPropsStart always
pass true for parameter bSingle.
Change-Id: I780a09e2fb34b3040561d4c2b437f8c4cc23df4a
Reviewed-on: https://gerrit.libreoffice.org/59800
Tested-by: Jenkins
Reviewed-by: Mark Hung <marklh9@gmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/pptx-animations.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sd/source/filter/eppt/pptx-animations.cxx b/sd/source/filter/eppt/pptx-animations.cxx index bce9b1079732..3f7600fc74ce 100644 --- a/sd/source/filter/eppt/pptx-animations.cxx +++ b/sd/source/filter/eppt/pptx-animations.cxx @@ -461,7 +461,7 @@ class PPTXAnimationExport void WriteAnimationNodeSeq(const Reference<XAnimationNode>& rXNode, bool bMainSeqChild); void WriteAnimationNodeEffect(const Reference<XAnimationNode>& rXNode, bool bMainSeqChild); void WriteAnimationNodeCommand(const Reference<XAnimationNode>& rXNode, bool bMainSeqChild); - void WriteAnimationNodeCommonPropsStart(const Reference<XAnimationNode>& rXNode, bool bSingle, + void WriteAnimationNodeCommonPropsStart(const Reference<XAnimationNode>& rXNode, bool bMainSeqChild); void WriteAnimationTarget(const Any& rTarget); @@ -694,7 +694,7 @@ void PPTXAnimationExport::WriteAnimationNodeAnimateInside(const Reference<XAnima } mpFS->startElementNS(XML_p, XML_cBhvr, XML_additive, pAdditive, FSEND); - WriteAnimationNodeCommonPropsStart(rXNode, true, bMainSeqChild); + WriteAnimationNodeCommonPropsStart(rXNode, bMainSeqChild); Reference<XIterateContainer> xIterate(rXNode->getParent(), UNO_QUERY); WriteAnimationTarget(xIterate.is() ? xIterate->getTarget() : rXAnimate->getTarget()); @@ -730,7 +730,7 @@ void PPTXAnimationExport::WriteAnimationNodeAnimateInside(const Reference<XAnima } void PPTXAnimationExport::WriteAnimationNodeCommonPropsStart( - const Reference<XAnimationNode>& rXNode, bool bSingle, bool bMainSeqChild) + const Reference<XAnimationNode>& rXNode, bool bMainSeqChild) { const char* pDuration = nullptr; const char* pRestart = nullptr; @@ -962,8 +962,7 @@ void PPTXAnimationExport::WriteAnimationNodeCommonPropsStart( } } - if (bSingle) - mpFS->endElementNS(XML_p, XML_cTn); + mpFS->endElementNS(XML_p, XML_cTn); } void PPTXAnimationExport::WriteAnimationNodeSeq(const Reference<XAnimationNode>& rXNode, @@ -973,7 +972,7 @@ void PPTXAnimationExport::WriteAnimationNodeSeq(const Reference<XAnimationNode>& mpFS->startElementNS(XML_p, XML_seq, FSEND); - WriteAnimationNodeCommonPropsStart(rXNode, true, bMainSeqChild); + WriteAnimationNodeCommonPropsStart(rXNode, bMainSeqChild); WriteAnimationCondition(mpFS, nullptr, "onPrev", 0, true, XML_prevCondLst); WriteAnimationCondition(mpFS, nullptr, "onNext", 0, true, XML_nextCondLst); @@ -1033,7 +1032,7 @@ void PPTXAnimationExport::WriteAnimationNodeCommand(const Reference<XAnimationNo WriteAnimationNodeAnimateInside(rXNode, bMainSeqChild, false); mpFS->startElementNS(XML_p, XML_cBhvr, FSEND); - WriteAnimationNodeCommonPropsStart(rXNode, true, bMainSeqChild); + WriteAnimationNodeCommonPropsStart(rXNode, bMainSeqChild); WriteAnimationTarget(xCommand->getTarget()); mpFS->endElementNS(XML_p, XML_cBhvr); @@ -1052,7 +1051,7 @@ void PPTXAnimationExport::WriteAnimationNode(const Reference<XAnimationNode>& rX case AnimationNodeType::ITERATE: case AnimationNodeType::PAR: mpFS->startElementNS(XML_p, xmlNodeType, FSEND); - WriteAnimationNodeCommonPropsStart(rXNode, true, bMainSeqChild); + WriteAnimationNodeCommonPropsStart(rXNode, bMainSeqChild); mpFS->endElementNS(XML_p, xmlNodeType); break; case AnimationNodeType::SEQ: |