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>

6 files changed, 20 insertions, 20 deletions

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 3ec6e64f1933..841a65f11cdc 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -43,7 +43,7 @@
 
 // =======================================================================
 
-static void lcl_GetSelectedEntries( ::std::set< sal_uInt16 >& rSelectedPos, const XubString& rText, xub_Unicode cTokenSep, const ImplEntryList* pEntryList )
+static void lcl_GetSelectedEntries( ::std::set< sal_uInt16 >& rSelectedPos, const XubString& rText, sal_Unicode cTokenSep, const ImplEntryList* pEntryList )
 {
     for (xub_StrLen n = comphelper::string::getTokenCount(rText, cTokenSep); n;)
     {
@@ -1363,14 +1363,14 @@ void ComboBox::SetSeparatorPos( sal_uInt16 n )
 
 // -----------------------------------------------------------------------
 
-void ComboBox::SetMRUEntries( const XubString& rEntries, xub_Unicode cSep )
+void ComboBox::SetMRUEntries( const XubString& rEntries, sal_Unicode cSep )
 {
     mpImplLB->SetMRUEntries( rEntries, cSep );
 }
 
 // -----------------------------------------------------------------------
 
-XubString ComboBox::GetMRUEntries( xub_Unicode cSep ) const
+XubString ComboBox::GetMRUEntries( sal_Unicode cSep ) const
 {
     return mpImplLB->GetMRUEntries( cSep );
 }
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 7d2c47630a7a..a8d018e8a7be 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -435,7 +435,7 @@ WinBits Edit::ImplInitStyle( WinBits nStyle )
 sal_Bool Edit::IsCharInput( const KeyEvent& rKeyEvent )
 {
     // In the future we must use new Unicode functions for this
-    xub_Unicode cCharCode = rKeyEvent.GetCharCode();
+    sal_Unicode cCharCode = rKeyEvent.GetCharCode();
     return ((cCharCode >= 32) && (cCharCode != 127) &&
             !rKeyEvent.GetKeyCode().IsMod3() &&
             !rKeyEvent.GetKeyCode().IsMod2() &&
@@ -516,7 +516,7 @@ XubString Edit::ImplGetText() const
     if ( mcEchoChar || (GetStyle() & WB_PASSWORD) )
     {
         XubString   aText;
-        xub_Unicode cEchoChar;
+        sal_Unicode cEchoChar;
         if ( mcEchoChar )
             cEchoChar = mcEchoChar;
         else
@@ -2613,7 +2613,7 @@ void Edit::EnableUpdateData( sal_uLong nTimeout )
 
 // -----------------------------------------------------------------------
 
-void Edit::SetEchoChar( xub_Unicode c )
+void Edit::SetEchoChar( sal_Unicode c )
 {
     mcEchoChar = c;
     if ( mpSubEdit )
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 9474761969e5..f258ffcd6288 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -80,7 +80,7 @@ static sal_Bool ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt,
         return sal_False;
     else
     {
-        xub_Unicode cChar = rKEvt.GetCharCode();
+        sal_Unicode cChar = rKEvt.GetCharCode();
         sal_uInt16      nGroup = rKEvt.GetKeyCode().GetGroup();
 
         if ( (nGroup == KEYGROUP_FKEYS) || (nGroup == KEYGROUP_CURSOR) ||
@@ -1110,7 +1110,7 @@ static rtl::OUString ImplMetricGetUnitText(const rtl::OUString& rStr)
     rtl::OUStringBuffer aStr;
     for (sal_Int32 i = rStr.getLength()-1; i >= 0; --i)
     {
-        xub_Unicode c = rStr[i];
+        sal_Unicode c = rStr[i];
         if ( (c == '\'') || (c == '\"') || (c == '%' ) || unicode::isAlpha(c) || unicode::isControl(c) )
             aStr.insert(0, c);
         else
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index ec5ad7e7df99..379aa5cb25ea 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -158,7 +158,7 @@ static void ImplSkipDelimiters( const sal_Unicode*& rpBuf )
 
 // -----------------------------------------------------------------------
 
-static int ImplIsPatternChar( xub_Unicode cChar, sal_Char cEditMask )
+static int ImplIsPatternChar( sal_Unicode cChar, sal_Char cEditMask )
 {
     sal_Int32 nType = 0;
 
@@ -206,7 +206,7 @@ static int ImplIsPatternChar( xub_Unicode cChar, sal_Char cEditMask )
 
 // -----------------------------------------------------------------------
 
-static xub_Unicode ImplPatternChar( xub_Unicode cChar, sal_Char cEditMask )
+static sal_Unicode ImplPatternChar( sal_Unicode cChar, sal_Char cEditMask )
 {
     if ( ImplIsPatternChar( cChar, cEditMask ) )
     {
@@ -224,7 +224,7 @@ static xub_Unicode ImplPatternChar( xub_Unicode cChar, sal_Char cEditMask )
 
 // -----------------------------------------------------------------------
 
-static int ImplKommaPointCharEqual( xub_Unicode c1, xub_Unicode c2 )
+static int ImplKommaPointCharEqual( sal_Unicode c1, sal_Unicode c2 )
 {
     if ( c1 == c2 )
         return sal_True;
@@ -247,9 +247,9 @@ static XubString ImplPatternReformat( const XubString& rStr,
 
     XubString   aStr    = rStr;
     XubString   aOutStr = rLiteralMask;
-    xub_Unicode cTempChar;
-    xub_Unicode cChar;
-    xub_Unicode cLiteral;
+    sal_Unicode cTempChar;
+    sal_Unicode cChar;
+    sal_Unicode cLiteral;
     sal_Char    cMask;
     xub_StrLen  nStrIndex = 0;
     xub_StrLen  i = 0;
@@ -487,7 +487,7 @@ static sal_Bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
 
     Selection   aOldSel     = pEdit->GetSelection();
     KeyCode     aCode       = rKEvt.GetKeyCode();
-    xub_Unicode cChar       = rKEvt.GetCharCode();
+    sal_Unicode cChar       = rKEvt.GetCharCode();
     sal_uInt16      nKeyCode    = aCode.GetCode();
     sal_Bool        bShift      = aCode.IsShift();
     xub_StrLen  nCursorPos  = (xub_StrLen)aOldSel.Max();
@@ -637,7 +637,7 @@ static sal_Bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
 
     if ( nNewPos < rEditMask.getLength() )
     {
-        xub_Unicode cPattChar = ImplPatternChar( cChar, rEditMask[nNewPos] );
+        sal_Unicode cPattChar = ImplPatternChar( cChar, rEditMask[nNewPos] );
         if ( cPattChar )
             cChar = cPattChar;
         else
@@ -1069,7 +1069,7 @@ static String ImplGetDateSep( const LocaleDataWrapper& rLocaleDataWrapper, ExtDa
 static sal_Bool ImplDateProcessKeyInput( Edit*, const KeyEvent& rKEvt, ExtDateFieldFormat eFormat,
                                      const LocaleDataWrapper& rLocaleDataWrapper  )
 {
-    xub_Unicode cChar = rKEvt.GetCharCode();
+    sal_Unicode cChar = rKEvt.GetCharCode();
     sal_uInt16 nGroup = rKEvt.GetKeyCode().GetGroup();
     if ( (nGroup == KEYGROUP_FKEYS) || (nGroup == KEYGROUP_CURSOR) ||
          (nGroup == KEYGROUP_MISC)||
@@ -2163,7 +2163,7 @@ static sal_Bool ImplTimeProcessKeyInput( Edit*, const KeyEvent& rKEvt,
                                      TimeFieldFormat eFormat,
                                      const LocaleDataWrapper& rLocaleDataWrapper  )
 {
-    xub_Unicode cChar = rKEvt.GetCharCode();
+    sal_Unicode cChar = rKEvt.GetCharCode();
 
     if ( !bStrictFormat )
         return sal_False;
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 1d0c14688c06..714f0db66e7b 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2735,7 +2735,7 @@ sal_Bool ImplListBox::HandleWheelAsCursorTravel( const CommandEvent& rCEvt )
 
 // -----------------------------------------------------------------------
 
-void ImplListBox::SetMRUEntries( const rtl::OUString& rEntries, xub_Unicode cSep )
+void ImplListBox::SetMRUEntries( const rtl::OUString& rEntries, sal_Unicode cSep )
 {
     sal_Bool bChanges = GetEntryList()->GetMRUCount() ? sal_True : sal_False;
 
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index b3e308ef858d..67840f62030a 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -127,7 +127,7 @@ namespace vcl
     //--------------------------------------------------------------------
     bool QuickSelectionEngine::HandleKeyEvent( const KeyEvent& _keyEvent )
     {
-        xub_Unicode c = _keyEvent.GetCharCode();
+        sal_Unicode c = _keyEvent.GetCharCode();
 
         if ( ( c >= 32 ) && ( c != 127 ) && !_keyEvent.GetKeyCode().IsMod2() )
         {