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>

4 files changed, 14 insertions, 14 deletions

diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 7ed0c935abf8..c2fb462c3ba7 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -105,7 +105,7 @@ public:
     int                 mnLength;
     int                 mnMinCharPos;
     int                 mnEndCharPos;
-    const xub_Unicode*  mpStr;
+    const sal_Unicode*  mpStr;
 
     // positioning related inputs
     const sal_Int32*    mpDXArray;          // in pixel units
@@ -117,7 +117,7 @@ public:
     ImplLayoutRuns      maReruns;
 
 public:
-                ImplLayoutArgs( const xub_Unicode* pStr, int nLength,
+                ImplLayoutArgs( const sal_Unicode* pStr, int nLength,
                     int nMinCharPos, int nEndCharPos, int nFlags );
 
     void        SetLayoutWidth( long nWidth )       { mnLayoutWidth = nWidth; }
diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx
index ccfb8c935839..5b21cf358741 100644
--- a/vcl/inc/vcl/combobox.hxx
+++ b/vcl/inc/vcl/combobox.hxx
@@ -52,7 +52,7 @@ private:
     ImplBtn*                    mpBtn;
     ImplListBoxFloatingWindow*  mpFloatWin;
     sal_uInt16                      mnDDHeight;
-    xub_Unicode                 mcMultiSep;
+    sal_Unicode                 mcMultiSep;
     sal_Bool                        mbDDAutoSize        : 1;
     sal_Bool                        mbSyntheticModify   : 1;
     sal_Bool                        mbMatchCase         : 1;
@@ -157,8 +157,8 @@ public:
 
     void            EnableMultiSelection( sal_Bool bMulti );
     sal_Bool            IsMultiSelectionEnabled() const;
-    void            SetMultiSelectionSeparator( xub_Unicode cSep ) { mcMultiSep = cSep; }
-    xub_Unicode     GetMultiSelectionSeparator() const { return mcMultiSep; }
+    void            SetMultiSelectionSeparator( sal_Unicode cSep ) { mcMultiSep = cSep; }
+    sal_Unicode     GetMultiSelectionSeparator() const { return mcMultiSep; }
 
     void            SetSelectHdl( const Link& rLink )       { maSelectHdl = rLink; }
     const Link&     GetSelectHdl() const                    { return maSelectHdl; }
@@ -172,8 +172,8 @@ public:
     Size            CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const;
     void            GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const;
 
-    void            SetMRUEntries( const XubString& rEntries, xub_Unicode cSep = ';' );
-    XubString       GetMRUEntries( xub_Unicode cSep = ';' ) const;
+    void            SetMRUEntries( const XubString& rEntries, sal_Unicode cSep = ';' );
+    XubString       GetMRUEntries( sal_Unicode cSep = ';' ) const;
     void            SetMaxMRUCount( sal_uInt16 n );
     sal_uInt16          GetMaxMRUCount() const;
 
diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx
index 7ddab48fa1a6..5cb189c4614b 100644
--- a/vcl/inc/vcl/edit.hxx
+++ b/vcl/inc/vcl/edit.hxx
@@ -80,7 +80,7 @@ private:
     xub_StrLen          mnMaxTextLen;
     sal_Int32           mnMinWidthInChars;
     AutocompleteAction  meAutocompleteAction;
-    xub_Unicode         mcEchoChar;
+    sal_Unicode         mcEchoChar;
     sal_Bool                mbModified:1,
                         mbInternModified:1,
                         mbReadOnly:1,
@@ -187,8 +187,8 @@ public:
     virtual void        DisableUpdateData() { delete mpUpdateDataTimer; mpUpdateDataTimer = NULL; }
     virtual sal_uLong       IsUpdateDataEnabled() const;
 
-    void                SetEchoChar( xub_Unicode c );
-    xub_Unicode         GetEchoChar() const { return mcEchoChar; }
+    void                SetEchoChar( sal_Unicode c );
+    sal_Unicode         GetEchoChar() const { return mcEchoChar; }
 
     virtual void        SetReadOnly( sal_Bool bReadOnly = sal_True );
     virtual sal_Bool        IsReadOnly() const { return mbReadOnly; }
diff --git a/vcl/inc/vcl/event.hxx b/vcl/inc/vcl/event.hxx
index 0850024cdceb..099858f34788 100644
--- a/vcl/inc/vcl/event.hxx
+++ b/vcl/inc/vcl/event.hxx
@@ -59,14 +59,14 @@ class VCL_DLLPUBLIC KeyEvent
 private:
     KeyCode         maKeyCode;
     sal_uInt16          mnRepeat;
-    xub_Unicode     mnCharCode;
+    sal_Unicode     mnCharCode;
 
 public:
                     KeyEvent();
-                    KeyEvent( xub_Unicode nChar, const KeyCode& rKeyCode,
+                    KeyEvent( sal_Unicode nChar, const KeyCode& rKeyCode,
                               sal_uInt16 nRepeat = 0 );
 
-    xub_Unicode     GetCharCode() const     { return mnCharCode; }
+    sal_Unicode     GetCharCode() const     { return mnCharCode; }
     const KeyCode&  GetKeyCode() const      { return maKeyCode;  }
     sal_uInt16          GetRepeat() const       { return mnRepeat;   }
 
@@ -81,7 +81,7 @@ inline KeyEvent::KeyEvent()
     mnRepeat    = 0;
 }
 
-inline KeyEvent::KeyEvent( xub_Unicode nChar, const KeyCode& rKeyCode,
+inline KeyEvent::KeyEvent( sal_Unicode nChar, const KeyCode& rKeyCode,
                            sal_uInt16 nRepeat ) :
             maKeyCode( rKeyCode )