loplugin:salunicodeliteral: sw

Change-Id: I3ec5a60fff8577677eaa4977cddf69bec4078cec

26 files changed, 74 insertions, 74 deletions

diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 921509accee6..6334a6007857 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -27,17 +27,17 @@
 
 // For SwTextHints without end index the following char is added:
 
-#define CH_TXTATR_BREAKWORD     ((sal_Unicode)0x01)
-#define CH_TXTATR_INWORD        ((sal_Unicode)0xFFF9)
-#define CH_TXTATR_TAB           ((sal_Unicode)'\t')
-#define CH_TXTATR_NEWLINE       ((sal_Unicode)'\n')
-#define CH_TXT_ATR_INPUTFIELDSTART ((sal_Unicode)0x04)
-#define CH_TXT_ATR_INPUTFIELDEND ((sal_Unicode)0x05)
+#define CH_TXTATR_BREAKWORD     u'\x0001'
+#define CH_TXTATR_INWORD        u'\xFFF9'
+#define CH_TXTATR_TAB           u'\t'
+#define CH_TXTATR_NEWLINE       u'\n'
+#define CH_TXT_ATR_INPUTFIELDSTART u'\x0004'
+#define CH_TXT_ATR_INPUTFIELDEND u'\x0005'
 
-#define CH_TXT_ATR_FORMELEMENT ((sal_Unicode)0x06)
+#define CH_TXT_ATR_FORMELEMENT u'\x0006'
 
-#define CH_TXT_ATR_FIELDSTART ((sal_Unicode)0x07)
-#define CH_TXT_ATR_FIELDEND ((sal_Unicode)0x08)
+#define CH_TXT_ATR_FIELDSTART u'\x0007'
+#define CH_TXT_ATR_FIELDEND u'\x0008'
 #define CH_TXT_ATR_SUBST_FIELDSTART ("[")
 #define CH_TXT_ATR_SUBST_FIELDEND ("]")
 
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index b1aadec9bebd..ee59e9a0ebdf 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -153,7 +153,7 @@ const sal_Unicode cMarkSeparator = '|';
 // Sequences names for jumps are <name of sequence>!<no>
 const char cSequenceMarkSeparator = '!';
 
-#define DB_DELIM ((sal_Unicode)0xff)        // Database <-> table separator.
+#define DB_DELIM u'\x00ff'        // Database <-> table separator.
 
 enum class SetAttrMode
 {
@@ -189,13 +189,13 @@ namespace o3tl
 #define SW_CONSTASCII_DEF( n, s ) n[sizeof(s)] = s
 #endif
 
-#define CHAR_HARDBLANK      ((sal_Unicode)0x00A0)
-#define CHAR_HARDHYPHEN     ((sal_Unicode)0x2011)
-#define CHAR_SOFTHYPHEN     ((sal_Unicode)0x00AD)
-#define CHAR_RLM            ((sal_Unicode)0x200F)
-#define CHAR_LRM            ((sal_Unicode)0x200E)
-#define CHAR_ZWSP           ((sal_Unicode)0x200B)
-#define CHAR_ZWNBSP         ((sal_Unicode)0x2060)
+#define CHAR_HARDBLANK      u'\x00A0'
+#define CHAR_HARDHYPHEN     u'\x2011'
+#define CHAR_SOFTHYPHEN     u'\x00AD'
+#define CHAR_RLM            u'\x200F'
+#define CHAR_LRM            u'\x200E'
+#define CHAR_ZWSP           u'\x200B'
+#define CHAR_ZWNBSP         u'\x2060'
 
 // Returns the APP - CharClass instance - used for all ToUpper/ToLower/...
 SW_DLLPUBLIC CharClass& GetAppCharClass();
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 376c3140fa99..a3b5ed2c7484 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -385,7 +385,7 @@ namespace o3tl {
     template<> struct typed_flags<SwTOOElements> : is_typed_flags<SwTOOElements, 0x9b> {};
 }
 
-#define TOX_STYLE_DELIMITER ((sal_Unicode)0x01)
+#define TOX_STYLE_DELIMITER u'\x0001'
 
 // Class for all indexes
 class SW_DLLPUBLIC SwTOXBase : public SwClient
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 7c488f719d0d..ebec4c6174c8 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -809,13 +809,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf89890, "tdf89890.docx")
 DECLARE_OOXMLEXPORT_TEST(testTdf91594, "tdf91594.docx")
 {
     uno::Reference<text::XTextRange> xPara1(getParagraph(1));
-    CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf0fb), xPara1->getString()[0] );
+    CPPUNIT_ASSERT_EQUAL(u'\xf0fb', xPara1->getString()[0] );
     uno::Reference<text::XTextRange> xPara2(getParagraph(2));
-    CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf0fc), xPara2->getString()[0] );
+    CPPUNIT_ASSERT_EQUAL(u'\xf0fc', xPara2->getString()[0] );
     uno::Reference<text::XTextRange> xPara3(getParagraph(3));
-    CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf0fd), xPara3->getString()[0] );
+    CPPUNIT_ASSERT_EQUAL(u'\xf0fd', xPara3->getString()[0] );
     uno::Reference<text::XTextRange> xPara4(getParagraph(4));
-    CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf0fe), xPara4->getString()[0] );
+    CPPUNIT_ASSERT_EQUAL(u'\xf0fe', xPara4->getString()[0] );
 
     uno::Reference<beans::XPropertySet> xRun(getRun(xPara1,1), uno::UNO_QUERY);
     CPPUNIT_ASSERT_EQUAL(OUString("Wingdings"), getProperty<OUString>(xRun, "CharFontName"));
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 15e1f05e629e..80c5f85cf055 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -357,7 +357,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf103651, "tdf103651.docx")
     OUString sContent;
     xTextField->getPropertyValue("Content") >>= sContent;
     // Comment in the first paragraph should not have smiley ( 0xf04a ).
-    CPPUNIT_ASSERT_EQUAL( sal_Int32( -1 ) , sContent.indexOf( sal_Unicode( 0xf04a ) ));
+    CPPUNIT_ASSERT_EQUAL( sal_Int32( -1 ) , sContent.indexOf( u'\xf04a' ));
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf99227, "tdf99227.docx")
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 741ee50fa336..a314b212b81a 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1233,10 +1233,10 @@ DECLARE_OOXMLIMPORT_TEST(testTdf103664, "tdf103664.docx")
 {
     // Wingdings symbols were displayed as rectangles
     uno::Reference<text::XTextRange> xPara(getParagraph(1));
-    CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf020), xPara->getString()[0] );
-    CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf0fc), xPara->getString()[1] );
-    CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf0dc), xPara->getString()[2] );
-    CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf081), xPara->getString()[3] );
+    CPPUNIT_ASSERT_EQUAL(u'\xf020', xPara->getString()[0] );
+    CPPUNIT_ASSERT_EQUAL(u'\xf0fc', xPara->getString()[1] );
+    CPPUNIT_ASSERT_EQUAL(u'\xf0dc', xPara->getString()[2] );
+    CPPUNIT_ASSERT_EQUAL(u'\xf081', xPara->getString()[3] );
 
     uno::Reference<beans::XPropertySet> xRun(getRun(xPara,1), uno::UNO_QUERY);
     CPPUNIT_ASSERT_EQUAL(OUString("Wingdings"), getProperty<OUString>(xRun, "CharFontName"));
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index a0c80b150825..598e4700b733 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -597,7 +597,7 @@ DECLARE_RTFIMPORT_TEST(testFdo49692, "fdo49692.rtf")
 
         if (rProp.Name == "Suffix")
         {
-            OUString aExpected(static_cast<sal_Unicode>(0x200B));
+            OUString aExpected(u'\x200B');
             CPPUNIT_ASSERT_EQUAL(aExpected, rProp.Value.get<OUString>());
         }
     }
@@ -1473,10 +1473,10 @@ DECLARE_RTFIMPORT_TEST(testFdo81033, "fdo81033.rtf")
     CPPUNIT_ASSERT_EQUAL(sal_Int32(2), tabs.getLength());
     CPPUNIT_ASSERT_EQUAL(sal_Int32(5808), tabs[0].Position);
     CPPUNIT_ASSERT_EQUAL(style::TabAlign_LEFT, tabs[0].Alignment);
-    CPPUNIT_ASSERT_EQUAL(sal_Unicode(' '), tabs[0].FillChar);
+    CPPUNIT_ASSERT_EQUAL(u' ', tabs[0].FillChar);
     CPPUNIT_ASSERT_EQUAL(sal_Int32(16002), tabs[1].Position);
     CPPUNIT_ASSERT_EQUAL(style::TabAlign_LEFT, tabs[1].Alignment);
-    CPPUNIT_ASSERT_EQUAL(sal_Unicode('_'), tabs[1].FillChar);
+    CPPUNIT_ASSERT_EQUAL(u'_', tabs[1].FillChar);
 }
 
 DECLARE_RTFIMPORT_TEST(testFdo66565, "fdo66565.rtf")
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 742505068514..c9849e8b5d4b 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -770,7 +770,7 @@ bool SwAccessibleParagraph::GetSentenceBoundary(
     const sal_Unicode* pStr = rText.getStr();
     if (pStr)
     {
-        while( nPos < rText.getLength() && pStr[nPos] == sal_Unicode(' ') )
+        while( nPos < rText.getLength() && pStr[nPos] == u' ' )
             nPos++;
     }
 
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index f188bcc9a134..04944c370d0d 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -146,7 +146,7 @@ void SwAccessiblePortionData::Special(
     {
         case POR_POSTITS:
         case POR_FLYCNT:
-            sDisplay = OUString(sal_Unicode(0xfffc));
+            sDisplay = OUString(u'\xfffc');
             break;
         case POR_FLD:
         case POR_HIDDEN:
@@ -154,7 +154,7 @@ void SwAccessiblePortionData::Special(
         case POR_ISOREF:
             // When the filed content is empty, input a special character.
             if (rText.isEmpty())
-                sDisplay = OUString(sal_Unicode(0xfffc));
+                sDisplay = OUString(u'\xfffc');
             else
                 sDisplay = rText;
             m_aFieldPosition.push_back(m_aBuffer.getLength());
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index cb7f4dd0848f..059dd24628e7 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -1820,7 +1820,7 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
             pNewRule->Set( 1, aFormat );
 
             aFormat.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER);
-            aFormat.SetSuffix(OUString(static_cast<sal_Unicode>(')')));
+            aFormat.SetSuffix(OUString(u')'));
             aFormat.SetIncludeUpperLevels( 1 );
             aFormat.SetStart( 3 );
 
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index a8a4454169a7..e41088ca5aeb 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -1515,9 +1515,9 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
                 {
                     SwNumFormat aFormat( aRule.Get( nLvl ) );
                     aFormat.SetStart( static_cast<sal_uInt16>(aPrefix.getToken( 1,
-                                            (sal_Unicode)1 ).toInt32()));
-                    aFormat.SetPrefix( aPrefix.getToken( 0, (sal_Unicode)1 ));
-                    aFormat.SetSuffix( aPostfix.getToken( 0, (sal_Unicode)1 ));
+                                            u'\x0001' ).toInt32()));
+                    aFormat.SetPrefix( aPrefix.getToken( 0, u'\x0001' ));
+                    aFormat.SetSuffix( aPostfix.getToken( 0, u'\x0001' ));
                     aFormat.SetIncludeUpperLevels( 0 );
 
                     if( !aFormat.GetCharFormat() )
@@ -1539,10 +1539,10 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
                         SwNumFormat aFormat( aRule.Get( n ) );
 
                         aFormat.SetStart( static_cast<sal_uInt16>(aPrefix.getToken( n+1,
-                                                    (sal_Unicode)1 ).toInt32() ));
+                                                    u'\x0001' ).toInt32() ));
                         if( !n )
-                            aFormat.SetPrefix( aPrefix.getToken( n, (sal_Unicode)1 ));
-                        aFormat.SetSuffix( aPostfix.getToken( n, (sal_Unicode)1 ));
+                            aFormat.SetPrefix( aPrefix.getToken( n, u'\x0001' ));
+                        aFormat.SetSuffix( aPostfix.getToken( n, u'\x0001' ));
                         aFormat.SetIncludeUpperLevels( MAXLEVEL );
                         if( n < aNumTypes.getLength() )
                             aFormat.SetNumberingType((SvxNumType)(aNumTypes[ n ] - '0'));
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 6598abff9463..cf1fe6bb276f 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -763,7 +763,7 @@ void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType )
         {
             OUString aActualText;
             if (pPor->GetWhichPor() == POR_SOFTHYPH || pPor->GetWhichPor() == POR_HYPH)
-                aActualText = OUString(sal_Unicode(0xad)); // soft hyphen
+                aActualText = OUString(u'\x00ad'); // soft hyphen
             else
                 aActualText = rInf.GetText().copy(rInf.GetIdx(), pPor->GetLen());
             mpPDFExtOutDevData->SetActualText( aActualText );
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 5240a44001d2..7ad17f21ab11 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -72,13 +72,13 @@ using namespace ::com::sun::star::linguistic2;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 
-#define CHAR_UNDERSCORE ((sal_Unicode)0x005F)
-#define CHAR_LEFT_ARROW ((sal_Unicode)0x25C0)
-#define CHAR_RIGHT_ARROW ((sal_Unicode)0x25B6)
-#define CHAR_TAB ((sal_Unicode)0x2192)
-#define CHAR_TAB_RTL ((sal_Unicode)0x2190)
-#define CHAR_LINEBREAK ((sal_Unicode)0x21B5)
-#define CHAR_LINEBREAK_RTL ((sal_Unicode)0x21B3)
+#define CHAR_UNDERSCORE u'_'
+#define CHAR_LEFT_ARROW u'\x25C0'
+#define CHAR_RIGHT_ARROW u'\x25B6'
+#define CHAR_TAB u'\x2192'
+#define CHAR_TAB_RTL u'\x2190'
+#define CHAR_LINEBREAK u'\x21B5'
+#define CHAR_LINEBREAK_RTL u'\x21B3'
 
 #define DRAW_SPECIAL_OPTIONS_CENTER 1
 #define DRAW_SPECIAL_OPTIONS_ROTATE 2
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 62abf09a980b..6439ba66b2d2 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -627,8 +627,8 @@ static sal_uInt8 lcl_WhichPunctuation( sal_Unicode cChar )
 
 static bool lcl_IsMonoSpaceFont( const vcl::RenderContext& rOut )
 {
-    const OUString aStr1( sal_Unicode( 0x3008 ) );
-    const OUString aStr2( sal_Unicode( 0x307C ) );
+    const OUString aStr1( u'\x3008' );
+    const OUString aStr2( u'\x307C' );
     const long nWidth1 = rOut.GetTextWidth( aStr1 );
     const long nWidth2 = rOut.GetTextWidth( aStr2 );
     return nWidth1 == nWidth2;
@@ -2415,7 +2415,7 @@ sal_Int32 SwFont::GetTextBreak( SwDrawTextInfo& rInf, long nTextWidth )
         if( rInf.GetHyphPos() ) {
             sal_Int32 nHyphPos = *rInf.GetHyphPos();
             nTextBreak = rInf.GetOut().GetTextBreak( *pTmpText, nTextWidth,
-                             static_cast<sal_Unicode>('-'), nHyphPos,
+                             u'-', nHyphPos,
                              nTmpIdx, nTmpLen, nKern, rInf.GetVclCache());
             *rInf.GetHyphPos() = (nHyphPos == -1) ? COMPLETE_STRING : nHyphPos;
         }
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index c02cdd730816..50e2289c0057 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -2513,7 +2513,7 @@ SwUnoCursorHelper::CreateSortDescriptor(const bool bFromTable)
     pArray[0] = beans::PropertyValue("IsSortInTable", -1, aVal,
                     beans::PropertyState_DIRECT_VALUE);
 
-    aVal <<= sal_Unicode(' ');
+    aVal <<= u' ';
     pArray[1] = beans::PropertyValue("Delimiter", -1, aVal,
                     beans::PropertyState_DIRECT_VALUE);
 
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 7ec4232deff3..4b595d814ac0 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1928,7 +1928,7 @@ void SwXNumberingRules::SetPropertiesToNumFormat(
                     else if(aChar.isEmpty())
                     {
                         // If w:lvlText's value is null - set bullet char to zero
-                        aFormat.SetBulletChar(sal_Unicode(0x0));
+                        aFormat.SetBulletChar(u'\0');
                     }
                     else
                     {
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index ab05fa5a59b3..92086cd905a2 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -5171,7 +5171,7 @@ void SwHTMLParser::InsertLineBreak()
     {
         // wenn kein CLEAR ausgefuehrt werden sollte oder konnte, wird
         // ein Zeilenumbruch eingef?gt
-        OUString sTmp( (sal_Unicode)0x0a );   // make the Mac happy :-)
+        OUString sTmp( u'\x000a' );   // make the Mac happy :-)
         m_xDoc->getIDocumentContentOperations().InsertString( *m_pPam, sTmp );
     }
     else if( m_pPam->GetPoint()->nContent.GetIndex() )
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6f428005963d..e1bffe7ffca0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6200,7 +6200,7 @@ void DocxAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
     {
         // Writer's "zero width space" suffix is necessary, so that LabelFollowedBy shows up, but Word doesn't require that.
         OUString aLevelText = aBuffer.makeStringAndClear();
-        static OUString aZeroWidthSpace(static_cast<sal_Unicode>(0x200B));
+        static OUString aZeroWidthSpace(u'\x200B');
         if (aLevelText == aZeroWidthSpace)
             aLevelText.clear();
         m_pSerializer->singleElementNS(XML_w, XML_lvlText, FSNS(XML_w, XML_val), aLevelText.toUtf8(), FSEND);
@@ -7244,7 +7244,7 @@ static void impl_WriteTabElement( FSHelperPtr const & pSerializer,
         pTabElementAttrList->add( FSNS( XML_w, XML_leader ), OString( "dot" ) );
     else if ( '-' == cFillChar )
         pTabElementAttrList->add( FSNS( XML_w, XML_leader ), OString( "hyphen" ) );
-    else if ( sal_Unicode(0xB7) == cFillChar ) // middle dot
+    else if ( u'\x00B7' == cFillChar ) // middle dot
         pTabElementAttrList->add( FSNS( XML_w, XML_leader ), OString( "middleDot" ) );
     else if ( '_' == cFillChar )
         pTabElementAttrList->add( FSNS( XML_w, XML_leader ), OString( "underscore" ) );
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index c9cc17982472..ca2e6fcf6da7 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -603,7 +603,7 @@ void MSWordExportBase::SubstituteBullet( OUString& rNumStr,
     OUString sFontName = rFontName;
 
     // If Bullet char is "", don't change
-    if (rNumStr[0] != sal_Unicode(0x0))
+    if (rNumStr[0] != u'\0')
     {
         rNumStr = rNumStr.replaceAt(0, 1, OUString(
             msfilter::util::bestFitOpenSymbolToMSFont(rNumStr[0], rChrSet, sFontName)));
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 702232035341..f30757fec6c1 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3519,18 +3519,18 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
             break;
         case 0xf:
             if( !m_bSpec )        // "Satellite"
-                cInsert = sal_Unicode('\xa4');
+                cInsert = u'\x00a4';
             break;
         case 0x14:
             if( !m_bSpec )        // "Para End" char
-                cInsert = sal_Unicode('\xb5');
+                cInsert = u'\x00b5';
             break;
         case 0x15:
             if( !m_bSpec )        // Juristenparagraph
             {
                 cp_set::iterator aItr = m_aTOXEndCps.find((WW8_CP)nPosCp);
                 if (aItr == m_aTOXEndCps.end())
-                    cInsert = sal_Unicode('\xa7');
+                    cInsert = u'\x00a7';
                 else
                     m_aTOXEndCps.erase(aItr);
             }
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 8ca1aaf1e9ed..a8099fb84e9a 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1910,9 +1910,9 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAt
     m_pFillCharCB->InsertEntry(OUString('.'));
     m_pFillCharCB->InsertEntry(OUString('-'));
     m_pFillCharCB->InsertEntry(OUString('_'));
-    m_pFillCharCB->InsertEntry(OUString(sal_Unicode(0x2024))); // ONE DOT LEADER
-    m_pFillCharCB->InsertEntry(OUString(sal_Unicode(0x2025))); // TWO DOT LEADER
-    m_pFillCharCB->InsertEntry(OUString(sal_Unicode(0x2026))); // HORIZONTAL ELLIPSIS
+    m_pFillCharCB->InsertEntry(OUString(u'\x2024')); // ONE DOT LEADER
+    m_pFillCharCB->InsertEntry(OUString(u'\x2025')); // TWO DOT LEADER
+    m_pFillCharCB->InsertEntry(OUString(u'\x2026')); // HORIZONTAL ELLIPSIS
 
     m_pEditStylePB->Enable(false);
 
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 161e477200f8..bd1ab18405e6 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -40,7 +40,7 @@
 #define PATH_CASE_SENSITIVE 0x01
 #define PATH_READONLY       0x02
 
-#define RENAME_TOKEN_DELIM      (sal_Unicode)1
+#define RENAME_TOKEN_DELIM      u'\x0001'
 
 SwGlossaryGroupDlg::SwGlossaryGroupDlg(vcl::Window * pParent,
     std::vector<OUString> const& rPathArr, SwGlossaryHdl *pHdl)
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 79a10a7b9ff0..7db889326573 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -71,13 +71,13 @@
 // The Format names in the list of all names have the
 // following family as their first character:
 
-#define cCHAR       (sal_Unicode)'c'
-#define cPARA       (sal_Unicode)'p'
-#define cFRAME      (sal_Unicode)'f'
-#define cPAGE       (sal_Unicode)'g'
-#define cNUMRULE    (sal_Unicode)'n'
-#define cTABSTYLE   (sal_Unicode)'t'
-#define cCELLSTYLE  (sal_Unicode)'b'
+#define cCHAR       u'c'
+#define cPARA       u'p'
+#define cFRAME      u'f'
+#define cPAGE       u'g'
+#define cNUMRULE    u'n'
+#define cTABSTYLE   u't'
+#define cCELLSTYLE  u'b'
 
 using namespace com::sun::star;
 
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 79570a9b5ee0..6e3ff6ca55ab 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -2485,7 +2485,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 !rSh.HasReadonlySel() )
             {
                 FlushInBuffer();
-                rSh.AutoCorrect( *pACorr, static_cast< sal_Unicode >('\0') );
+                rSh.AutoCorrect( *pACorr, u'\0' );
             }
             eKeyState = eNextKeyState;
         }
diff --git a/sw/source/uibase/inc/glosdoc.hxx b/sw/source/uibase/inc/glosdoc.hxx
index 7996f48c85b7..9720d9c85069 100644
--- a/sw/source/uibase/inc/glosdoc.hxx
+++ b/sw/source/uibase/inc/glosdoc.hxx
@@ -38,7 +38,7 @@ typedef tools::SvRef<SwDocShell> SwDocShellRef;
 typedef std::vector< css::uno::WeakReference< css::text::XAutoTextGroup > > UnoAutoTextGroups;
 typedef std::vector< css::uno::WeakReference< css::text::XAutoTextEntry > > UnoAutoTextEntries;
 
-#define GLOS_DELIM (sal_Unicode)'*'
+#define GLOS_DELIM u'*'
 
 class SW_DLLPUBLIC SwGlossaries
 {
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 0363ec3d535a..abdb7dd027c1 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -104,7 +104,7 @@ using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 
-#define NAVI_BOOKMARK_DELIM     (sal_Unicode)1
+#define NAVI_BOOKMARK_DELIM     u'\x0001'
 
 class SwContentArr
     : public o3tl::sorted_vector<SwContent*, o3tl::less_ptr_to<SwContent>,