Extended loplugin:ostr: vcl

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

9 files changed, 23 insertions, 23 deletions

diff --git a/vcl/source/filter/eps/eps.cxx b/vcl/source/filter/eps/eps.cxx
index 01aa684efff5..151ea1f73fc1 100644
--- a/vcl/source/filter/eps/eps.cxx
+++ b/vcl/source/filter/eps/eps.cxx
@@ -1230,7 +1230,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
 
                         if( pA->GetComment() == "XPATHSTROKE_SEQ_BEGIN" )
                         {
-                            sSeqEnd = "XPATHSTROKE_SEQ_END";
+                            sSeqEnd = "XPATHSTROKE_SEQ_END"_ostr;
                             SvtGraphicStroke aStroke;
                             ReadSvtGraphicStroke( aMemStm, aStroke );
 
@@ -1265,7 +1265,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
                         }
                         else if (pA->GetComment() == "XPATHFILL_SEQ_BEGIN")
                         {
-                            sSeqEnd = "XPATHFILL_SEQ_END";
+                            sSeqEnd = "XPATHFILL_SEQ_END"_ostr;
                             SvtGraphicFill aFill;
                             ReadSvtGraphicFill( aMemStm, aFill );
                             switch( aFill.getFillType() )
diff --git a/vcl/source/filter/idxf/dxfblkrd.cxx b/vcl/source/filter/idxf/dxfblkrd.cxx
index b5a96b93ea9a..3c1e11923887 100644
--- a/vcl/source/filter/idxf/dxfblkrd.cxx
+++ b/vcl/source/filter/idxf/dxfblkrd.cxx
@@ -38,13 +38,13 @@ DXFBlock::~DXFBlock()
 
 void DXFBlock::Read(DXFGroupReader & rDGR)
 {
-    m_sName = "";
-    m_sAlsoName = "";
+    m_sName = ""_ostr;
+    m_sAlsoName = ""_ostr;
     aBasePoint.fx=0.0;
     aBasePoint.fy=0.0;
     aBasePoint.fz=0.0;
     nFlags=0;
-    m_sXRef = "";
+    m_sXRef = ""_ostr;
 
     while (rDGR.Read()!=0)
     {
diff --git a/vcl/source/filter/idxf/dxfgrprd.cxx b/vcl/source/filter/idxf/dxfgrprd.cxx
index 48cdb3660a6b..3319882e3245 100644
--- a/vcl/source/filter/idxf/dxfgrprd.cxx
+++ b/vcl/source/filter/idxf/dxfgrprd.cxx
@@ -149,7 +149,7 @@ sal_uInt16 DXFGroupReader::Read()
     if ( !bStatus )
     {
         nG = 0;
-        S = "EOF";
+        S = "EOF"_ostr;
     }
     nLastG = nG;
     return nG;
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index d34095d25d71..1c8c2f6b5ff6 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -772,7 +772,7 @@ static void GetNames(AbstractTrueTypeFont *t)
             t->psname = OString(std::string_view(pReverse, nReverseLen));
         }
         else
-            t->psname = "Unknown";
+            t->psname = "Unknown"_ostr;
     }
 
     /* Font family and subfamily names: preferred Apple */
diff --git a/vcl/source/gdi/WidgetDefinition.cxx b/vcl/source/gdi/WidgetDefinition.cxx
index c7d6032dfccc..1c8fb1321ecd 100644
--- a/vcl/source/gdi/WidgetDefinition.cxx
+++ b/vcl/source/gdi/WidgetDefinition.cxx
@@ -80,13 +80,13 @@ WidgetDefinitionPart::getStates(ControlType eType, ControlPart ePart, ControlSta
 
                 if (rTabItemValue.isLeftAligned() && rTabItemValue.isRightAligned()
                     && rTabItemValue.isFirst() && rTabItemValue.isLast())
-                    sExtra = "first_last";
+                    sExtra = "first_last"_ostr;
                 else if (rTabItemValue.isLeftAligned() || rTabItemValue.isFirst())
-                    sExtra = "first";
+                    sExtra = "first"_ostr;
                 else if (rTabItemValue.isRightAligned() || rTabItemValue.isLast())
-                    sExtra = "last";
+                    sExtra = "last"_ostr;
                 else
-                    sExtra = "middle";
+                    sExtra = "middle"_ostr;
             }
             break;
             case ControlType::ListHeader:
@@ -94,9 +94,9 @@ WidgetDefinitionPart::getStates(ControlType eType, ControlPart ePart, ControlSta
                 if (ePart == ControlPart::Arrow)
                 {
                     if (rValue.getNumericVal() == 1)
-                        sExtra = "down";
+                        sExtra = "down"_ostr;
                     else
-                        sExtra = "up";
+                        sExtra = "up"_ostr;
                 }
             }
             break;
@@ -104,7 +104,7 @@ WidgetDefinitionPart::getStates(ControlType eType, ControlPart ePart, ControlSta
             {
                 auto const& rPushButtonValue = static_cast<PushButtonValue const&>(rValue);
                 if (rPushButtonValue.mbIsAction)
-                    sExtra = "action";
+                    sExtra = "action"_ostr;
             }
             break;
             default:
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index f132c585fde3..d23a97c4e204 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -4199,8 +4199,8 @@ void PDFWriterImpl::createDefaultPushButtonAppearance( PDFWidget& rButton, const
        the DA and MK work as expected, but on AR5 this creates a region
        filled with the background color but nor text. Urgh.
     */
-    rButton.m_aMKDict = "/BC [] /BG [] /CA";
-    rButton.m_aMKDictCAString = "";
+    rButton.m_aMKDict = "/BC [] /BG [] /CA"_ostr;
+    rButton.m_aMKDictCAString = ""_ostr;
 }
 
 Font PDFWriterImpl::drawFieldBorder( PDFWidget& rIntern,
@@ -4431,8 +4431,8 @@ void PDFWriterImpl::createDefaultCheckBoxAppearance( PDFWidget& rBox, const PDFW
     aDR.append( " 0 R" );
     rBox.m_aDRDict = aDR.makeStringAndClear();
     rBox.m_aDAString = aDA.makeStringAndClear();
-    rBox.m_aMKDict = "/CA";
-    rBox.m_aMKDictCAString = "8";
+    rBox.m_aMKDict = "/CA"_ostr;
+    rBox.m_aMKDictCAString = "8"_ostr;
     rBox.m_aRect = aCheckRect;
 
     // create appearance streams
@@ -4530,9 +4530,9 @@ void PDFWriterImpl::createDefaultRadioButtonAppearance( PDFWidget& rBox, const P
     pop();
 
     //to encrypt this (el)
-    rBox.m_aMKDict = "/CA";
+    rBox.m_aMKDict = "/CA"_ostr;
     //after this assignment, to m_aMKDic cannot be added anything
-    rBox.m_aMKDictCAString = "l";
+    rBox.m_aMKDictCAString = "l"_ostr;
 
     rBox.m_aRect = aCheckRect;
 
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 45bbeda76b94..2474da389530 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -1853,7 +1853,7 @@ char* PPDContext::getStreamableBuffer( sal_uLong& rBytes ) const
         if( elem.second )
             aCopy = OUStringToOString(elem.second->m_aOption, RTL_TEXTENCODING_MS_1252);
         else
-            aCopy = "*nil";
+            aCopy = "*nil"_ostr;
         nBytes = aCopy.getLength();
         memcpy( pRun, aCopy.getStr(), nBytes );
         pRun += nBytes;
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 870390e39e08..e92005136487 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -364,7 +364,7 @@ void PrinterInfoManager::initialize()
                         #if defined __sun
                         aValue = "lp";
                         #else
-                        aValue = "lpr";
+                        aValue = "lpr"_ostr;
                         #endif
                     }
                     aPrinter.m_aInfo.m_aCommand = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8);
diff --git a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
index aeaeccf51831..4b93d0361706 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
@@ -1025,7 +1025,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute()
                                     RTL_TEXTENCODING_UTF8
                                   );
 
-                                toReplace = "$dirname$";
+                                toReplace = "$dirname$"_ostr;
 
                                 aMsg = aMsg.replaceAt(
                                   aMsg.indexOf( toReplace ),