oox/source/ppt/timenodelistcontext.cxx | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
New commits:
commit 27805424cc880433595a749a36c4bd61a10b2f75
Author: Bogdan Buzea <buzea.bog...@libreoffice.org>
AuthorDate: Sat Oct 19 19:40:52 2024 +0200
Commit: David Gilbert <freedesk...@treblig.org>
CommitDate: Tue Nov 12 01:23:05 2024 +0100
tdf#163486: PVS: Identical branches
V1037 Two or more case-branches perform the same actions. Check lines: 544,
552
V1037 Two or more case-branches perform the same actions. Check lines: 923,
929
V1037 Two or more case-branches perform the same actions. Check lines: 993,
1001
Change-Id: I373ccdb56bee8d446e2aec3295ba9c0fb23ff82a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175229
Reviewed-by: David Gilbert <freedesk...@treblig.org>
Tested-by: Jenkins
diff --git a/oox/source/ppt/timenodelistcontext.cxx
b/oox/source/ppt/timenodelistcontext.cxx
index 81168d91ffa1..9ae108592612 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -540,12 +540,10 @@ namespace oox::ppt {
sal_Int16 nEnum = 0;
switch(nCalcMode)
{
- case XML_discrete:
- nEnum = AnimationCalcMode::DISCRETE;
- break;
case XML_lin:
nEnum = AnimationCalcMode::LINEAR;
break;
+ case XML_discrete:
case XML_fmla:
default:
// TODO what value is good ?
@@ -919,12 +917,10 @@ namespace oox::ppt {
case PPT_TOKEN( animClr ):
pCtx = new AnimColorContext( rParent, aElement, xAttribs, pNode );
break;
- case PPT_TOKEN( par ):
- pCtx = new ParallelExclTimeNodeContext( rParent, aElement, pNode );
- break;
case PPT_TOKEN( seq ):
pCtx = new SequenceTimeNodeContext( rParent, aElement, xAttribs,
pNode );
break;
+ case PPT_TOKEN( par ):
case PPT_TOKEN( excl ):
pCtx = new ParallelExclTimeNodeContext( rParent, aElement, pNode );
break;
@@ -989,12 +985,10 @@ namespace oox::ppt {
switch( aElementToken )
{
- case PPT_TOKEN( par ):
- nNodeType = AnimationNodeType::PAR;
- break;
case PPT_TOKEN( seq ):
nNodeType = AnimationNodeType::SEQ;
break;
+ case PPT_TOKEN( par ):
case PPT_TOKEN( excl ):
// TODO pick the right type. We choose parallel for now as
// there does not seem to be an "Exclusive"
