use OUString::Concat here, not OUStringLiteral

Change-Id: Ia2172bcab60f32c9d9d4f6ca0230484343eef69b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114321
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

19 files changed, 24 insertions, 24 deletions

diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index fcd491462528..6b0451b01a1d 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -4840,7 +4840,7 @@ void SbUnoStructRefObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                 // Id == -1: Display implemented interfaces according the ClassProvider
                 if( nId == -1 )     // Property ID_DBG_SUPPORTEDINTERFACES"
                 {
-                    OUString aRet = OUStringLiteral( ID_DBG_SUPPORTEDINTERFACES )
+                    OUString aRet = OUString::Concat( ID_DBG_SUPPORTEDINTERFACES )
                                   + " not available.\n(TypeClass is not TypeClass_INTERFACE)\n";
 
                     pVar->PutString( aRet );
diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx
index ca7af7dd4090..07d1d85e53ee 100644
--- a/basic/source/comp/buffer.cxx
+++ b/basic/source/comp/buffer.cxx
@@ -82,7 +82,7 @@ void SbiBuffer::Chain( sal_uInt32 off )
         if ((i + sizeof(sal_uInt32)) > GetSize())
         {
             m_aErrCode = ERRCODE_BASIC_INTERNAL_ERROR;
-            m_sErrMsg = OUStringLiteral(u"BACKCHAIN");
+            m_sErrMsg = "BACKCHAIN";
             break;
         }
         auto ip = m_aBuf.begin() + i;
diff --git a/connectivity/source/drivers/mysql_jdbc/YTable.cxx b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
index 7e08f896fddb..26e0fde19632 100644
--- a/connectivity/source/drivers/mysql_jdbc/YTable.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
@@ -198,7 +198,7 @@ void SAL_CALL OMySQLTable::alterColumnByName(const OUString& colName,
                 {
                     if (sTypeName.indexOf(s_sAutoIncrement) == -1)
                     {
-                        sTypeName += OUStringLiteral(u" ") + s_sAutoIncrement;
+                        sTypeName += OUString::Concat(" ") + s_sAutoIncrement;
                         descriptor->setPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPENAME),
                                                      makeAny(sTypeName));
                     }
diff --git a/cui/source/customize/SvxConfigPageHelper.cxx b/cui/source/customize/SvxConfigPageHelper.cxx
index 527754d5cf5f..39044173b8ed 100644
--- a/cui/source/customize/SvxConfigPageHelper.cxx
+++ b/cui/source/customize/SvxConfigPageHelper.cxx
@@ -177,7 +177,7 @@ sal_uInt32 SvxConfigPageHelper::generateRandomValue()
 
 OUString SvxConfigPageHelper::generateCustomURL(SvxEntries* entries)
 {
-    OUString url = OUStringLiteral(ITEM_TOOLBAR_URL) + CUSTOM_TOOLBAR_STR +
+    OUString url = OUString::Concat(ITEM_TOOLBAR_URL) + CUSTOM_TOOLBAR_STR +
                    // use a random number to minimize possible clash with existing custom toolbars
                    OUString::number(generateRandomValue(), 16);
 
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index f5a68212922d..fcfaf5608293 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -123,7 +123,7 @@ BibConfig::BibConfig()
         Sequence<OUString> aHistoryNames(3);
         OUString* pHistoryNames = aHistoryNames.getArray();
 
-        OUString sPrefix = OUStringLiteral(cDataSourceHistory) + "/" + nodeName + "/";
+        OUString sPrefix = OUString::Concat(cDataSourceHistory) + "/" + nodeName + "/";
         pHistoryNames[0] = sPrefix + "DataSourceName";
         pHistoryNames[1] = sPrefix + "Command";
         pHistoryNames[2] = sPrefix + "CommandType";
@@ -215,7 +215,7 @@ void    BibConfig::ImplCommit()
     for(sal_Int32 i = 0; i < static_cast<sal_Int32>(mvMappings.size()); i++)
     {
         const Mapping* pMapping = mvMappings[i].get();
-        OUString sPrefix = OUStringLiteral(cDataSourceHistory) + "/_" + OUString::number(i) + "/";
+        OUString sPrefix = OUString::Concat(cDataSourceHistory) + "/_" + OUString::number(i) + "/";
         pNodeValues[nIndex].Name    = sPrefix + "DataSourceName";
         pNodeValues[nIndex++].Value <<= pMapping->sURL;
         pNodeValues[nIndex].Name    = sPrefix + "Command";
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index fd94e541ac2b..6392146c699a 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -1376,7 +1376,7 @@ void SVGFilter::implGenerateMetaData()
         {
             for( sal_Int32 i = 0, nSize = aFieldSet.size(); i < nSize; ++i )
             {
-                OUString sElemId = OUStringLiteral(aOOOElemTextField) + "_" + OUString::number( i );
+                OUString sElemId = OUString::Concat(aOOOElemTextField) + "_" + OUString::number( i );
                 mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sElemId );
                 aFieldSet[i]->elementExport( mpSVGExport.get() );
             }
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index bb40c4965f7c..f3645d1bd81f 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2200,7 +2200,7 @@ void SVGActionWriter::ImplStartClipRegion(sal_Int32 nClipPathId)
     if (nClipPathId == 0)
         return;
 
-    OUString aUrl = OUStringLiteral(u"url(#") + aPrefixClipPathId + OUString::number( nClipPathId ) + ")";
+    OUString aUrl = OUString::Concat("url(#") + aPrefixClipPathId + OUString::number( nClipPathId ) + ")";
     mrExport.AddAttribute( XML_NAMESPACE_NONE, "clip-path", aUrl );
     mpCurrentClipRegionElem.reset( new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, true, true ) );
 }
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index 431b02ea6da0..82fddb7a71ff 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -102,10 +102,10 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > OXMLCell::createFastCh
             }
             break;
         case XML_ELEMENT(TEXT, XML_PAGE_NUMBER):
-            m_sText += OUStringLiteral(s_sStringConcat) + " PageNumber()";
+            m_sText += OUString::Concat(s_sStringConcat) + " PageNumber()";
             break;
         case XML_ELEMENT(TEXT, XML_PAGE_COUNT):
-            m_sText += OUStringLiteral(s_sStringConcat) + " PageCount()";
+            m_sText += OUString::Concat(s_sStringConcat) + " PageCount()";
             break;
         case XML_ELEMENT(REPORT, XML_FORMATTED_TEXT):
             {
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index c860728046cd..4cffdd300a16 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -150,11 +150,11 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > OXMLFixedContent::crea
                                                 0x0020, true );
             break;
         case XML_ELEMENT(TEXT, XML_PAGE_NUMBER):
-            m_sPageText += OUStringLiteral(s_sStringConcat) + " PageNumber()";
+            m_sPageText += OUString::Concat(s_sStringConcat) + " PageNumber()";
             m_bFormattedField = true;
             break;
         case XML_ELEMENT(TEXT, XML_PAGE_COUNT):
-            m_sPageText += OUStringLiteral(s_sStringConcat) + " PageCount()";
+            m_sPageText += OUString::Concat(s_sStringConcat) + " PageCount()";
             m_bFormattedField = true;
             break;
         default:
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 340b8c437d7d..eee01d48f056 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -869,7 +869,7 @@ bool rewriteFlatpakHelpRootUrl(OUString * helpRootUrl) {
             //   /.../runtime/org.libreoffice.LibreOffice.Help/<arch>/<branch>/<sha>/files
             // because the extension's files are stored at a different place than the app's files,
             // so use this hack until flatpak itself provides a better solution:
-            static constexpr auto segments = OUStringLiteral(u"/app/org.libreoffice.LibreOffice/");
+            static constexpr OUStringLiteral segments = u"/app/org.libreoffice.LibreOffice/";
             auto const i1 = path.lastIndexOf(segments);
                 // use lastIndexOf instead of indexOf, in case the user-controlled prefix /.../
                 // happens to contain such segments
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 476b8c6ae41e..a02010e0b3a7 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -1753,7 +1753,7 @@ SfxDocumentMetaData::loadFromStorage(
     try {
         xPropArg->getPropertyValue("BaseURI")
             >>= input.sSystemId;
-        input.sSystemId += OUStringLiteral(u"/") + s_meta;
+        input.sSystemId += OUString::Concat("/") + s_meta;
     } catch (const css::uno::Exception &) {
         input.sSystemId = s_meta;
     }
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 10008bdd73ac..25b980b6dc19 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -292,7 +292,7 @@ static void lcl_formatReferenceLanguage( OUString& rRefText,
             0x00E1, 0x00C1, 0x00E9, 0x00C9, 0x00ED, 0x00CD,
             0x00F3, 0x00D3, 0x00F6, 0x00D6, 0x0151, 0x0150,
             0x00FA, 0x00DA, 0x00FC, 0x00DC, 0x0171, 0x0170, 0 };
-        static OUString sVowels = OUStringLiteral(u"aAeEiIoOuU") + sVowelsWithDiacritic;
+        static OUString sVowels = OUString::Concat(u"aAeEiIoOuU") + sVowelsWithDiacritic;
 
         // handle more than 1-letter long Roman numbers and
         // their possible combinations with letters:
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index 989457ef6244..5986a93f1ffb 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -592,7 +592,7 @@ void SwHTMLParser::InsertCommentText( const char *pTag )
     m_aContents += aToken;
     if( bEmpty && pTag )
     {
-        m_aContents = OUStringLiteral(u"HTML: <") + OUStringChar(*pTag) + ">" + m_aContents;
+        m_aContents = OUString::Concat("HTML: <") + OUStringChar(*pTag) + ">" + m_aContents;
     }
 }
 
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index c278d57588ec..c2e72732878a 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -908,7 +908,7 @@ void WW8AttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 /*nPos*/,
     aStr += OUString::number((aWW8Ruby.GetRubyHeight() + 5) / 10) + " \\o";
     if (aWW8Ruby.GetDirective())
     {
-        aStr += OUStringLiteral(u"\\a") + OUStringChar(aWW8Ruby.GetDirective());
+        aStr += OUString::Concat(u"\\a") + OUStringChar(aWW8Ruby.GetDirective());
     }
     aStr += "(\\s\\up " + OUString::number((aWW8Ruby.GetBaseHeight() + 10) / 20 - 1) + "(";
     aStr += rRuby.GetText() + ")";
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 5db9cb10d5b0..c37ccf2d1470 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -7463,7 +7463,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib const & rFib )
 #ifdef OSL_BIGENDIAN
                     swapEndian(pSecondary);
 #endif
-                    p->sFontname += OUStringLiteral(u";") + pSecondary;
+                    p->sFontname += OUString::Concat(";") + pSecondary;
                 }
 
                 // #i43762# check font name for illegal characters
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index 083e1a73e0d0..969ca4976d36 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -302,7 +302,7 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
         sal_Int32 nAssign;
         for(nAssign = 0; nAssign < aAssignProperties.getLength(); nAssign += 4)
         {
-            OUString sAssignPath = OUStringLiteral(cAddressDataAssignments) +
+            OUString sAssignPath = OUString::Concat(cAddressDataAssignments) +
                 "/" +
                 pAssignments[nAssign / 4] +
                 "/";
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 3ea129b8aeea..95332b442530 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -200,9 +200,9 @@ OUString Qt5Instance::constructToolkitID(std::u16string_view sTKname)
 {
     OUString sID(sTKname + OUStringLiteral(u" ("));
     if (m_bUseCairo)
-        sID += OUStringLiteral(u"cairo+");
+        sID += "cairo+";
     else
-        sID += OUStringLiteral(u"qfont+");
+        sID += "qfont+";
     sID += toOUString(QGuiApplication::platformName()) + OUStringLiteral(u")");
     return sID;
 }
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index 42a3d4ad258e..4dd12668b48d 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.cxx
@@ -267,7 +267,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey )
                 if ( maMnemonics[nMnemonicIndex] )
                 {
                     maMnemonics[nMnemonicIndex] = 0;
-                    OUString aStr = OUStringLiteral(u"(") + OUStringChar(m_cMnemonic) +
+                    OUString aStr = OUString::Concat("(") + OUStringChar(m_cMnemonic) +
                             OUStringChar(sal_Unicode(rtl::toAsciiUpperCase(c))) +
                             ")";
                     nIndex = rKey.getLength();
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index b3ab45c378f2..4269f2e7f67d 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -2760,7 +2760,7 @@ void XMLDdeFieldImportContext::endFastElement(sal_Int32 )
         return;
 
     // find master
-    OUString sMasterName = OUStringLiteral(sAPI_fieldmaster_prefix) + sAPI_dde + "." + sName;
+    OUString sMasterName = OUString::Concat(sAPI_fieldmaster_prefix) + sAPI_dde + "." + sName;
 
     Reference<XTextFieldsSupplier> xTextFieldsSupp(GetImport().GetModel(),
                                                    UNO_QUERY);
@@ -2777,7 +2777,7 @@ void XMLDdeFieldImportContext::endFastElement(sal_Int32 )
     xMaster->setPropertyValue( sPropertyContent, uno::makeAny( GetContent()));
     // master exists: create text field and attach
     Reference<XPropertySet> xField;
-    OUString sFieldName = OUStringLiteral(sAPI_textfield_prefix) + sAPI_dde;
+    OUString sFieldName = OUString::Concat(sAPI_textfield_prefix) + sAPI_dde;
     if (!CreateField(xField, sFieldName))
         return;