ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Extended loplugin:ostr: sd

Browse Source 
Change-Id: If78b217698bd63895c6466744495ee22be8debc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160102
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
This commit is contained in:
Stephan Bergmann
2023-11-29 17:43:19 +01:00
parent 1e6cb9302d
commit b5ef7455a6
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sd/source/filter/eppt/epptso.cxx
+8 -8
View File
@@ -1711,7 +1711,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
// We can't map this custom shape to a PPT preset and it has a bitmap
// fill. Make sure that at least the bitmap fill is not lost.
mType = "drawing.GraphicObject";
mType = "drawing.GraphicObject"_ostr;
aGraphicPropertyName = "Bitmap";
}
}
@@ -1725,7 +1725,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
maSize = MapSize( css::awt::Size( aRect->Width, aRect->Height ) );
maRect = ::tools::Rectangle( Point( maPosition.X, maPosition.Y ), Size( maSize.Width, maSize.Height ) );
}
mType = "drawing.dontknow";
mType = "drawing.dontknow"_ostr;
}
}
sal_uInt8 nPlaceHolderAtom = EPP_PLACEHOLDER_NONE;
@@ -2354,7 +2354,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
}
if ( !mbPresObj )
{
mType = "drawing.Text";
mType = "drawing.Text"_ostr;
ImplCreateTextShape( aPropOpt, aSolverContainer, true );
}
}
@@ -2464,7 +2464,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
continue;
}
mType = "drawing.Text";
mType = "drawing.Text"_ostr;
ImplCreateTextShape( aPropOpt, aSolverContainer, true );
}
}
@@ -2565,7 +2565,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
else
{
mbPresObj = false;
mType = "drawing.Text";
mType = "drawing.Text"_ostr;
ImplCreateTextShape( aPropOpt, aSolverContainer, true );
}
}
@@ -2576,7 +2576,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
else
{
mbPresObj = false;
mType = "drawing.Text";
mType = "drawing.Text"_ostr;
ImplCreateTextShape( aPropOpt, aSolverContainer, true );
}
}
@@ -2587,7 +2587,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
else
{
mbPresObj = false;
mType = "drawing.Text";
mType = "drawing.Text"_ostr;
ImplCreateTextShape( aPropOpt, aSolverContainer, true );
}
}
@@ -2598,7 +2598,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
else
{
mbPresObj = false;
mType = "drawing.Text";
mType = "drawing.Text"_ostr;
ImplCreateTextShape( aPropOpt, aSolverContainer, true );
}
}
sd/source/filter/eppt/pptx-animations-cond.cxx
+2 -2
View File
@@ -76,12 +76,12 @@ Cond::Cond(const Any& rAny, bool bIsMainSeqChild)
if (rAny >>= eTiming)
{
if (eTiming == Timing_INDEFINITE)
msDelay = "indefinite";
msDelay = "indefinite"_ostr;
}
else if (rAny >>= aEvent)
{
if (aEvent.Trigger == EventTrigger::ON_NEXT && bIsMainSeqChild)
msDelay = "indefinite";
msDelay = "indefinite"_ostr;
else
{
mpEvent = convertEventTrigger(aEvent.Trigger);
sd/source/filter/eppt/pptx-animations.cxx
+4 -4
View File
@@ -1017,11 +1017,11 @@ void PPTXAnimationExport::WriteAnimationNodeCommand()
{
case EffectCommands::VERB:
pType = "verb";
aCommand = "1"; /* FIXME hardcoded viewing */
aCommand = "1"_ostr; /* FIXME hardcoded viewing */
break;
case EffectCommands::PLAY:
{
aCommand = "play";
aCommand = "play"_ostr;
uno::Sequence<beans::NamedValue> aParamSeq;
xCommand->getParameter() >>= aParamSeq;
comphelper::SequenceAsHashMap aMap(aParamSeq);
@@ -1038,10 +1038,10 @@ void PPTXAnimationExport::WriteAnimationNodeCommand()
break;
}
case EffectCommands::TOGGLEPAUSE:
aCommand = "togglePause";
aCommand = "togglePause"_ostr;
break;
case EffectCommands::STOP:
aCommand = "stop";
aCommand = "stop"_ostr;
break;
default:
SAL_WARN("sd.eppt", "unknown command: " << xCommand->getCommand());