Rename OUStringLiteral1 to OUStringChar

It started out as a wrapper around character literals, but has by now become a
wrapper around arbitrary single characters.  Besides updating the documentation,
this change is a mechanical

for i in $(git grep -Fl OUStringLiteral1); do sed -i -e s/OUStringLiteral1/OUStringChar/g "$i"; done

Change-Id: I1b9eaa4b3fbc9025ce4a4bffea3db1c16188b76f
Reviewed-on: https://gerrit.libreoffice.org/80892
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

15 files changed, 64 insertions, 64 deletions

diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 3a130a79d317..4ead5f41f49b 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -567,7 +567,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TableToFromHdl, weld::Button&, rButton, void
                 // first delete the existing selection
                 aStr = aStr.replaceAt( nPos, nSel, "" );
 
-            aField = OUStringLiteral1(cDBFieldStart) + aField + OUStringLiteral1(cDBFieldEnd);
+            aField = OUStringChar(cDBFieldStart) + aField + OUStringChar(cDBFieldEnd);
             if( !aStr.isEmpty() )
             {
                 if( nPos )                          // one blank in front
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index ad2c452eae3b..8a2dcf3f6766 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -296,10 +296,10 @@ SwFrameFormat* SwMailMergeLayoutPage::InsertAddressFrame(
         SwFieldMgr aFieldMgr(&rShell);
         //create a database string source.command.commandtype.column
         const SwDBData& rData = rConfigItem.GetCurrentDBData();
-        OUString sDBName(rData.sDataSource + OUStringLiteral1(DB_DELIM)
-            + rData.sCommand + OUStringLiteral1(DB_DELIM));
+        OUString sDBName(rData.sDataSource + OUStringChar(DB_DELIM)
+            + rData.sCommand + OUStringChar(DB_DELIM));
         const OUString sDatabaseConditionPrefix(sDBName.replace(DB_DELIM, '.'));
-        sDBName += OUString::number(rData.nCommandType) + OUStringLiteral1(DB_DELIM);
+        sDBName += OUString::number(rData.nCommandType) + OUStringChar(DB_DELIM);
 
         // if only the country is in an address line the
         // paragraph has to be hidden depending on the
@@ -487,9 +487,9 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
             const OUString sConditionBase("[" + sCommonBase + sGenderColumn + "]");
             const OUString sNameColumnBase("[" + sCommonBase + sNameColumn + "]");
 
-            const OUString sDBName(rData.sDataSource + OUStringLiteral1(DB_DELIM)
-                + rData.sCommand + OUStringLiteral1(DB_DELIM)
-                + OUString::number(rData.nCommandType) + OUStringLiteral1(DB_DELIM));
+            const OUString sDBName(rData.sDataSource + OUStringChar(DB_DELIM)
+                + rData.sCommand + OUStringChar(DB_DELIM)
+                + OUString::number(rData.nCommandType) + OUStringChar(DB_DELIM));
 
 //          Female:  [database.sGenderColumn] != "rFemaleGenderValue" && [database.NameColumn]
 //          Male:    [database.sGenderColumn] == "rFemaleGenderValue" && [database.rGenderColumn]
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 0715f8e85009..a37be3c24dff 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -296,7 +296,7 @@ void SwAsciiFilterDlg::FillOptions( SwAsciiOptions& rOptions )
             if( -1 != nEnd )
                 m_sExtraData = m_sExtraData.replaceAt( nStt, nEnd - nStt + 1, "" );
         }
-        m_sExtraData += sFindNm + sData + OUStringLiteral1(cDialogExtraDataClose);
+        m_sExtraData += sFindNm + sData + OUStringChar(cDialogExtraDataClose);
     }
 }
 
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 49f398fc5777..e4147262859e 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -223,11 +223,11 @@ void SectRepr::SetFile( const OUString& rFile )
 
     if( !rFile.isEmpty() || !sSub.isEmpty() )
     {
-        sNewFile += OUStringLiteral1(sfx2::cTokenSeparator);
+        sNewFile += OUStringChar(sfx2::cTokenSeparator);
         if( !rFile.isEmpty() ) // Filter only with FileName
             sNewFile += sOldFileName.getToken( 1, sfx2::cTokenSeparator );
 
-        sNewFile += OUStringLiteral1(sfx2::cTokenSeparator) + sSub;
+        sNewFile += OUStringChar(sfx2::cTokenSeparator) + sSub;
     }
 
     m_SectionData.SetLinkFileName( sNewFile );
@@ -251,10 +251,10 @@ void SectRepr::SetFilter( const OUString& rFilter )
     const OUString sSub( sOldFileName.getToken( 1, sfx2::cTokenSeparator, nIdx ) );  // token 2
 
     if( !sFile.isEmpty() )
-        sNewFile = sFile + OUStringLiteral1(sfx2::cTokenSeparator) +
-                   rFilter + OUStringLiteral1(sfx2::cTokenSeparator) + sSub;
+        sNewFile = sFile + OUStringChar(sfx2::cTokenSeparator) +
+                   rFilter + OUStringChar(sfx2::cTokenSeparator) + sSub;
     else if( !sSub.isEmpty() )
-        sNewFile = OUStringLiteral1(sfx2::cTokenSeparator) + OUStringLiteral1(sfx2::cTokenSeparator) + sSub;
+        sNewFile = OUStringChar(sfx2::cTokenSeparator) + OUStringChar(sfx2::cTokenSeparator) + sSub;
 
     m_SectionData.SetLinkFileName( sNewFile );
 
@@ -273,8 +273,8 @@ void SectRepr::SetSubRegion(const OUString& rSubRegion)
     const OUString sFilter( sLinkFileName.getToken( 0, sfx2::cTokenSeparator, n ) );
 
     if( !rSubRegion.isEmpty() || !sOldFileName.isEmpty() )
-        sNewFile = sOldFileName + OUStringLiteral1(sfx2::cTokenSeparator) +
-                   sFilter + OUStringLiteral1(sfx2::cTokenSeparator) + rSubRegion;
+        sNewFile = sOldFileName + OUStringChar(sfx2::cTokenSeparator) +
+                   sFilter + OUStringChar(sfx2::cTokenSeparator) + rSubRegion;
 
     m_SectionData.SetLinkFileName( sNewFile );
 
@@ -299,8 +299,8 @@ OUString SectRepr::GetFile() const
     if (DDE_LINK_SECTION == m_SectionData.GetType())
     {
         sal_Int32 n = 0;
-        return sLinkFile.replaceFirst( OUStringLiteral1(sfx2::cTokenSeparator), " ", &n )
-                        .replaceFirst( OUStringLiteral1(sfx2::cTokenSeparator), " ", &n );
+        return sLinkFile.replaceFirst( OUStringChar(sfx2::cTokenSeparator), " ", &n )
+                        .replaceFirst( OUStringChar(sfx2::cTokenSeparator), " ", &n );
     }
     return INetURLObject::decode( sLinkFile.getToken( 0, sfx2::cTokenSeparator ),
                                   INetURLObject::DecodeMechanism::Unambiguous );
@@ -1133,10 +1133,10 @@ IMPL_LINK(SwEditRegionDlg, FileNameEntryHdl, weld::Entry&, rEdit, void)
     {
         OUString sLink( SwSectionData::CollapseWhiteSpaces(rEdit.get_text()) );
         sal_Int32 nPos = 0;
-        sLink = sLink.replaceFirst( " ", OUStringLiteral1(sfx2::cTokenSeparator), &nPos );
+        sLink = sLink.replaceFirst( " ", OUStringChar(sfx2::cTokenSeparator), &nPos );
         if (nPos>=0)
         {
-            sLink = sLink.replaceFirst( " ", OUStringLiteral1(sfx2::cTokenSeparator), &nPos );
+            sLink = sLink.replaceFirst( " ", OUStringChar(sfx2::cTokenSeparator), &nPos );
         }
 
         pSectRepr->GetSectionData().SetLinkFileName( sLink );
@@ -1576,10 +1576,10 @@ bool SwInsertSectionTabPage::FillItemSet( SfxItemSet* )
         {
             aLinkFile = SwSectionData::CollapseWhiteSpaces(sFileName);
             sal_Int32 nPos = 0;
-            aLinkFile = aLinkFile.replaceFirst( " ", OUStringLiteral1(sfx2::cTokenSeparator), &nPos );
+            aLinkFile = aLinkFile.replaceFirst( " ", OUStringChar(sfx2::cTokenSeparator), &nPos );
             if (nPos>=0)
             {
-                aLinkFile = aLinkFile.replaceFirst( " ", OUStringLiteral1(sfx2::cTokenSeparator), &nPos );
+                aLinkFile = aLinkFile.replaceFirst( " ", OUStringChar(sfx2::cTokenSeparator), &nPos );
             }
         }
         else
@@ -1595,8 +1595,8 @@ bool SwInsertSectionTabPage::FillItemSet( SfxItemSet* )
                 aSection.SetLinkFilePassword( m_sFilePasswd );
             }
 
-            aLinkFile += OUStringLiteral1(sfx2::cTokenSeparator) + m_sFilterName
-                      +  OUStringLiteral1(sfx2::cTokenSeparator) + sSubRegion;
+            aLinkFile += OUStringChar(sfx2::cTokenSeparator) + m_sFilterName
+                      +  OUStringChar(sfx2::cTokenSeparator) + sSubRegion;
         }
 
         aSection.SetLinkFileName(aLinkFile);
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 23117247e948..8bf64749c9bd 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -220,7 +220,7 @@ void SwEnvPage::Init(SwEnvDlg* pDialog)
     m_xSenderBox->connect_clicked(LINK(this, SwEnvPage, SenderHdl));
 
     SwDBData aData = m_pSh->GetDBData();
-    m_sActDBName = aData.sDataSource + OUStringLiteral1(DB_DELIM) + aData.sCommand;
+    m_sActDBName = aData.sDataSource + OUStringChar(DB_DELIM) + aData.sCommand;
     InitDatabaseBox();
 }
 
@@ -236,7 +236,7 @@ IMPL_LINK( SwEnvPage, DatabaseHdl, weld::ComboBox&, rListBox, void )
     {
         m_sActDBName = rListBox.get_active_text();
         m_pSh->GetDBManager()->GetTableNames(*m_xTableLB, m_sActDBName);
-        m_sActDBName += OUStringLiteral1(DB_DELIM);
+        m_sActDBName += OUStringChar(DB_DELIM);
     }
     else
     {
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 5f076a0681c7..4586a067cff7 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -184,7 +184,7 @@ void SwChangeDBDlg::UpdateFields()
             std::unique_ptr<weld::TreeIter> xIter(m_xUsedDBTLB->make_iterator(&rEntry));
             m_xUsedDBTLB->iter_parent(*xIter);
             OUString sTmp(m_xUsedDBTLB->get_text(*xIter) +
-                          OUStringLiteral1(DB_DELIM) + m_xUsedDBTLB->get_text(rEntry) + OUStringLiteral1(DB_DELIM) +
+                          OUStringChar(DB_DELIM) + m_xUsedDBTLB->get_text(rEntry) + OUStringChar(DB_DELIM) +
                           m_xUsedDBTLB->get_id(rEntry));
             aDBNames.push_back(sTmp);
         }
@@ -197,9 +197,9 @@ void SwChangeDBDlg::UpdateFields()
     sal_Bool bIsTable = false;
     const OUString DBName(m_xAvailDBTLB->GetDBName(sTableName, sColumnName, &bIsTable));
     const OUString sTemp = DBName
-        + OUStringLiteral1(DB_DELIM)
+        + OUStringChar(DB_DELIM)
         + sTableName
-        + OUStringLiteral1(DB_DELIM)
+        + OUStringChar(DB_DELIM)
         + OUString::number(bIsTable
                             ? CommandType::TABLE
                             : CommandType::QUERY);
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index fc4dbde5f978..dfa97a5c1a5b 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -210,14 +210,14 @@ bool SwFieldDBPage::FillItemSet(SfxItemSet* )
         sal_uInt16 nSubType = 0;
 
         OUString sDBName = aData.sDataSource
-            + OUStringLiteral1(DB_DELIM)
+            + OUStringChar(DB_DELIM)
             + aData.sCommand
-            + OUStringLiteral1(DB_DELIM)
+            + OUStringChar(DB_DELIM)
             + OUString::number(aData.nCommandType)
-            + OUStringLiteral1(DB_DELIM);
+            + OUStringChar(DB_DELIM);
         if (!sColumnName.isEmpty())
         {
-            sDBName += sColumnName + OUStringLiteral1(DB_DELIM);
+            sDBName += sColumnName + OUStringChar(DB_DELIM);
         }
         OUString aName = sDBName + m_xConditionED->get_text();
 
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 38ec5c9d2952..1a3b94d2d19a 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -550,7 +550,7 @@ bool SwFieldFuncPage::FillItemSet(SfxItemSet* )
             for (sal_Int32 i = 0, nEntryCount = m_xListItemsLB->n_children(); i < nEntryCount; ++i)
             {
                 if(i)
-                    aVal += OUStringLiteral1(DB_DELIM);
+                    aVal += OUStringChar(DB_DELIM);
                 aVal += m_xListItemsLB->get_text(i);
             }
         }
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 38a5b6a81520..f3626ddac505 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -438,8 +438,8 @@ void SwFieldVarPage::SubTypeHdl(const weld::TreeView* pBox)
                         //              That's not considered here yet
                         OUString sCmd( pType->GetCmd() );
                         sal_Int32 nTmpPos = 0;
-                        sCmd = sCmd.replaceFirst( OUStringLiteral1(sfx2::cTokenSeparator), " ", &nTmpPos );
-                        sCmd = sCmd.replaceFirst( OUStringLiteral1(sfx2::cTokenSeparator), " ", &nTmpPos );
+                        sCmd = sCmd.replaceFirst( OUStringChar(sfx2::cTokenSeparator), " ", &nTmpPos );
+                        sCmd = sCmd.replaceFirst( OUStringChar(sfx2::cTokenSeparator), " ", &nTmpPos );
 
                         m_xValueED->set_text( sCmd );
                         m_xFormatLB->select(static_cast<int>(pType->GetType()));
@@ -1005,8 +1005,8 @@ IMPL_LINK(SwFieldVarPage, TBClickHdl, weld::Button&, rBox, void)
                         // DDE-Topics/-Items can have blanks in their names!
                         //  That's not being considered here yet.
                         sal_Int32 nTmpPos = 0;
-                        sValue = sValue.replaceFirst( " ", OUStringLiteral1(sfx2::cTokenSeparator), &nTmpPos );
-                        sValue = sValue.replaceFirst( " ", OUStringLiteral1(sfx2::cTokenSeparator), &nTmpPos );
+                        sValue = sValue.replaceFirst( " ", OUStringChar(sfx2::cTokenSeparator), &nTmpPos );
+                        sValue = sValue.replaceFirst( " ", OUStringChar(sfx2::cTokenSeparator), &nTmpPos );
                         static_cast<SwDDEFieldType*>(pType)->SetCmd(sValue);
                         static_cast<SwDDEFieldType*>(pType)->SetType(static_cast<SfxLinkUpdateMode>(nFormat));
                     }
@@ -1044,8 +1044,8 @@ IMPL_LINK(SwFieldVarPage, TBClickHdl, weld::Button&, rBox, void)
                     // DDE-Topics/-Items can have blanks in their names!
                     //  That's not being considered here yet.
                     sal_Int32 nTmpPos = 0;
-                    sValue = sValue.replaceFirst( " ", OUStringLiteral1(sfx2::cTokenSeparator), &nTmpPos );
-                    sValue = sValue.replaceFirst( " ", OUStringLiteral1(sfx2::cTokenSeparator), &nTmpPos );
+                    sValue = sValue.replaceFirst( " ", OUStringChar(sfx2::cTokenSeparator), &nTmpPos );
+                    sValue = sValue.replaceFirst( " ", OUStringChar(sfx2::cTokenSeparator), &nTmpPos );
 
                     SwDDEFieldType aType(sName, sValue, static_cast<SfxLinkUpdateMode>(nFormat));
                     m_xSelectionLB->append_text(sName);
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 3600d05bcb8e..33febe28630a 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -263,9 +263,9 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(weld::Window* pParent, const SfxItemSet
                 {
                     OUString sBrackets;
                     if(pFType->GetPrefix())
-                        sBrackets += OUStringLiteral1(pFType->GetPrefix());
+                        sBrackets += OUStringChar(pFType->GetPrefix());
                     if(pFType->GetSuffix())
-                        sBrackets += OUStringLiteral1(pFType->GetSuffix());
+                        sBrackets += OUStringChar(pFType->GetSuffix());
                     m_vTypeData[nArrayIndex].m_pDescription->SetAuthBrackets(sBrackets);
                     m_vTypeData[nArrayIndex].m_pDescription->SetAuthSequence(pFType->IsSequence());
                 }
@@ -377,8 +377,8 @@ SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType)
                                             m_rWrtShell.GetFieldType(SwFieldIds::TableOfAuthorities, OUString()));
             if(pFType)
             {
-                m_vTypeData[nIndex].m_pDescription->SetAuthBrackets(OUStringLiteral1(pFType->GetPrefix()) +
-                                                  OUStringLiteral1(pFType->GetSuffix()));
+                m_vTypeData[nIndex].m_pDescription->SetAuthBrackets(OUStringChar(pFType->GetPrefix()) +
+                                                  OUStringChar(pFType->GetSuffix()));
                 m_vTypeData[nIndex].m_pDescription->SetAuthSequence(pFType->IsSequence());
             }
             else
@@ -654,7 +654,7 @@ IMPL_LINK_NOARG(SwAddStylesDlg_Impl, OkHdl, weld::Button&, void)
         {
             int nLevel = nToggleColumn - 1;
             if(!pStyleArr[nLevel].isEmpty())
-                pStyleArr[nLevel] += OUStringLiteral1(TOX_STYLE_DELIMITER);
+                pStyleArr[nLevel] += OUStringChar(TOX_STYLE_DELIMITER);
             pStyleArr[nLevel] += m_xHeaderTree->get_text(i, 0);
         }
     }
@@ -3397,9 +3397,9 @@ void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& )
     OUString aStr( SwResId( STR_TITLE ));
     if( !m_pCurrentForm->GetTemplate( 0 ).isEmpty() )
     {
-        aStr += " " + OUStringLiteral1(aDeliStart)
+        aStr += " " + OUStringChar(aDeliStart)
               + m_pCurrentForm->GetTemplate( 0 )
-              + OUStringLiteral1(aDeliEnd);
+              + OUStringChar(aDeliEnd);
     }
     m_xLevelLB->append_text(aStr);
 
@@ -3417,9 +3417,9 @@ void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& )
         }
         if( !m_pCurrentForm->GetTemplate( i ).isEmpty() )
         {
-            aStr += " " + OUStringLiteral1(aDeliStart)
+            aStr += " " + OUStringChar(aDeliStart)
                   + m_pCurrentForm->GetTemplate( i )
-                  + OUStringLiteral1(aDeliEnd);
+                  + OUStringChar(aDeliEnd);
         }
         m_xLevelLB->append_text(aStr);
     }
@@ -3483,9 +3483,9 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, AssignHdl, weld::Button&, void)
     if (nLevPos != -1 && nTemplPos != -1)
     {
         const OUString aStr(m_xLevelLB->get_text(nLevPos).getToken(0, aDeliStart)
-            + OUStringLiteral1(aDeliStart)
+            + OUStringChar(aDeliStart)
             + m_xParaLayLB->get_selected_text()
-            + OUStringLiteral1(aDeliEnd));
+            + OUStringChar(aDeliEnd));
 
         m_pCurrentForm->SetTemplate(nLevPos, m_xParaLayLB->get_selected_text());
 
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index faf59a18c107..5d6f08cf48fa 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -55,9 +55,9 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, ModifyHdl, weld::Entry&, void)
     for (sal_Int32 i = 0; i < BookmarkTable::aForbiddenChars.getLength(); i++)
     {
         const sal_Int32 nTmpLen = sTmp.getLength();
-        sTmp = sTmp.replaceAll(OUStringLiteral1(BookmarkTable::aForbiddenChars[i]), "");
+        sTmp = sTmp.replaceAll(OUStringChar(BookmarkTable::aForbiddenChars[i]), "");
         if (sTmp.getLength() != nTmpLen)
-           sMsg += OUStringLiteral1(BookmarkTable::aForbiddenChars[i]);
+           sMsg += OUStringChar(BookmarkTable::aForbiddenChars[i]);
     }
     if (sTmp.getLength() != nLen)
     {
@@ -196,7 +196,7 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, RenameHdl, weld::Button&, void)
     uno::Reference<container::XNamed> xNamed(xTmp, uno::UNO_QUERY);
     SwAbstractDialogFactory& rFact = swui::GetFactory();
     ScopedVclPtr<AbstractSwRenameXNamedDlg> pDlg(rFact.CreateSwRenameXNamedDlg(m_xDialog.get(), xNamed, xNameAccess));
-    pDlg->SetForbiddenChars(BookmarkTable::aForbiddenChars + OUStringLiteral1(BookmarkTable::cSeparator));
+    pDlg->SetForbiddenChars(BookmarkTable::aForbiddenChars + OUStringChar(BookmarkTable::cSeparator));
 
     if (pDlg->Execute())
     {
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index c653199e74ae..746fca46ef87 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -220,7 +220,7 @@ IMPL_LINK_NOARG( SwGlossaryGroupDlg, SelectHdl, weld::TreeView&, void )
 IMPL_LINK_NOARG(SwGlossaryGroupDlg, NewHdl, weld::Button&, void)
 {
     OUString sGroup = m_xNameED->get_text()
-        + OUStringLiteral1(GLOS_DELIM)
+        + OUStringChar(GLOS_DELIM)
         + OUString::number(m_xPathLB->get_active());
     OSL_ENSURE(!pGlosHdl->FindGroupName(sGroup), "group already available!");
     m_InsertedArr.push_back(sGroup);
@@ -298,7 +298,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl, weld::Button&, void)
 
     const OUString sNewTitle(m_xNameED->get_text());
     OUString sNewName = sNewTitle
-        + OUStringLiteral1(GLOS_DELIM)
+        + OUStringChar(GLOS_DELIM)
         + OUString::number(m_xPathLB->get_active());
     OSL_ENSURE(!pGlosHdl->FindGroupName(sNewName), "group already available!");
 
@@ -313,8 +313,8 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl, weld::Button&, void)
     }
     if(!bDone)
     {
-        sEntry += OUStringLiteral1(RENAME_TOKEN_DELIM) + sNewName
-                + OUStringLiteral1(RENAME_TOKEN_DELIM) + sNewTitle;
+        sEntry += OUStringChar(RENAME_TOKEN_DELIM) + sNewName
+                + OUStringChar(RENAME_TOKEN_DELIM) + sNewTitle;
         m_RenamedArr.push_back(sEntry);
     }
     delete pUserData;
@@ -407,7 +407,7 @@ bool SwGlossaryGroupDlg::IsDeleteAllowed(const OUString &rGroup)
 
 IMPL_STATIC_LINK(SwGlossaryGroupDlg, EditInsertTextHdl, OUString&, rText, bool)
 {
-    rText = rText.replaceAll(OUStringLiteral1(SVT_SEARCHPATH_DELIMITER), "");
+    rText = rText.replaceAll(OUStringChar(SVT_SEARCHPATH_DELIMITER), "");
     return true;
 }
 
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 9585129767a0..3fd85a31895a 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -288,7 +288,7 @@ IMPL_LINK(SwGlossaryDlg, GrpSelect, weld::TreeView&, rBox, void)
         pParent = xEntry.get();
     GroupUserData* pGroupData = reinterpret_cast<GroupUserData*>(rBox.get_id(*pParent).toInt64());
     ::SetCurrGlosGroup(pGroupData->sGroupName
-        + OUStringLiteral1(GLOS_DELIM)
+        + OUStringChar(GLOS_DELIM)
         + OUString::number(pGroupData->nPathIdx));
     m_pGlossaryHdl->SetCurGroup(::GetCurrGlosGroup());
     // set current text block
@@ -668,7 +668,7 @@ IMPL_LINK_NOARG(SwGlossaryDlg, BibHdl, weld::Button&, void)
                     {
                         GroupUserData* pGroupData = reinterpret_cast<GroupUserData*>(m_xCategoryBox->get_id(*xEntry).toInt64());
                         const OUString sGroup = pGroupData->sGroupName
-                            + OUStringLiteral1(GLOS_DELIM)
+                            + OUStringChar(GLOS_DELIM)
                             + OUString::number(pGroupData->nPathIdx);
                         if(sGroup == sNewGroup)
                         {
@@ -863,7 +863,7 @@ OUString SwGlossaryDlg::GetCurrGrpName() const
         if (m_xCategoryBox->get_iter_depth(*xEntry))
             m_xCategoryBox->iter_parent(*xEntry);
         GroupUserData* pGroupData = reinterpret_cast<GroupUserData*>(m_xCategoryBox->get_id(*xEntry).toInt64());
-        return pGroupData->sGroupName + OUStringLiteral1(GLOS_DELIM) + OUString::number(pGroupData->nPathIdx);
+        return pGroupData->sGroupName + OUStringChar(GLOS_DELIM) + OUString::number(pGroupData->nPathIdx);
     }
     return OUString();
 }
diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx
index 1bc73773ac2c..7f83374990d1 100644
--- a/sw/source/ui/vba/vbalisthelper.cxx
+++ b/sw/source/ui/vba/vbalisthelper.cxx
@@ -149,7 +149,7 @@ void SwVbaListHelper::CreateBulletListTemplate()
         }
         case 2:
         {
-            aBulletChar = OUStringLiteral1(CHAR_EMPTY_DOT);
+            aBulletChar = OUStringChar(CHAR_EMPTY_DOT);
             break;
         }
         case 3:
diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx
index 50c3493a5973..45de339fb978 100644
--- a/sw/source/ui/vba/vbatablehelper.cxx
+++ b/sw/source/ui/vba/vbatablehelper.cxx
@@ -104,9 +104,9 @@ OUString SwVbaTableHelper::getColumnStr( sal_Int32 nCol )
     do{
         nCalc = nCol % coDiff;
         if( nCalc >= 26 )
-            sRet = OUStringLiteral1( 'a' - 26 + nCalc ) + sRet;
+            sRet = OUStringChar( 'a' - 26 + nCalc ) + sRet;
         else
-            sRet = OUStringLiteral1( 'A' + nCalc ) + sRet;
+            sRet = OUStringChar( 'A' + nCalc ) + sRet;
 
         if( 0 == ( nCol = nCol - nCalc ) )
             break;