diff options
-rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 16 | ||||
-rw-r--r-- | sd/source/filter/eppt/pptx-animations-cond.cxx | 4 | ||||
-rw-r--r-- | sd/source/filter/eppt/pptx-animations.cxx | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index e794d9600e06..e6923533c92d 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -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 ); } } diff --git a/sd/source/filter/eppt/pptx-animations-cond.cxx b/sd/source/filter/eppt/pptx-animations-cond.cxx index 440d31885dad..a05dd55918ca 100644 --- a/sd/source/filter/eppt/pptx-animations-cond.cxx +++ b/sd/source/filter/eppt/pptx-animations-cond.cxx @@ -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); diff --git a/sd/source/filter/eppt/pptx-animations.cxx b/sd/source/filter/eppt/pptx-animations.cxx index 9e4e1b3d2fd8..1dfdc29d6a08 100644 --- a/sd/source/filter/eppt/pptx-animations.cxx +++ b/sd/source/filter/eppt/pptx-animations.cxx @@ -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()); |