sax/source/expatwrap/xml2utf.cxx | 14 +++++++-------
sd/source/filter/eppt/epptso.cxx | 16 ++++++++--------
sd/source/filter/eppt/pptx-animations-cond.cxx | 4 ++--
sd/source/filter/eppt/pptx-animations.cxx | 8 ++++----
4 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit b5ef7455a6f1cf608501e4360be7ea54ff13feb2
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Nov 29 14:39:22 2023 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Wed Nov 29 17:43:19 2023 +0100
Extended loplugin:ostr: sd
Change-Id: If78b217698bd63895c6466744495ee22be8debc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160102
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
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());
commit 1e6cb9302d6ab3341d8102fc84f37e1149b27985
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Nov 29 14:39:56 2023 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Wed Nov 29 17:43:08 2023 +0100
Extended loplugin:ostr: sax
Change-Id: I7ee95e170b09a5a6765042ede50218332a822c7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160104
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index 7cbf24d0d3d8..5b3e4b9e1c86 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -241,13 +241,13 @@ bool XMLFile2UTFConverter::scanForEncoding( Sequence<
sal_Int8 > &seq )
0xFF == pSource[1] ) {
// UTF-16 big endian
// conversion is done so that encoding information can be easily
extracted
- m_sEncoding = "utf-16";
+ m_sEncoding = "utf-16"_ostr;
}
else if( 0xFF == pSource[0] &&
0xFE == pSource[1] ) {
// UTF-16 little endian
// conversion is done so that encoding information can be easily
extracted
- m_sEncoding = "utf-16";
+ m_sEncoding = "utf-16"_ostr;
}
else if( 0x00 == pSource[0] && 0x3c == pSource[1] && 0x00 == pSource[2]
&& 0x3f == pSource[3] ) {
// UTF-16 big endian without byte order mark (this is (strictly
speaking) an error.)
@@ -259,7 +259,7 @@ bool XMLFile2UTFConverter::scanForEncoding( Sequence<
sal_Int8 > &seq )
reinterpret_cast<sal_uInt8*>(seq.getArray())[0] = 0xFE;
reinterpret_cast<sal_uInt8*>(seq.getArray())[1] = 0xFF;
- m_sEncoding = "utf-16";
+ m_sEncoding = "utf-16"_ostr;
}
else if( 0x3c == pSource[0] && 0x00 == pSource[1] && 0x3f == pSource[2]
&& 0x00 == pSource[3] ) {
// UTF-16 little endian without byte order mark (this is (strictly
speaking) an error.)
@@ -270,7 +270,7 @@ bool XMLFile2UTFConverter::scanForEncoding( Sequence<
sal_Int8 > &seq )
reinterpret_cast<sal_uInt8*>(seq.getArray())[0] = 0xFF;
reinterpret_cast<sal_uInt8*>(seq.getArray())[1] = 0xFE;
- m_sEncoding = "utf-16";
+ m_sEncoding = "utf-16"_ostr;
}
else if( 0xEF == pSource[0] &&
0xBB == pSource[1] &&
@@ -280,15 +280,15 @@ bool XMLFile2UTFConverter::scanForEncoding( Sequence<
sal_Int8 > &seq )
// The BOM is removed.
memmove( seq.getArray(), &( seq.getArray()[3] ), seq.getLength()-3 );
seq.realloc( seq.getLength() - 3 );
- m_sEncoding = "utf-8";
+ m_sEncoding = "utf-8"_ostr;
}
else if( 0x00 == pSource[0] && 0x00 == pSource[1] && 0x00 == pSource[2]
&& 0x3c == pSource[3] ) {
// UCS-4 big endian
- m_sEncoding = "ucs-4";
+ m_sEncoding = "ucs-4"_ostr;
}
else if( 0x3c == pSource[0] && 0x00 == pSource[1] && 0x00 == pSource[2]
&& 0x00 == pSource[3] ) {
// UCS-4 little endian
- m_sEncoding = "ucs-4";
+ m_sEncoding = "ucs-4"_ostr;
}
/* TODO: no need to test for the moment since we return sal_False like default
case anyway
else if( 0x4c == pSource[0] && 0x6f == pSource[1] &&
