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>

5 files changed, 14 insertions, 14 deletions

diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 77962c30341d..169ce09d6148 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -439,8 +439,8 @@ private:
 #endif
 
 protected:
-    void            LoadMRUEntries( const String& aFontMRUEntriesFile, xub_Unicode cSep = ';' );
-    void            SaveMRUEntries( const String& aFontMRUEntriesFile, xub_Unicode cSep = ';' ) const;
+    void            LoadMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode cSep = ';' );
+    void            SaveMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode cSep = ';' ) const;
 public:
                     FontNameBox( Window* pParent,
                                  WinBits nWinStyle = WB_SORT );
diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx
index d219b93dc3ef..a10fb4c2c73b 100644
--- a/svtools/inc/svtools/svtabbx.hxx
+++ b/svtools/inc/svtools/svtabbx.hxx
@@ -62,7 +62,7 @@ private:
 protected:
     SvTreeListEntry*                pViewParent;
 
-    static const xub_Unicode*   GetToken( const xub_Unicode* pPtr, sal_uInt16& rLen );
+    static const sal_Unicode*   GetToken( const sal_Unicode* pPtr, sal_uInt16& rLen );
 
     virtual void                SetTabs();
     virtual void                InitEntry( SvTreeListEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind );
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 7e9c8952feb6..212e5810b945 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -193,7 +193,7 @@ private:
     bool                    mbShowHeader;
 
     void            DeleteEntries();
-    void            DoQuickSearch( const xub_Unicode& rChar );
+    void            DoQuickSearch( const sal_Unicode& rChar );
     sal_Bool        Kill( const OUString& rURL );
 
 protected:
@@ -1037,7 +1037,7 @@ sal_Bool ViewTabListBox_Impl::EditedEntry( SvTreeListEntry* pEntry,
 }
 
 // -----------------------------------------------------------------------
-void ViewTabListBox_Impl::DoQuickSearch( const xub_Unicode& rChar )
+void ViewTabListBox_Impl::DoQuickSearch( const sal_Unicode& rChar )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 64a1bd8ec499..d9f0c55d18af 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -85,9 +85,9 @@ void SvTabListBox::InitEntry( SvTreeListEntry* pEntry, const XubString& rStr,
     SvTreeListBox::InitEntry( pEntry, rStr, rColl, rExp, eButtonKind );
     XubString aToken;
 
-    const xub_Unicode* pCurToken = aCurEntry.GetBuffer();
+    const sal_Unicode* pCurToken = aCurEntry.GetBuffer();
     sal_uInt16 nCurTokenLen;
-    const xub_Unicode* pNextToken = GetToken( pCurToken, nCurTokenLen );
+    const sal_Unicode* pNextToken = GetToken( pCurToken, nCurTokenLen );
     sal_uInt16 nCount = nTabCount; nCount--;
     for( sal_uInt16 nToken = 0; nToken < nCount; nToken++ )
     {
@@ -324,9 +324,9 @@ void SvTabListBox::SetEntryText( const XubString& rStr, SvTreeListEntry* pEntry,
         return;
 
     sal_uInt16 nTextColumn = nCol;
-    const xub_Unicode* pCurToken = rStr.GetBuffer();
+    const sal_Unicode* pCurToken = rStr.GetBuffer();
     sal_uInt16 nCurTokenLen;
-    const xub_Unicode* pNextToken = GetToken( pCurToken, nCurTokenLen );
+    const sal_Unicode* pNextToken = GetToken( pCurToken, nCurTokenLen );
 
     XubString aTemp;
     sal_uInt16 nCount = pEntry->ItemCount();
@@ -419,14 +419,14 @@ void SvTabListBox::Resize()
 }
 
 // static
-const xub_Unicode* SvTabListBox::GetToken( const xub_Unicode* pPtr, sal_uInt16& rLen )
+const sal_Unicode* SvTabListBox::GetToken( const sal_Unicode* pPtr, sal_uInt16& rLen )
 {
     if( !pPtr || *pPtr == 0 )
     {
         rLen = 0;
         return 0;
     }
-    xub_Unicode c = *pPtr;
+    sal_Unicode c = *pPtr;
     sal_uInt16 nLen = 0;
     while( c != '\t' && c != 0 )
     {
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index b3a095d8145b..61964004c3a2 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1063,7 +1063,7 @@ FontNameBox::~FontNameBox()
 
 // -------------------------------------------------------------------
 
-void FontNameBox::SaveMRUEntries( const String& aFontMRUEntriesFile, xub_Unicode cSep ) const
+void FontNameBox::SaveMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode cSep ) const
 {
     rtl::OString aEntries(rtl::OUStringToOString(GetMRUEntries(cSep),
         RTL_TEXTENCODING_UTF8));
@@ -1088,7 +1088,7 @@ void FontNameBox::SaveMRUEntries( const String& aFontMRUEntriesFile, xub_Unicode
 
 // -------------------------------------------------------------------
 
-void FontNameBox::LoadMRUEntries( const String& aFontMRUEntriesFile, xub_Unicode cSep )
+void FontNameBox::LoadMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode cSep )
 {
     if( ! aFontMRUEntriesFile.Len() )
         return;
@@ -1721,7 +1721,7 @@ void FontSizeBox::Modify()
         if ( bRelative )
         {
             bPtRelative = sal_False;
-            const xub_Unicode* pStr = aStr.GetBuffer();
+            const sal_Unicode* pStr = aStr.GetBuffer();
             while ( *pStr )
             {
                 if ( ((*pStr < '0') || (*pStr > '9')) && (*pStr != '%') )