Extended loplugin:ostr: sw

Change-Id: Ie3ceb8d4b939a652d09cc9cf02b78e65093c8fcf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160099
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>

13 files changed, 104 insertions, 104 deletions

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 271e30e47a93..36431f83856f 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -3309,7 +3309,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDropDownFormFieldButtonEditing)
         OString sSelected( aTree.get_child("params").get_child("selected").get_value<std::string>() );
         CPPUNIT_ASSERT_EQUAL("1"_ostr, sSelected);
     }
-    m_aFormFieldButton = "";
+    m_aFormFieldButton = ""_ostr;
 
     // Trigger a form field event to select a different item.
     vcl::ITiledRenderable::StringMap aArguments;
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 8ef699787b3f..3b0f8d7b9f53 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -1352,16 +1352,16 @@ void SwRedlineData::dumpAsXml(xmlTextWriterPtr pWriter) const
     switch (GetType())
     {
         case RedlineType::Insert:
-            sRedlineType = "REDLINE_INSERT";
+            sRedlineType = "REDLINE_INSERT"_ostr;
             break;
         case RedlineType::Delete:
-            sRedlineType = "REDLINE_DELETE";
+            sRedlineType = "REDLINE_DELETE"_ostr;
             break;
         case RedlineType::Format:
-            sRedlineType = "REDLINE_FORMAT";
+            sRedlineType = "REDLINE_FORMAT"_ostr;
             break;
         default:
-            sRedlineType = "UNKNOWN";
+            sRedlineType = "UNKNOWN"_ostr;
             break;
     }
     (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("type"), BAD_CAST(sRedlineType.getStr()));
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 88f79aff22e5..18eb78db8348 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -803,15 +803,15 @@ void SwTextFrame::dumpAsXmlAttributes(xmlTextWriterPtr writer) const
     OString aMode = "Horizontal"_ostr;
     if (IsVertLRBT())
     {
-        aMode = "VertBTLR";
+        aMode = "VertBTLR"_ostr;
     }
     else if (IsVertLR())
     {
-        aMode = "VertLR";
+        aMode = "VertLR"_ostr;
     }
     else if (IsVertical())
     {
-        aMode = "Vertical";
+        aMode = "Vertical"_ostr;
     }
     (void)xmlTextWriterWriteAttribute(writer, BAD_CAST("WritingMode"), BAD_CAST(aMode.getStr()));
 }
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index deaaa5ea8a66..30ba8d3c0a75 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -777,16 +777,16 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFormat *pFormat, OString& rTok
                 if( pPseudo )
                 {
                     rToken = OOO_STRING_SVTOOLS_HTML_tabledata " "
-                             OOO_STRING_SVTOOLS_HTML_parabreak;
+                             OOO_STRING_SVTOOLS_HTML_parabreak ""_ostr;
                 }
                 else
-                    rToken = OOO_STRING_SVTOOLS_HTML_parabreak;
+                    rToken = OOO_STRING_SVTOOLS_HTML_parabreak ""_ostr;
                 break;
             case RES_POOLCOLL_TABLE_HDLN:
                 if( pPseudo )
                 {
                     rToken = OOO_STRING_SVTOOLS_HTML_tableheader " "
-                             OOO_STRING_SVTOOLS_HTML_parabreak;
+                             OOO_STRING_SVTOOLS_HTML_parabreak ""_ostr;
                 }
                 else
                     rToken = OOO_STRING_SVTOOLS_HTML_parabreak ""_ostr;
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index b4ed5c567cff..9f67d1ee0304 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -560,7 +560,7 @@ static void OutHTML_SwFormat( SwHTMLWriter& rWrt, const SwFormat& rFormat,
         // all styles that do not correspond to an HTML tag, or that are
         // not derived from it, are exported as <P>
 
-        rInfo.aToken = OOO_STRING_SVTOOLS_HTML_parabreak;
+        rInfo.aToken = OOO_STRING_SVTOOLS_HTML_parabreak ""_ostr;
         bPara = true;
     }
 
@@ -820,7 +820,7 @@ static void OutHTML_SwFormat( SwHTMLWriter& rWrt, const SwFormat& rFormat,
         (bHasParSpace || bXhtmlBlockQuote || pAdjItem) )
     {
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), Concat2View(rWrt.GetNamespace() + rInfo.aToken) );
-        aToken = OOO_STRING_SVTOOLS_HTML_parabreak;
+        aToken = OOO_STRING_SVTOOLS_HTML_parabreak ""_ostr;
         bPara = true;
         rWrt.m_bNoAlign = false;
     }
@@ -880,7 +880,7 @@ static void OutHTML_SwFormat( SwHTMLWriter& rWrt, const SwFormat& rFormat,
         if( eLang != LANGUAGE_DONTKNOW && eLang != rWrt.m_eLang )
         {
             rWrt.Strm().WriteOString( sOut );
-            sOut = "";
+            sOut = ""_ostr;
             rWrt.OutLanguage( eLang );
         }
 
@@ -889,7 +889,7 @@ static void OutHTML_SwFormat( SwHTMLWriter& rWrt, const SwFormat& rFormat,
             if( !sOut.isEmpty() )
             {
                 rWrt.Strm().WriteOString( sOut );
-                sOut = "";
+                sOut = ""_ostr;
             }
             rWrt.OutDirection( nDir );
         }
@@ -899,7 +899,7 @@ static void OutHTML_SwFormat( SwHTMLWriter& rWrt, const SwFormat& rFormat,
         {
             sOut += " " OOO_STRING_SVTOOLS_HTML_O_class "=\"";
             rWrt.Strm().WriteOString( sOut );
-            sOut = "";
+            sOut = ""_ostr;
             OUString aClass( pFormatInfo->aClass );
             if( pFormatInfo->bScriptDependent )
             {
@@ -922,7 +922,7 @@ static void OutHTML_SwFormat( SwHTMLWriter& rWrt, const SwFormat& rFormat,
             sOut += "\"";
         }
         rWrt.Strm().WriteOString( sOut );
-        sOut = "";
+        sOut = ""_ostr;
 
         std::string_view sStyle;
         if (rWrt.IsSpacePreserve())
@@ -951,7 +951,7 @@ static void OutHTML_SwFormat( SwHTMLWriter& rWrt, const SwFormat& rFormat,
                 sCSS2_P_CLASS_leaders "\"><"
                 OOO_STRING_SVTOOLS_HTML_O_span;
             rWrt.Strm().WriteOString( sOut );
-            sOut = "";
+            sOut = ""_ostr;
         }
 
         rWrt.Strm().WriteChar( '>' );
@@ -2965,8 +2965,8 @@ static SwHTMLWriter& OutHTML_SvxEscapement( SwHTMLWriter& rWrt, const SfxPoolIte
     OString aTag;
     switch( eEscape )
     {
-    case SvxEscapement::Superscript: aTag = OOO_STRING_SVTOOLS_HTML_superscript; break;
-    case SvxEscapement::Subscript: aTag = OOO_STRING_SVTOOLS_HTML_subscript; break;
+    case SvxEscapement::Superscript: aTag = OOO_STRING_SVTOOLS_HTML_superscript ""_ostr; break;
+    case SvxEscapement::Subscript: aTag = OOO_STRING_SVTOOLS_HTML_subscript ""_ostr; break;
     default:
         ;
     }
@@ -3098,7 +3098,7 @@ SwHTMLWriter& OutHTML_INetFormat( SwHTMLWriter& rWrt, const SwFormatINetFormat&
     }
 
     rWrt.Strm().WriteOString( sOut );
-    sOut = "";
+    sOut = ""_ostr;
 
     OUString sRel;
 
@@ -3116,7 +3116,7 @@ SwHTMLWriter& OutHTML_INetFormat( SwHTMLWriter& rWrt, const SwFormatINetFormat&
         sOut += " " OOO_STRING_SVTOOLS_HTML_O_href "=\"";
         rWrt.Strm().WriteOString( sOut );
         rWrt.OutHyperlinkHRefValue( aURL );
-        sOut = "\"";
+        sOut = "\""_ostr;
     }
 
     if( !rINetFormat.GetName().isEmpty() )
@@ -3124,7 +3124,7 @@ SwHTMLWriter& OutHTML_INetFormat( SwHTMLWriter& rWrt, const SwFormatINetFormat&
         sOut += " " OOO_STRING_SVTOOLS_HTML_O_name "=\"";
         rWrt.Strm().WriteOString( sOut );
         HTMLOutFuncs::Out_String( rWrt.Strm(), rINetFormat.GetName() );
-        sOut = "\"";
+        sOut = "\""_ostr;
     }
 
     const OUString& rTarget = rINetFormat.GetTargetFrame();
@@ -3133,7 +3133,7 @@ SwHTMLWriter& OutHTML_INetFormat( SwHTMLWriter& rWrt, const SwFormatINetFormat&
         sOut += " " OOO_STRING_SVTOOLS_HTML_O_target "=\"";
         rWrt.Strm().WriteOString( sOut );
         HTMLOutFuncs::Out_String( rWrt.Strm(), rTarget );
-        sOut = "\"";
+        sOut = "\""_ostr;
     }
 
     if( !sRel.isEmpty() )
@@ -3251,7 +3251,7 @@ static SwHTMLWriter& OutHTML_SwTextCharFormat( SwHTMLWriter& rWrt, const SfxPool
                 }
             }
             HTMLOutFuncs::Out_String( rWrt.Strm(), aClass );
-            sOut = "\"";
+            sOut = "\""_ostr;
         }
         sOut += ">";
         rWrt.Strm().WriteOString( sOut );
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index a0627effdc2b..ef3e4b19c35b 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -949,7 +949,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameForma
                 {
                     if (nPercentHeight)
                     {
-                        sWidth = "auto";
+                        sWidth = "auto"_ostr;
                     }
                     else
                     {
@@ -979,7 +979,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameForma
                 {
                     if (nPercentWidth)
                     {
-                        sHeight = "auto";
+                        sHeight = "auto"_ostr;
                     }
                     else
                     {
@@ -1378,7 +1378,7 @@ SwHTMLWriter& OutHTML_ImageStart( HtmlWriter& rHtml, SwHTMLWriter& rWrt, const S
     OString aTag(OOO_STRING_SVTOOLS_HTML_image ""_ostr);
     if (bReplacement)
         // Write replacement graphic of OLE object as <object>.
-        aTag = OOO_STRING_SVTOOLS_HTML_object;
+        aTag = OOO_STRING_SVTOOLS_HTML_object ""_ostr;
     rHtml.start(aTag);
 
     if(rWrt.mbEmbedImages)
@@ -1399,7 +1399,7 @@ SwHTMLWriter& OutHTML_ImageStart( HtmlWriter& rHtml, SwHTMLWriter& rWrt, const S
         OString sBuffer(OUStringToOString(aGraphicURL, RTL_TEXTENCODING_UTF8));
         OString aAttribute(OOO_STRING_SVTOOLS_HTML_O_src ""_ostr);
         if (bReplacement)
-            aAttribute = OOO_STRING_SVTOOLS_HTML_O_data;
+            aAttribute = OOO_STRING_SVTOOLS_HTML_O_data ""_ostr;
         rHtml.attribute(aAttribute, sBuffer);
     }
 
@@ -1696,10 +1696,10 @@ static SwHTMLWriter& OutHTML_FrameFormatAsDivOrSpan( SwHTMLWriter& rWrt,
 
         // Close the current <DL>!
         rWrt.OutAndSetDefList( 0 );
-        aTag = OOO_STRING_SVTOOLS_HTML_division;
+        aTag = OOO_STRING_SVTOOLS_HTML_division ""_ostr;
     }
     else
-        aTag = OOO_STRING_SVTOOLS_HTML_span;
+        aTag = OOO_STRING_SVTOOLS_HTML_span ""_ostr;
 
     // output as DIV
     if (rWrt.IsLFPossible())
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index d7ae5c28acde..98423fc96a3e 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -456,7 +456,7 @@ void SwHTMLWriter::OutForm( bool bOn,
             sOut += " " OOO_STRING_SVTOOLS_HTML_O_name "=\"";
             Strm().WriteOString( sOut );
             HTMLOutFuncs::Out_String( Strm(), *s );
-            sOut = "\"";
+            sOut = "\""_ostr;
         }
     }
 
@@ -470,7 +470,7 @@ void SwHTMLWriter::OutForm( bool bOn,
             OUString aURL
                 = URIHelper::simpleNormalizedMakeRelative( GetBaseURL(), *s);
             HTMLOutFuncs::Out_String( Strm(), aURL );
-            sOut = "\"";
+            sOut = "\""_ostr;
         }
     }
 
@@ -514,7 +514,7 @@ void SwHTMLWriter::OutForm( bool bOn,
             sOut += " " OOO_STRING_SVTOOLS_HTML_O_target "=\"";
             Strm().WriteOString( sOut );
             HTMLOutFuncs::Out_String( Strm(), *s );
-            sOut = "\"";
+            sOut = "\""_ostr;
         }
     }
 
@@ -583,7 +583,7 @@ void SwHTMLWriter::OutHiddenControls(
                     sOut += " " OOO_STRING_SVTOOLS_HTML_O_name "=\"";
                     Strm().WriteOString( sOut );
                     HTMLOutFuncs::Out_String( Strm(), *s );
-                    sOut = "\"";
+                    sOut = "\""_ostr;
                 }
             }
             aTmp = xPropSet->getPropertyValue( "HiddenValue" );
@@ -594,7 +594,7 @@ void SwHTMLWriter::OutHiddenControls(
                     sOut += " " OOO_STRING_SVTOOLS_HTML_O_value "=\"";
                     Strm().WriteOString( sOut );
                     HTMLOutFuncs::Out_String( Strm(), *s );
-                    sOut = "\"";
+                    sOut = "\""_ostr;
                 }
             }
             sOut += ">";
@@ -933,7 +933,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt,
             sOut += " " OOO_STRING_SVTOOLS_HTML_O_name "=\"";
             rWrt.Strm().WriteOString( sOut );
             HTMLOutFuncs::Out_String( rWrt.Strm(), *s );
-            sOut = "\"";
+            sOut = "\""_ostr;
         }
     }
 
@@ -951,7 +951,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt,
         sOut += " " OOO_STRING_SVTOOLS_HTML_O_value "=\"";
         rWrt.Strm().WriteOString( sOut );
         HTMLOutFuncs::Out_String( rWrt.Strm(), sValue );
-        sOut = "\"";
+        sOut = "\""_ostr;
     }
 
     sOut += " " + sOptions;
@@ -968,7 +968,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt,
 
                 HTMLOutFuncs::Out_String( rWrt.Strm(),
                             URIHelper::simpleNormalizedMakeRelative( rWrt.GetBaseURL(), *s) );
-                sOut = "\"";
+                sOut = "\""_ostr;
             }
         }
 
@@ -1185,7 +1185,7 @@ SwHTMLWriter& OutHTML_DrawFrameFormatAsControl( SwHTMLWriter& rWrt,
                     sOut += " " OOO_STRING_SVTOOLS_HTML_O_value "=\"";
                     rWrt.Strm().WriteOString( sOut );
                     HTMLOutFuncs::Out_String( rWrt.Strm(), sVal );
-                    sOut = "\"";
+                    sOut = "\""_ostr;
                 }
                 if( bSelected )
                     sOut += " " OOO_STRING_SVTOOLS_HTML_O_selected;
diff --git a/sw/source/filter/html/htmlnumwriter.cxx b/sw/source/filter/html/htmlnumwriter.cxx
index a4115ae7b4b8..046747754a38 100644
--- a/sw/source/filter/html/htmlnumwriter.cxx
+++ b/sw/source/filter/html/htmlnumwriter.cxx
@@ -316,9 +316,9 @@ SwHTMLWriter& OutHTML_NumberBulletListEnd( SwHTMLWriter& rWrt,
         sal_Int16 eType = rInfo.GetNumRule()->Get( i-1 ).GetNumberingType();
         OString aTag;
         if( SVX_NUM_CHAR_SPECIAL == eType || SVX_NUM_BITMAP == eType)
-            aTag = OOO_STRING_SVTOOLS_HTML_unorderlist;
+            aTag = OOO_STRING_SVTOOLS_HTML_unorderlist ""_ostr;
         else
-            aTag = OOO_STRING_SVTOOLS_HTML_orderlist;
+            aTag = OOO_STRING_SVTOOLS_HTML_orderlist ""_ostr;
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), Concat2View(rWrt.GetNamespace() + aTag), false );
         if (rWrt.mbXHTML && (i != nNextDepth + 1 || (i != 1 && rNextInfo.IsNumbered())))
         {
diff --git a/sw/source/filter/html/htmlreqifreader.cxx b/sw/source/filter/html/htmlreqifreader.cxx
index 0290ce5abde7..8df0d5b4834b 100644
--- a/sw/source/filter/html/htmlreqifreader.cxx
+++ b/sw/source/filter/html/htmlreqifreader.cxx
@@ -175,7 +175,7 @@ OString InsertOLE1HeaderFromOle10NativeStream(const tools::SvRef<SotStorage>& xS
     OString aClassName;
     if (xStorage->GetClassName() == SvGlobalName(0x0003000A, 0, 0, 0xc0, 0, 0, 0, 0, 0, 0, 0x46))
     {
-        aClassName = "PBrush";
+        aClassName = "PBrush"_ostr;
     }
     else
     {
@@ -185,7 +185,7 @@ OString InsertOLE1HeaderFromOle10NativeStream(const tools::SvRef<SotStorage>& xS
             SAL_WARN("sw.html", "InsertOLE1HeaderFromOle10NativeStream: unexpected class id: "
                                     << xStorage->GetClassName().GetHexName());
         }
-        aClassName = "Package";
+        aClassName = "Package"_ostr;
     }
 
     // Write ObjectHeader, see [MS-OLEDS] 2.2.4.
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 43c62f074703..bd5015bb820e 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -1520,11 +1520,11 @@ OString SwHTMLWriter::convertDirection(SvxFrameDirection nDir)
     {
     case SvxFrameDirection::Horizontal_LR_TB:
     case SvxFrameDirection::Vertical_LR_TB:
-        sConverted = "ltr";
+        sConverted = "ltr"_ostr;
         break;
     case SvxFrameDirection::Horizontal_RL_TB:
     case SvxFrameDirection::Vertical_RL_TB:
-        sConverted = "rtl";
+        sConverted = "rtl"_ostr;
         break;
     default: break;
     }
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 40217903d958..bf6380b12ccd 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -318,16 +318,16 @@ void lclAddThemeValuesToCustomAttributes(
         if (rComplexColor.getThemeColorUsage() == model::ThemeColorUsage::Text)
         {
             if (rComplexColor.getThemeColorType() == model::ThemeColorType::Dark1)
-                sSchemeType = "text1";
+                sSchemeType = "text1"_ostr;
             else if (rComplexColor.getThemeColorType() == model::ThemeColorType::Dark2)
-                sSchemeType = "text2";
+                sSchemeType = "text2"_ostr;
         }
         else if (rComplexColor.getThemeColorUsage() == model::ThemeColorUsage::Background)
         {
             if (rComplexColor.getThemeColorType() == model::ThemeColorType::Light1)
-                sSchemeType = "background1";
+                sSchemeType = "background1"_ostr;
             else if (rComplexColor.getThemeColorType() == model::ThemeColorType::Light2)
-                sSchemeType = "background2";
+                sSchemeType = "background2"_ostr;
         }
 
         DocxAttributeOutput::AddToAttrList(pAttrList, FSNS(XML_w, nThemeAttrId), sSchemeType);
@@ -7113,74 +7113,74 @@ static OString lcl_ConvertNumberingType(sal_Int16 nNumberingType, const SfxItemS
     switch ( nNumberingType )
     {
         case SVX_NUM_CHARS_UPPER_LETTER:
-        case SVX_NUM_CHARS_UPPER_LETTER_N:  aType = "upperLetter"; break;
+        case SVX_NUM_CHARS_UPPER_LETTER_N:  aType = "upperLetter"_ostr; break;
 
         case SVX_NUM_CHARS_LOWER_LETTER:
-        case SVX_NUM_CHARS_LOWER_LETTER_N:  aType = "lowerLetter"; break;
+        case SVX_NUM_CHARS_LOWER_LETTER_N:  aType = "lowerLetter"_ostr; break;
 
-        case SVX_NUM_ROMAN_UPPER:           aType = "upperRoman";  break;
-        case SVX_NUM_ROMAN_LOWER:           aType = "lowerRoman";  break;
-        case SVX_NUM_ARABIC:                aType = "decimal";     break;
+        case SVX_NUM_ROMAN_UPPER:           aType = "upperRoman"_ostr;  break;
+        case SVX_NUM_ROMAN_LOWER:           aType = "lowerRoman"_ostr;  break;
+        case SVX_NUM_ARABIC:                aType = "decimal"_ostr;     break;
 
         case SVX_NUM_BITMAP:
-        case SVX_NUM_CHAR_SPECIAL:          aType = "bullet";      break;
-
-        case style::NumberingType::CHARS_HEBREW: aType = "hebrew2"; break;
-        case style::NumberingType::NUMBER_HEBREW: aType = "hebrew1"; break;
-        case style::NumberingType::NUMBER_NONE: aType = "none"; break;
-        case style::NumberingType::FULLWIDTH_ARABIC: aType="decimalFullWidth"; break;
-        case style::NumberingType::TIAN_GAN_ZH: aType="ideographTraditional"; break;
-        case style::NumberingType::DI_ZI_ZH: aType="ideographZodiac"; break;
+        case SVX_NUM_CHAR_SPECIAL:          aType = "bullet"_ostr;      break;
+
+        case style::NumberingType::CHARS_HEBREW: aType = "hebrew2"_ostr; break;
+        case style::NumberingType::NUMBER_HEBREW: aType = "hebrew1"_ostr; break;
+        case style::NumberingType::NUMBER_NONE: aType = "none"_ostr; break;
+        case style::NumberingType::FULLWIDTH_ARABIC: aType="decimalFullWidth"_ostr; break;
+        case style::NumberingType::TIAN_GAN_ZH: aType="ideographTraditional"_ostr; break;
+        case style::NumberingType::DI_ZI_ZH: aType="ideographZodiac"_ostr; break;
         case style::NumberingType::NUMBER_LOWER_ZH:
-            aType="taiwaneseCountingThousand";
+            aType="taiwaneseCountingThousand"_ostr;
             if (pOutSet) {
                 const SvxLanguageItem& rLang = pOutSet->Get( RES_CHRATR_CJK_LANGUAGE);
                 const LanguageType eLang = rLang.GetLanguage();
 
                 if (LANGUAGE_CHINESE_SIMPLIFIED == eLang) {
-                    aType="chineseCountingThousand";
+                    aType="chineseCountingThousand"_ostr;
                 }
             }
         break;
-        case style::NumberingType::NUMBER_UPPER_ZH_TW: aType="ideographLegalTraditional";break;
-        case style::NumberingType::NUMBER_UPPER_ZH: aType="chineseLegalSimplified"; break;
-        case style::NumberingType::NUMBER_TRADITIONAL_JA: aType="japaneseLegal";break;
-        case style::NumberingType::AIU_FULLWIDTH_JA: aType="aiueoFullWidth";break;
-        case style::NumberingType::AIU_HALFWIDTH_JA: aType="aiueo";break;
-        case style::NumberingType::IROHA_FULLWIDTH_JA: aType="iroha";break;
-        case style::NumberingType::IROHA_HALFWIDTH_JA: aType="irohaFullWidth";break;
-        case style::NumberingType::HANGUL_SYLLABLE_KO: aType="ganada";break;
-        case style::NumberingType::HANGUL_JAMO_KO: aType="chosung";break;
-        case style::NumberingType::NUMBER_HANGUL_KO: aType="koreanCounting"; break;
-        case style::NumberingType::NUMBER_LEGAL_KO: aType = "koreanLegal"; break;
-        case style::NumberingType::NUMBER_DIGITAL_KO: aType = "koreanDigital"; break;
-        case style::NumberingType::NUMBER_DIGITAL2_KO: aType = "koreanDigital2"; break;
-        case style::NumberingType::CIRCLE_NUMBER: aType="decimalEnclosedCircle"; break;
-        case style::NumberingType::CHARS_ARABIC: aType="arabicAlpha"; break;
-        case style::NumberingType::CHARS_ARABIC_ABJAD: aType="arabicAbjad"; break;
-        case style::NumberingType::CHARS_THAI: aType="thaiLetters"; break;
+        case style::NumberingType::NUMBER_UPPER_ZH_TW: aType="ideographLegalTraditional"_ostr;break;
+        case style::NumberingType::NUMBER_UPPER_ZH: aType="chineseLegalSimplified"_ostr; break;
+        case style::NumberingType::NUMBER_TRADITIONAL_JA: aType="japaneseLegal"_ostr;break;
+        case style::NumberingType::AIU_FULLWIDTH_JA: aType="aiueoFullWidth"_ostr;break;
+        case style::NumberingType::AIU_HALFWIDTH_JA: aType="aiueo"_ostr;break;
+        case style::NumberingType::IROHA_FULLWIDTH_JA: aType="iroha"_ostr;break;
+        case style::NumberingType::IROHA_HALFWIDTH_JA: aType="irohaFullWidth"_ostr;break;
+        case style::NumberingType::HANGUL_SYLLABLE_KO: aType="ganada"_ostr;break;
+        case style::NumberingType::HANGUL_JAMO_KO: aType="chosung"_ostr;break;
+        case style::NumberingType::NUMBER_HANGUL_KO: aType="koreanCounting"_ostr; break;
+        case style::NumberingType::NUMBER_LEGAL_KO: aType = "koreanLegal"_ostr; break;
+        case style::NumberingType::NUMBER_DIGITAL_KO: aType = "koreanDigital"_ostr; break;
+        case style::NumberingType::NUMBER_DIGITAL2_KO: aType = "koreanDigital2"_ostr; break;
+        case style::NumberingType::CIRCLE_NUMBER: aType="decimalEnclosedCircle"_ostr; break;
+        case style::NumberingType::CHARS_ARABIC: aType="arabicAlpha"_ostr; break;
+        case style::NumberingType::CHARS_ARABIC_ABJAD: aType="arabicAbjad"_ostr; break;
+        case style::NumberingType::CHARS_THAI: aType="thaiLetters"_ostr; break;
         case style::NumberingType::CHARS_PERSIAN:
-        case style::NumberingType::CHARS_NEPALI: aType="hindiVowels"; break;
+        case style::NumberingType::CHARS_NEPALI: aType="hindiVowels"_ostr; break;
         case style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_RU:
-        case style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_RU: aType = "russianUpper"; break;
+        case style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_RU: aType = "russianUpper"_ostr; break;
         case style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_RU:
-        case style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_RU: aType = "russianLower"; break;
-        case style::NumberingType::TEXT_NUMBER: aType="ordinal"; break;
-        case style::NumberingType::TEXT_CARDINAL: aType="cardinalText"; break;
-        case style::NumberingType::TEXT_ORDINAL: aType="ordinalText"; break;
-        case style::NumberingType::SYMBOL_CHICAGO: aType="chicago"; break;
-        case style::NumberingType::ARABIC_ZERO: aType = "decimalZero"; break;
+        case style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_RU: aType = "russianLower"_ostr; break;
+        case style::NumberingType::TEXT_NUMBER: aType="ordinal"_ostr; break;
+        case style::NumberingType::TEXT_CARDINAL: aType="cardinalText"_ostr; break;
+        case style::NumberingType::TEXT_ORDINAL: aType="ordinalText"_ostr; break;
+        case style::NumberingType::SYMBOL_CHICAGO: aType="chicago"_ostr; break;
+        case style::NumberingType::ARABIC_ZERO: aType = "decimalZero"_ostr; break;
         case style::NumberingType::ARABIC_ZERO3:
-            aType = "custom";
-            rFormat = "001, 002, 003, ...";
+            aType = "custom"_ostr;
+            rFormat = "001, 002, 003, ..."_ostr;
             break;
         case style::NumberingType::ARABIC_ZERO4:
-            aType = "custom";
-            rFormat = "0001, 0002, 0003, ...";
+            aType = "custom"_ostr;
+            rFormat = "0001, 0002, 0003, ..."_ostr;
             break;
         case style::NumberingType::ARABIC_ZERO5:
-            aType = "custom";
-            rFormat = "00001, 00002, 00003, ...";
+            aType = "custom"_ostr;
+            rFormat = "00001, 00002, 00003, ..."_ostr;
             break;
 /*
         Fallback the rest to the suggested default.
@@ -8748,8 +8748,8 @@ void DocxAttributeOutput::WriteFootnoteEndnotePr( ::sax_fastparser::FSHelperPtr
     {
         switch( pFootnoteInfo->m_eNum )
         {
-            case FTNNUM_PAGE:       fmt = "eachPage"; break;
-            case FTNNUM_CHAPTER:    fmt = "eachSect"; break;
+            case FTNNUM_PAGE:       fmt = "eachPage"_ostr; break;
+            case FTNNUM_CHAPTER:    fmt = "eachSect"_ostr; break;
             default:                fmt.clear();      break;
         }
         if (!fmt.isEmpty())
@@ -9556,7 +9556,7 @@ void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
                 m_sOriginalBackgroundColor, RTL_TEXTENCODING_UTF8 );
 
         if ( aColor == COL_AUTO )
-            sColor = "auto";
+            sColor = "auto"_ostr;
 
         if( !m_pBackgroundAttrList.is() )
         {
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 776fe61ab89c..1ca7c61fba4d 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2019,10 +2019,10 @@ void lcl_TextFrameRelativeSize(std::vector<std::pair<OString, OString>>& rFlyPro
         switch (rSize.GetWidthPercentRelation())
         {
             case text::RelOrientation::PAGE_FRAME:
-                aRelation = "1"; // page
+                aRelation = "1"_ostr; // page
                 break;
             default:
-                aRelation = "0"; // margin
+                aRelation = "0"_ostr; // margin
                 break;
         }
         rFlyProperties.emplace_back(std::make_pair("sizerelh", aRelation));
@@ -2038,10 +2038,10 @@ void lcl_TextFrameRelativeSize(std::vector<std::pair<OString, OString>>& rFlyPro
     switch (rSize.GetHeightPercentRelation())
     {
         case text::RelOrientation::PAGE_FRAME:
-            aRelation = "1"; // page
+            aRelation = "1"_ostr; // page
             break;
         default:
-            aRelation = "0"; // margin
+            aRelation = "0"_ostr; // margin
             break;
     }
     rFlyProperties.emplace_back(std::make_pair("sizerelv", aRelation));
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 73ce9bc8434f..9ee7b7532d13 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -435,7 +435,7 @@ void MSWordStyles::BuildStyleIds()
         OString aStyleId = CreateStyleId(entry.ww_name);
 
         if (aStyleId.isEmpty())
-            aStyleId = "Style";
+            aStyleId = "Style"_ostr;
 
         OString aLower(aStyleId.toAsciiLowerCase());