replace sxub_Unicode by sal_Unicode

Change-Id: Icf4b434a1961cc4964ee6e362491868e898a1831
Reviewed-on: https://gerrit.libreoffice.org/887
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>

24 files changed, 76 insertions, 76 deletions

diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 450d29070267..65c3eac6b771 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -1507,7 +1507,7 @@ namespace
                                 const LocaleDataWrapper* const pLclData )
     {
         OSL_ASSERT(pLclData);
-        const xub_Unicode nCurrCmdPos = rCommandPos;
+        const sal_Unicode nCurrCmdPos = rCommandPos;
         rtl_math_ConversionStatus eStatus;
         const sal_Unicode* pEnd;
         rVal = rtl_math_uStringToDouble( rCommand.GetBuffer() + rCommandPos,
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index f986e756735c..9c9c3709d327 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -1820,7 +1820,7 @@ void    SwSpellIter::AddPortion(uno::Reference< XSpellAlternatives > xAlt,
 
                 bool bField = false;
                 //read the character at the current position to check if it's a field
-                xub_Unicode cChar = pTxtNode->GetTxt().GetChar( pCrsr->GetMark()->nContent.GetIndex() );
+                sal_Unicode cChar = pTxtNode->GetTxt().GetChar( pCrsr->GetMark()->nContent.GetIndex() );
                 if( CH_TXTATR_BREAKWORD == cChar || CH_TXTATR_INWORD == cChar)
                 {
                     const SwTxtAttr* pTxtAttr = pTxtNode->GetTxtAttrForCharAt(
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index df22ffaf372b..20398b49c1f5 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -202,7 +202,7 @@ public:
  */
     static sal_uInt16 MaskHiddenRanges( const SwTxtNode& rNode, XubString& rText,
                                     const xub_StrLen nStt, const xub_StrLen nEnd,
-                                    const xub_Unicode cChar );
+                                    const sal_Unicode cChar );
 
 /** Hidden text attribute handling
 
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 4bcb98f3f7dd..8379a35590c0 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -43,11 +43,11 @@ class SwScriptInfo;     // _GetTxtSize
 class ViewShell;
 class IDocumentSettingAccess;
 
-const xub_Unicode CH_BLANK = ' ';   // ' ' Leerzeichen
-const xub_Unicode CH_BREAK = 0x0A;  //
-const xub_Unicode CH_TAB   = '\t';  // \t
-const xub_Unicode CH_PAR    = 0xB6;     // Paragraph
-const xub_Unicode CH_BULLET = 0xB7;     // mittiger Punkt
+const sal_Unicode CH_BLANK = ' ';   // ' ' Leerzeichen
+const sal_Unicode CH_BREAK = 0x0A;  //
+const sal_Unicode CH_TAB   = '\t';  // \t
+const sal_Unicode CH_PAR    = 0xB6;     // Paragraph
+const sal_Unicode CH_BULLET = 0xB7;     // mittiger Punkt
 
 class SwSubFont : public SvxFont
 {
diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx
index 36f733629f18..65e8872d9a4a 100644
--- a/sw/source/core/text/frminf.cxx
+++ b/sw/source/core/text/frminf.cxx
@@ -43,7 +43,7 @@ xub_StrLen SwTxtMargin::GetTxtStart() const
 
     for( i = nTmpPos; i < nEnd; ++i )
     {
-        const xub_Unicode aChar = rTxt.GetChar( i );
+        const sal_Unicode aChar = rTxt.GetChar( i );
         if( CH_TAB != aChar && ' ' != aChar )
             return i;
     }
@@ -62,7 +62,7 @@ xub_StrLen SwTxtMargin::GetTxtEnd() const
     long i;
     for( i = nEnd - 1; i >= nTmpPos; --i )
     {
-        xub_Unicode aChar = rTxt.GetChar( static_cast<xub_StrLen>(i) );
+        sal_Unicode aChar = rTxt.GetChar( static_cast<xub_StrLen>(i) );
         if( CH_TAB != aChar && CH_BREAK != aChar && ' ' != aChar )
             return static_cast<xub_StrLen>(i + 1);
     }
@@ -347,7 +347,7 @@ KSHORT SwTxtFrmInfo::GetBigIndent( xub_StrLen& rFndPos,
 
     // Is on front of a non-space
     const XubString& rTxt = aInf.GetTxt();
-    xub_Unicode aChar = rTxt.GetChar( rFndPos );
+    sal_Unicode aChar = rTxt.GetChar( rFndPos );
     if( CH_TAB == aChar || CH_BREAK == aChar || ' ' == aChar ||
         (( CH_TXTATR_BREAKWORD == aChar || CH_TXTATR_INWORD == aChar ) &&
             aInf.HasHint( rFndPos ) ) )
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index b7545c8dfe6c..161d5e9a72cb 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -217,7 +217,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
 
     xub_StrLen nPorLen = 0;
     // do not call the break iterator nCutPos is a blank
-    xub_Unicode cCutChar = rInf.GetTxt().GetChar( nCutPos );
+    sal_Unicode cCutChar = rInf.GetTxt().GetChar( nCutPos );
     if( CH_BLANK == cCutChar || CH_FULL_BLANK == cCutChar )
     {
         nBreakPos = nCutPos;
@@ -258,7 +258,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
         // the field portion, we trigger an underflow.
 
         xub_StrLen nOldIdx = rInf.GetIdx();
-        xub_Unicode cFldChr = 0;
+        sal_Unicode cFldChr = 0;
 
 #if OSL_DEBUG_LEVEL > 0
         XubString aDebugString;
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 32bb3ab29fbd..e070151f5bbc 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1482,17 +1482,17 @@ xub_StrLen SwTxtFormatInfo::ScanPortionEnd( const xub_StrLen nStart,
     //
     // Used for decimal tab handling:
     //
-    const xub_Unicode cTabDec = GetLastTab() ? (sal_Unicode)GetTabDecimal() : 0;
-    const xub_Unicode cThousandSep  = ',' == cTabDec ? '.' : ',';
+    const sal_Unicode cTabDec = GetLastTab() ? (sal_Unicode)GetTabDecimal() : 0;
+    const sal_Unicode cThousandSep  = ',' == cTabDec ? '.' : ',';
     // #i45951# German (Switzerland) uses ' as thousand separator
-    const xub_Unicode cThousandSep2 = ',' == cTabDec ? '.' : '\'';
+    const sal_Unicode cThousandSep2 = ',' == cTabDec ? '.' : '\'';
 
     bool bNumFound = false;
     const bool bTabCompat = GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TAB_COMPAT);
 
     for( ; i < nEnd; ++i )
     {
-        const xub_Unicode cPos = GetChar( i );
+        const sal_Unicode cPos = GetChar( i );
         switch( cPos )
         {
         case CH_TXTATR_BREAKWORD:
@@ -1558,7 +1558,7 @@ xub_StrLen SwTxtFormatInfo::ScanPortionEnd( const xub_StrLen nStart,
     // to become the hook:
     if ( i == nEnd && i < GetTxt().Len() && bNumFound )
     {
-        const xub_Unicode cPos = GetChar( i );
+        const sal_Unicode cPos = GetChar( i );
         if ( cPos != cTabDec && cPos != cThousandSep && cPos !=cThousandSep2 && ( 0x2F >= cPos || cPos >= 0x3A ) )
         {
             cHookChar = GetChar( i );
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index a975d04776a4..c4cb8d79721b 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -273,7 +273,7 @@ public:
 
     inline const  SwViewOption &GetOpt() const { return *pOpt; }
     inline const XubString &GetTxt() const { return *pTxt; }
-    inline xub_Unicode GetChar( const xub_StrLen nPos ) const
+    inline sal_Unicode GetChar( const xub_StrLen nPos ) const
         { return pTxt->GetChar( nPos ); }
 
     inline KSHORT      GetTxtHeight() const;
@@ -553,8 +553,8 @@ class SwTxtFormatInfo : public SwTxtPaintInfo
                                 // the beginning of a line
     sal_Bool bTabOverflow;      // Tabs are expanding after the end margin
 
-    xub_Unicode   cTabDecimal;  // the current decimal delimiter
-    xub_Unicode   cHookChar;    // For tabs in fields etc.
+    sal_Unicode   cTabDecimal;  // the current decimal delimiter
+    sal_Unicode   cHookChar;    // For tabs in fields etc.
     sal_uInt8   nMaxHyph;       // Max. line count of followup hyphenations
     sal_Bool   bTestFormat;     // Test formatting from WouldFit, no notification etc.
 
@@ -660,16 +660,16 @@ public:
     // Tabs
     inline SwTabPortion *GetLastTab() { return pLastTab; }
     inline void SetLastTab( SwTabPortion *pNew ) { pLastTab = pNew; }
-    inline xub_Unicode GetTabDecimal() const { return cTabDecimal; }
-    inline void SetTabDecimal( const xub_Unicode cNew ) { cTabDecimal = cNew;}
+    inline sal_Unicode GetTabDecimal() const { return cTabDecimal; }
+    inline void SetTabDecimal( const sal_Unicode cNew ) { cTabDecimal = cNew;}
 
     // Last*
     inline SwFldPortion *GetLastFld() { return pLastFld; }
     inline void SetLastFld( SwFldPortion *pNew ) { pLastFld = pNew; }
 
     inline void ClearHookChar() { cHookChar = 0; }
-    inline void SetHookChar( const xub_Unicode cNew ) { cHookChar = cNew; }
-    inline xub_Unicode GetHookChar() const { return cHookChar; }
+    inline void SetHookChar( const sal_Unicode cNew ) { cHookChar = cNew; }
+    inline sal_Unicode GetHookChar() const { return cHookChar; }
 
     // Done-Flags
     inline sal_Bool IsFtnDone() const { return bFtnDone; }
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index bc043b7cf6a4..48b99f441c10 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -643,7 +643,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
         if( nNextChg > nStop )
             nNextChg = nStop;
         SwTxtAttr *pHint = NULL;
-        xub_Unicode cChar = CH_BLANK;
+        sal_Unicode cChar = CH_BLANK;
         nStop = nIdx;
         while( nStop < nLen && nStop < nNextChg &&
                CH_TAB != ( cChar = m_Text.GetChar( nStop ) ) &&
@@ -890,7 +890,7 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd
             nNextChg = nStop;
 
         nStop = nIdx;
-        xub_Unicode cChar = CH_BLANK;
+        sal_Unicode cChar = CH_BLANK;
         SwTxtAttr* pHint = NULL;
 
         // stop at special characters in [ nIdx, nNextChg ]
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 763f459402e9..22c087fc1545 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1271,7 +1271,7 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
             }
         }
         // 5010: Tabs und Felder
-        xub_Unicode cChar = rInf.GetHookChar();
+        sal_Unicode cChar = rInf.GetHookChar();
 
         if( cChar )
         {
@@ -1990,7 +1990,7 @@ sal_Bool SwTxtFormatter::AllowRepaintOpt() const
     const xub_StrLen nReformat = GetInfo().GetReformatStart();
     if( bOptimizeRepaint && STRING_LEN != nReformat )
     {
-        const xub_Unicode cCh = GetInfo().GetTxt().GetChar( nReformat );
+        const sal_Unicode cCh = GetInfo().GetTxt().GetChar( nReformat );
         bOptimizeRepaint = ( CH_TXTATR_BREAKWORD != cCh && CH_TXTATR_INWORD != cCh )
                             || ! GetInfo().HasHint( nReformat );
     }
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 3624ec042d0e..59731021d86e 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -156,7 +156,7 @@ MSHORT SwBlankPortion::MayUnderFlow( const SwTxtFormatInfo &rInf,
             xub_StrLen nBlank = nIdx;
             while( --nBlank > rInf.GetLineStart() )
             {
-                const xub_Unicode cCh = rInf.GetChar( nBlank );
+                const sal_Unicode cCh = rInf.GetChar( nBlank );
                 if( CH_BLANK == cCh ||
                     (( CH_TXTATR_BREAKWORD == cCh || CH_TXTATR_INWORD == cCh )
                         && rInf.HasHint( nBlank ) ) )
@@ -166,7 +166,7 @@ MSHORT SwBlankPortion::MayUnderFlow( const SwTxtFormatInfo &rInf,
                 return 0;
         }
     }
-    xub_Unicode cCh;
+    sal_Unicode cCh;
     if( nIdx < 2 || CH_BLANK == (cCh = rInf.GetChar( nIdx - 1 )) )
         return 1;
     if( CH_BREAK == cCh )
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index 087c610889be..b5a9add5f083 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -49,10 +49,10 @@ public:
 
 class SwBlankPortion : public SwExpandPortion
 {
-    xub_Unicode cChar;
+    sal_Unicode cChar;
     sal_Bool bMulti;        // For multiportion brackets
 public:
-    inline  SwBlankPortion( xub_Unicode cCh, sal_Bool bMult = sal_False )
+    inline  SwBlankPortion( sal_Unicode cCh, sal_Bool bMult = sal_False )
         : cChar( cCh ), bMulti( bMult )
         { cChar = cCh; SetLen(1); SetWhichPor( POR_BLANK ); }
 
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 4ef411dcbaaf..387602ab57bc 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -780,7 +780,7 @@ static sal_Char const sDoubleSpace[] = "  ";
  *                      class SwBulletPortion
  *************************************************************************/
 
-SwBulletPortion::SwBulletPortion( const xub_Unicode cBullet,
+SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet,
                                   const XubString& rBulletFollowedBy,
                                   SwFont *pFont,
                                   const sal_Bool bLft,
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 32198e7cf4fb..cdccfa4aaee6 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -174,7 +174,7 @@ public:
 class SwBulletPortion : public SwNumberPortion
 {
 public:
-    SwBulletPortion( const xub_Unicode cCh,
+    SwBulletPortion( const sal_Unicode cCh,
                      const XubString& rBulletFollowedBy,
                      SwFont *pFnt,
                      const sal_Bool bLeft,
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index 6cd9dfcc8e84..38a3cd47ba20 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -106,7 +106,7 @@ void SwGluePortion::Paint( const SwTxtPaintInfo &rInf ) const
     if( rInf.OnWin() && rInf.GetOpt().IsBlank() && rInf.IsNoSymbol() )
     {
 #if OSL_DEBUG_LEVEL > 0
-        const xub_Unicode cChar = rInf.GetChar( rInf.GetIdx() );
+        const sal_Unicode cChar = rInf.GetChar( rInf.GetIdx() );
         OSL_ENSURE( CH_BLANK  == cChar || CH_BULLET == cChar,
                 "SwGluePortion::Paint: blank expected" );
 #endif
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index aa135949865f..3da8d997d18a 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -88,7 +88,7 @@ using namespace i18n::ScriptType;
 #endif
 #define isSeenOrSadChar(c)  (IS_JOINING_GROUP((c), SAD) || IS_JOINING_GROUP((c), SEEN))
 
-sal_Bool isTransparentChar ( xub_Unicode cCh )
+sal_Bool isTransparentChar ( sal_Unicode cCh )
 {
     return u_getIntPropertyValue( cCh, UCHAR_JOINING_TYPE ) == U_JT_TRANSPARENT;
 }
@@ -99,7 +99,7 @@ sal_Bool isTransparentChar ( xub_Unicode cCh )
  * Checks if cCh + cNectCh builds a ligature (used for Kashidas)
  *************************************************************************/
 
-static sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode cNextCh )
+static sal_Bool lcl_IsLigature( sal_Unicode cCh, sal_Unicode cNextCh )
 {
             // Lam + Alef
     return ( isLamChar ( cCh ) && isAlefChar ( cNextCh ));
@@ -111,7 +111,7 @@ static sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode cNextCh )
  * Checks if cCh is connectable to cPrevCh (used for Kashidas)
  *************************************************************************/
 
-static sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode cPrevCh )
+static sal_Bool lcl_ConnectToPrev( sal_Unicode cCh, sal_Unicode cPrevCh )
 {
     const int32_t nJoiningType = u_getIntPropertyValue( cPrevCh, UCHAR_JOINING_TYPE );
     sal_Bool bRet = nJoiningType != U_JT_RIGHT_JOINING && nJoiningType != U_JT_NON_JOINING;
@@ -277,7 +277,7 @@ static bool lcl_HasOnlyBlanks( const XubString& rTxt, xub_StrLen nStt, xub_StrLe
     bool bBlankOnly = true;
     while ( nStt < nEnd )
     {
-        const xub_Unicode cChar = rTxt.GetChar( nStt++ );
+        const sal_Unicode cChar = rTxt.GetChar( nStt++ );
         if ( ' ' != cChar && 0x3000 != cChar )
         {
             bBlankOnly = false;
@@ -932,7 +932,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
 
             while ( nLastCompression < nChg )
             {
-                xub_Unicode cChar = rTxt.GetChar( nLastCompression );
+                sal_Unicode cChar = rTxt.GetChar( nLastCompression );
 
                 // examine current character
                 switch ( cChar )
@@ -1000,8 +1000,8 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
 
                 xub_StrLen nIdx = 0;
                 xub_StrLen nKashidaPos = STRING_LEN;
-                xub_Unicode cCh;
-                xub_Unicode cPrevCh = 0;
+                sal_Unicode cCh;
+                sal_Unicode cPrevCh = 0;
 
                 sal_uInt16 nPriorityLevel = 7; // 0..6 = level found
                                            // 7 not found
@@ -1082,7 +1082,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
                         if ( isBaaChar ( cCh )) // Bah
                         {
                             // check if next character is Reh, Yeh or Alef Maksura
-                            xub_Unicode cNextCh = rWord.GetChar( nIdx + 1 );
+                            sal_Unicode cNextCh = rWord.GetChar( nIdx + 1 );
                             if ( isRehChar ( cNextCh ) || isYehChar ( cNextCh ))
                            {
                                 SAL_WARN_IF( 0 == cPrevCh, "sw.core", "No previous character" );
@@ -1369,7 +1369,7 @@ sal_uInt8 SwScriptInfo::DirType( const xub_StrLen nPos ) const
 
 sal_uInt16 SwScriptInfo::MaskHiddenRanges( const SwTxtNode& rNode, XubString& rText,
                                        const xub_StrLen nStt, const xub_StrLen nEnd,
-                                       const xub_Unicode cChar )
+                                       const sal_Unicode cChar )
 {
     assert(rNode.GetTxt().Len() == rText.Len());
 
@@ -1850,7 +1850,7 @@ bool SwScriptInfo::IsArabicText( const rtl::OUString& rTxt, sal_Int32 nStt, sal_
 
     if( nIdx >= 0 )
     {
-        const xub_Unicode cCh = rTxt[nIdx];
+        const sal_Unicode cCh = rTxt[nIdx];
         const sal_Int16 type = unicode::getUnicodeScriptType( cCh, typeList, UnicodeScript_kScriptCount );
         return type == UnicodeScript_kArabic;
     }
@@ -2049,7 +2049,7 @@ sal_Int32 SwScriptInfo::ThaiJustify( const rtl::OUString& rTxt, sal_Int32* pKern
 
     for (sal_Int32 nI = 0; nI < nLen; ++nI)
     {
-        const xub_Unicode cCh = rTxt[nStt + nI];
+        const sal_Unicode cCh = rTxt[nStt + nI];
 
         // check if character is not above or below base
         if ( ( 0xE34 > cCh || cCh > 0xE3A ) &&
diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx
index 7159c6088ce6..3740a431d3c9 100644
--- a/sw/source/core/text/portab.hxx
+++ b/sw/source/core/text/portab.hxx
@@ -37,13 +37,13 @@
 class SwTabPortion : public SwFixPortion
 {
     const KSHORT nTabPos;
-    const xub_Unicode cFill;
+    const sal_Unicode cFill;
     const bool bAutoTabStop;
 
     // Format() branches either into PreFormat() or PostFormat()
     sal_Bool PreFormat( SwTxtFormatInfo &rInf );
 public:
-    SwTabPortion( const KSHORT nTabPos, const xub_Unicode cFill = '\0', const bool bAutoTab = true );
+    SwTabPortion( const KSHORT nTabPos, const sal_Unicode cFill = '\0', const bool bAutoTab = true );
     virtual void Paint( const SwTxtPaintInfo &rInf ) const;
     virtual sal_Bool Format( SwTxtFormatInfo &rInf );
     virtual void FormatEOL( SwTxtFormatInfo &rInf );
@@ -65,7 +65,7 @@ public:
 class SwTabLeftPortion : public SwTabPortion
 {
 public:
-    inline SwTabLeftPortion( const KSHORT nTabPosVal, const xub_Unicode cFillChar='\0', bool bAutoTab = true )
+    inline SwTabLeftPortion( const KSHORT nTabPosVal, const sal_Unicode cFillChar='\0', bool bAutoTab = true )
          : SwTabPortion( nTabPosVal, cFillChar, bAutoTab )
     { SetWhichPor( POR_TABLEFT ); }
     OUTPUT_OPERATOR
@@ -78,7 +78,7 @@ public:
 class SwTabRightPortion : public SwTabPortion
 {
 public:
-    inline SwTabRightPortion( const KSHORT nTabPosVal, const xub_Unicode cFillChar='\0' )
+    inline SwTabRightPortion( const KSHORT nTabPosVal, const sal_Unicode cFillChar='\0' )
          : SwTabPortion( nTabPosVal, cFillChar )
     { SetWhichPor( POR_TABRIGHT ); }
     OUTPUT_OPERATOR
@@ -91,7 +91,7 @@ public:
 class SwTabCenterPortion : public SwTabPortion
 {
 public:
-    inline SwTabCenterPortion( const KSHORT nTabPosVal, const xub_Unicode cFillChar='\0' )
+    inline SwTabCenterPortion( const KSHORT nTabPosVal, const sal_Unicode cFillChar='\0' )
          : SwTabPortion( nTabPosVal, cFillChar )
     { SetWhichPor( POR_TABCENTER ); }
     OUTPUT_OPERATOR
@@ -103,7 +103,7 @@ public:
 
 class SwTabDecimalPortion : public SwTabPortion
 {
-    const xub_Unicode mcTab;
+    const sal_Unicode mcTab;
 
     /*
      * During text formatting, we already store the width of the portions
@@ -113,14 +113,14 @@ class SwTabDecimalPortion : public SwTabPortion
     sal_uInt16 mnWidthOfPortionsUpTpDecimalPosition;
 
 public:
-    inline SwTabDecimalPortion( const KSHORT nTabPosVal, const xub_Unicode cTab,
-                                const xub_Unicode cFillChar = '\0' )
+    inline SwTabDecimalPortion( const KSHORT nTabPosVal, const sal_Unicode cTab,
+                                const sal_Unicode cFillChar = '\0' )
          : SwTabPortion( nTabPosVal, cFillChar ),
            mcTab(cTab),
            mnWidthOfPortionsUpTpDecimalPosition( USHRT_MAX )
     { SetWhichPor( POR_TABDECIMAL ); }
 
-    inline xub_Unicode GetTabDecimal() const { return mcTab; }
+    inline sal_Unicode GetTabDecimal() const { return mcTab; }
 
     inline void SetWidthOfPortionsUpToDecimalPosition( sal_uInt16 nNew )
     {
@@ -142,8 +142,8 @@ public:
 class SwAutoTabDecimalPortion : public SwTabDecimalPortion
 {
 public:
-    inline SwAutoTabDecimalPortion( const KSHORT nTabPosVal, const xub_Unicode cTab,
-                                    const xub_Unicode cFillChar = '\0' )
+    inline SwAutoTabDecimalPortion( const KSHORT nTabPosVal, const sal_Unicode cTab,
+                                    const sal_Unicode cFillChar = '\0' )
          : SwTabDecimalPortion( nTabPosVal, cTab, cFillChar )
     { SetLen( 0 ); }
     virtual void Paint( const SwTxtPaintInfo &rInf ) const;
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index a75cfa483970..c58cf8eb6fde 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -190,7 +190,7 @@ MSHORT SwTxtNode::GetDropLen( MSHORT nWishLen ) const
     xub_StrLen i = 0;
     for( ; i < nEnd; ++i )
     {
-        xub_Unicode cChar = GetTxt().GetChar( i );
+        sal_Unicode cChar = GetTxt().GetChar( i );
         if( CH_TAB == cChar || CH_BREAK == cChar ||
             (( CH_TXTATR_BREAKWORD == cChar || CH_TXTATR_INWORD == cChar )
                 && SwTxtSizeInfo::_HasHint( this, i ) ) )
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index f7956663b9a4..b2d7522f8794 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -519,7 +519,7 @@ bool sw_HideObj( const SwTxtFrm& _rFrm,
               pIDSA->get(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION) &&
              _rFrm.IsInDocBody() && !_rFrm.FindNextCnt() )
         {
-            const xub_Unicode cAnchorChar =
+            const sal_Unicode cAnchorChar =
                         _rFrm.GetTxtNode()->GetTxt().GetChar( _nObjAnchorPos );
             if ( cAnchorChar == CH_TXTATR_BREAKWORD )
             {
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 0bd8b9ae95ee..a7eb24a1d7da 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -83,8 +83,8 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto )
 {
     SwTabPortion *pTabPor = 0;
 
-    xub_Unicode cFill = 0;
-    xub_Unicode cDec = 0;
+    sal_Unicode cFill = 0;
+    sal_Unicode cDec = 0;
     SvxTabAdjust eAdj;
 
     KSHORT nNewTabPos;
@@ -329,7 +329,7 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto )
 // Die Basisklasse wird erstmal ohne alles initialisiert.
 
 
-SwTabPortion::SwTabPortion( const KSHORT nTabPosition, const xub_Unicode cFillChar, const bool bAutoTab )
+SwTabPortion::SwTabPortion( const KSHORT nTabPosition, const sal_Unicode cFillChar, const bool bAutoTab )
     : SwFixPortion( 0, 0 ), nTabPos(nTabPosition), cFill(cFillChar), bAutoTabStop( bAutoTab )
 {
     nLineLength = 1;
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index e7e1e1855c16..289708b407ba 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -632,7 +632,7 @@ void SwFntObj::SetDevFont( const ViewShell *pSh, OutputDevice& rOut )
  *
  *************************************************************************/
 
-static sal_uInt8 lcl_WhichPunctuation( xub_Unicode cChar )
+static sal_uInt8 lcl_WhichPunctuation( sal_Unicode cChar )
 {
     if ( ( cChar < 0x3001 || cChar > 0x3002 ) &&
             ( cChar < 0x3008 || cChar > 0x3011 ) &&
@@ -655,8 +655,8 @@ static sal_uInt8 lcl_WhichPunctuation( xub_Unicode cChar )
 
 static sal_Bool lcl_IsMonoSpaceFont( const OutputDevice& rOut )
 {
-    const rtl::OUString aStr1( xub_Unicode( 0x3008 ) );
-    const rtl::OUString aStr2( xub_Unicode( 0x307C ) );
+    const rtl::OUString aStr1( sal_Unicode( 0x3008 ) );
+    const rtl::OUString aStr2( sal_Unicode( 0x307C ) );
     const long nWidth1 = rOut.GetTextWidth( aStr1 );
     const long nWidth2 = rOut.GetTextWidth( aStr2 );
     return nWidth1 == nWidth2;
@@ -991,7 +991,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
             long nNextFix;
 
             // punctuation characters are not centered
-            xub_Unicode cChar = rInf.GetText().GetChar( rInf.GetIdx() );
+            sal_Unicode cChar = rInf.GetText().GetChar( rInf.GetIdx() );
             sal_uInt8 nType = lcl_WhichPunctuation( cChar );
             switch ( nType )
             {
@@ -1558,7 +1558,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
             nCnt = nCnt - rInf.GetIdx();
         nCnt = Min( nCnt, rInf.GetLen() );
         long nKernSum = rInf.GetKern();
-        xub_Unicode cChPrev = rInf.GetText().GetChar( rInf.GetIdx() );
+        sal_Unicode cChPrev = rInf.GetText().GetChar( rInf.GetIdx() );
 
         // In case of a single underlined space in justified text,
         // have to output 2 spaces:
@@ -1582,7 +1582,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
         }
         else
         {
-            xub_Unicode nCh;
+            sal_Unicode nCh;
 
             // In case of Pair Kerning the printer influence on the positioning
             // grows
@@ -1936,9 +1936,9 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf )
             else
                 nCnt = nCnt - rInf.GetIdx();
             nCnt = Min (nCnt, nLn);
-            xub_Unicode nChPrev = rInf.GetText().GetChar( rInf.GetIdx() );
+            sal_Unicode nChPrev = rInf.GetText().GetChar( rInf.GetIdx() );
 
-            xub_Unicode nCh;
+            sal_Unicode nCh;
 
             // In case of Pair Kerning the printer influence on the positioning
             // grows
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 899b93aad29d..dadfe42808a0 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2967,7 +2967,7 @@ sal_Bool SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx,
         sTmpText.SearchAndReplaceAll('\t', ' ');
 
     // mask hidden characters
-    const xub_Unicode cChar = CH_TXTATR_BREAKWORD;
+    const sal_Unicode cChar = CH_TXTATR_BREAKWORD;
     sal_uInt16 nHiddenChrs =
         SwScriptInfo::MaskHiddenRanges( *this, sTmpText, 0, sTmpText.Len(), cChar );
 
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 97e680aa4abe..4681d88efee0 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -105,7 +105,7 @@ extern       SwTxtFrm  *pLinguFrm;
 
 static sal_uInt16 lcl_MaskRedlines( const SwTxtNode& rNode, XubString& rText,
                          const xub_StrLen nStt, const xub_StrLen nEnd,
-                         const xub_Unicode cChar )
+                         const sal_Unicode cChar )
 {
     sal_uInt16 nNumOfMaskedRedlines = 0;
 
@@ -150,7 +150,7 @@ static sal_uInt16 lcl_MaskRedlines( const SwTxtNode& rNode, XubString& rText,
 
 static sal_uInt16 lcl_MaskRedlinesAndHiddenText( const SwTxtNode& rNode, XubString& rText,
                                       const xub_StrLen nStt, const xub_StrLen nEnd,
-                                      const xub_Unicode cChar = CH_TXTATR_INWORD,
+                                      const sal_Unicode cChar = CH_TXTATR_INWORD,
                                       bool bCheckShowHiddenChar = true )
 {
     sal_uInt16 nRedlinesMasked = 0;
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx
index 838089875998..ba66665db8b8 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/ui/ribbar/inputwin.cxx
@@ -429,8 +429,8 @@ void  SwInputWindow::CancelFormula()
 }
 //==================================================================
 
-const xub_Unicode CH_LRE = 0x202a;
-const xub_Unicode CH_PDF = 0x202c;
+const sal_Unicode CH_LRE = 0x202a;
+const sal_Unicode CH_PDF = 0x202c;
 
 IMPL_LINK( SwInputWindow, SelTblCellsNotify, SwWrtShell *, pCaller )
 {