Change ucb_Unicode to sal_Unicode

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

15 files changed, 49 insertions, 49 deletions

diff --git a/bf_basic/source/sbx/sbxbool.cxx b/bf_basic/source/sbx/sbxbool.cxx
index 6fca8d8f6..0fc39f380 100644
--- a/bf_basic/source/sbx/sbxbool.cxx
+++ b/bf_basic/source/sbx/sbxbool.cxx
@@ -154,7 +154,7 @@ void ImpPutBool( SbxValues* p, INT16 n )
     switch( +p->eType )
     {
         case SbxCHAR:
-            p->nChar = (xub_Unicode) n; break;
+            p->nChar = (sal_Unicode) n; break;
         case SbxUINT:
             p->nByte = (BYTE) n; break;
         case SbxINTEGER:
@@ -204,7 +204,7 @@ void ImpPutBool( SbxValues* p, INT16 n )
             break;
         }
         case SbxBYREF | SbxCHAR:
-            *p->pChar = (xub_Unicode) n; break;
+            *p->pChar = (sal_Unicode) n; break;
         case SbxBYREF | SbxBYTE:
             *p->pByte = (BYTE) n; break;
         case SbxBYREF | SbxINTEGER:
diff --git a/bf_basic/source/sbx/sbxbyte.cxx b/bf_basic/source/sbx/sbxbyte.cxx
index a0ecf99be..34397ae97 100644
--- a/bf_basic/source/sbx/sbxbyte.cxx
+++ b/bf_basic/source/sbx/sbxbyte.cxx
@@ -266,7 +266,7 @@ void ImpPutByte( SbxValues* p, BYTE n )
             break;
 
         case SbxCHAR:
-            p->nChar = (xub_Unicode) n; break;
+            p->nChar = (sal_Unicode) n; break;
 
         case SbxBYREF | SbxSTRING:
         case SbxSTRING:
@@ -285,7 +285,7 @@ void ImpPutByte( SbxValues* p, BYTE n )
             break;
         }
         case SbxBYREF | SbxCHAR:
-            *p->pChar = (xub_Unicode) n; break;
+            *p->pChar = (sal_Unicode) n; break;
         case SbxBYREF | SbxBYTE:
             *p->pByte = n; break;
         case SbxBYREF | SbxINTEGER:
diff --git a/bf_basic/source/sbx/sbxchar.cxx b/bf_basic/source/sbx/sbxchar.cxx
index 866bc458c..d0259e513 100644
--- a/bf_basic/source/sbx/sbxchar.cxx
+++ b/bf_basic/source/sbx/sbxchar.cxx
@@ -23,10 +23,10 @@
 
 namespace binfilter {
 
-xub_Unicode ImpGetChar( const SbxValues* p )
+sal_Unicode ImpGetChar( const SbxValues* p )
 {
     SbxValues aTmp;
-    xub_Unicode nRes;
+    sal_Unicode nRes;
 start:
     switch( +p->eType )
     {
@@ -37,7 +37,7 @@ start:
         case SbxCHAR:
             nRes = p->nChar; break;
         case SbxBYTE:
-            nRes = (xub_Unicode) p->nByte;
+            nRes = (sal_Unicode) p->nByte;
             break;
         case SbxINTEGER:
         case SbxBOOL:
@@ -46,11 +46,11 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINCHAR;
             }
             else
-                nRes = (xub_Unicode) p->nInteger;
+                nRes = (sal_Unicode) p->nInteger;
             break;
         case SbxERROR:
         case SbxUSHORT:
-            nRes = (xub_Unicode) p->nUShort;
+            nRes = (sal_Unicode) p->nUShort;
             break;
         case SbxLONG:
             if( p->nLong > SbxMAXCHAR )
@@ -62,7 +62,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINCHAR;
             }
             else
-                nRes = (xub_Unicode) p->nLong;
+                nRes = (sal_Unicode) p->nLong;
             break;
         case SbxULONG:
             if( p->nULong > SbxMAXCHAR )
@@ -70,7 +70,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXCHAR;
             }
             else
-                nRes = (xub_Unicode) p->nULong;
+                nRes = (sal_Unicode) p->nULong;
             break;
         case SbxSALINT64:
             if( p->nInt64 > SbxMAXCHAR )
@@ -82,7 +82,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINCHAR;
             }
             else
-                nRes = (xub_Unicode) p->nInt64;
+                nRes = (sal_Unicode) p->nInt64;
             break;
         case SbxSALUINT64:
             if( p->uInt64 > SbxMAXCHAR )
@@ -90,7 +90,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXCHAR;
             }
             else
-                nRes = (xub_Unicode) p->uInt64;
+                nRes = (sal_Unicode) p->uInt64;
             break;
         case SbxSINGLE:
             if( p->nSingle > SbxMAXCHAR )
@@ -102,7 +102,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINCHAR;
             }
             else
-                nRes = (xub_Unicode) ImpRound( p->nSingle );
+                nRes = (sal_Unicode) ImpRound( p->nSingle );
             break;
         case SbxDATE:
         case SbxDOUBLE:
@@ -160,7 +160,7 @@ start:
                     SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINCHAR;
                 }
                 else
-                    nRes = (xub_Unicode) ImpRound( d );
+                    nRes = (sal_Unicode) ImpRound( d );
             }
             break;
         case SbxOBJECT:
@@ -214,7 +214,7 @@ start:
     return nRes;
 }
 
-void ImpPutChar( SbxValues* p, xub_Unicode n )
+void ImpPutChar( SbxValues* p, sal_Unicode n )
 {
     SbxValues aTmp;
 start:
diff --git a/bf_basic/source/sbx/sbxcurr.cxx b/bf_basic/source/sbx/sbxcurr.cxx
index 17c67f0de..65be863bc 100644
--- a/bf_basic/source/sbx/sbxcurr.cxx
+++ b/bf_basic/source/sbx/sbxcurr.cxx
@@ -239,7 +239,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); dVal = SbxMINCHAR;
             }
-            *p->pChar = (xub_Unicode) dVal; break;
+            *p->pChar = (sal_Unicode) dVal; break;
         case SbxBYREF | SbxBYTE:
             if( dVal > SbxMAXBYTE )
             {
diff --git a/bf_basic/source/sbx/sbxdate.cxx b/bf_basic/source/sbx/sbxdate.cxx
index c1cc09767..da2bacdae 100644
--- a/bf_basic/source/sbx/sbxdate.cxx
+++ b/bf_basic/source/sbx/sbxdate.cxx
@@ -316,7 +316,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMINCHAR;
             }
-            *p->pChar = (xub_Unicode) n; break;
+            *p->pChar = (sal_Unicode) n; break;
         case SbxBYREF | SbxBYTE:
             if( n > SbxMAXBYTE )
             {
diff --git a/bf_basic/source/sbx/sbxdbl.cxx b/bf_basic/source/sbx/sbxdbl.cxx
index 69815ba2f..671911497 100644
--- a/bf_basic/source/sbx/sbxdbl.cxx
+++ b/bf_basic/source/sbx/sbxdbl.cxx
@@ -193,7 +193,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMINCHAR;
             }
-            *p->pChar = (xub_Unicode) n; break;
+            *p->pChar = (sal_Unicode) n; break;
         case SbxBYREF | SbxBYTE:
             if( n > SbxMAXBYTE )
             {
diff --git a/bf_basic/source/sbx/sbxexec.cxx b/bf_basic/source/sbx/sbxexec.cxx
index e80b8b645..c0337779f 100644
--- a/bf_basic/source/sbx/sbxexec.cxx
+++ b/bf_basic/source/sbx/sbxexec.cxx
@@ -47,10 +47,10 @@ public:
 
 
 static SbxVariable* Element
-    ( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf,
+    ( SbxObject* pObj, SbxObject* pGbl, const sal_Unicode** ppBuf,
       SbxClassType, const SbxSimpleCharClass& rCharClass );
 
-static const xub_Unicode* SkipWhitespace( const xub_Unicode* p )
+static const sal_Unicode* SkipWhitespace( const sal_Unicode* p )
 {
     while( *p && ( *p == ' ' || *p == '\t' ) )
         p++;
@@ -60,7 +60,7 @@ static const xub_Unicode* SkipWhitespace( const xub_Unicode* p )
 // Scannen eines Symbol. Das Symbol wird in rSym eingetragen, der Returnwert
 // ist die neue Scanposition. Bei Fehlern ist das Symbol leer.
 
-static const xub_Unicode* Symbol( const xub_Unicode* p, XubString& rSym, const SbxSimpleCharClass& rCharClass )
+static const sal_Unicode* Symbol( const sal_Unicode* p, XubString& rSym, const SbxSimpleCharClass& rCharClass )
 {
     USHORT nLen = 0;
     // Haben wir ein Sondersymbol?
@@ -94,12 +94,12 @@ static const xub_Unicode* Symbol( const xub_Unicode* p, XubString& rSym, const S
 // Qualifizierter Name. Element.Element....
 
 static SbxVariable* QualifiedName
-    ( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf, SbxClassType t )
+    ( SbxObject* pObj, SbxObject* pGbl, const sal_Unicode** ppBuf, SbxClassType t )
 {
     static SbxSimpleCharClass aCharClass;
 
     SbxVariableRef refVar;
-    const xub_Unicode* p = SkipWhitespace( *ppBuf );
+    const sal_Unicode* p = SkipWhitespace( *ppBuf );
     if( aCharClass.isAlpha( *p ) || *p == '_' || *p == '[' )
     {
         // Element einlesen
@@ -132,12 +132,12 @@ static SbxVariable* QualifiedName
 // eine Funktion (mit optionalen Parametern) sein.
 
 static SbxVariable* Operand
-    ( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf, BOOL bVar )
+    ( SbxObject* pObj, SbxObject* pGbl, const sal_Unicode** ppBuf, BOOL bVar )
 {
     static SbxSimpleCharClass aCharClass;
 
     SbxVariableRef refVar( new SbxVariable );
-    const xub_Unicode* p = SkipWhitespace( *ppBuf );
+    const sal_Unicode* p = SkipWhitespace( *ppBuf );
     if( !bVar && ( aCharClass.isDigit( *p )
      || ( *p == '.' && aCharClass.isDigit( *( p+1 ) ) )
      || *p == '-'
@@ -179,14 +179,14 @@ static SbxVariable* Operand
 // Einlesen einer einfachen Term. Die Operatoren +, -, * und /
 // werden unterstuetzt.
 
-static SbxVariable* MulDiv( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf )
+static SbxVariable* MulDiv( SbxObject* pObj, SbxObject* pGbl, const sal_Unicode** ppBuf )
 {
-    const xub_Unicode* p = *ppBuf;
+    const sal_Unicode* p = *ppBuf;
     SbxVariableRef refVar( Operand( pObj, pGbl, &p, FALSE ) );
     p = SkipWhitespace( p );
     while( refVar.Is() && ( *p == '*' || *p == '/' ) )
     {
-        xub_Unicode cOp = *p++;
+        sal_Unicode cOp = *p++;
         SbxVariableRef refVar2( Operand( pObj, pGbl, &p, FALSE ) );
         if( refVar2.Is() )
         {
@@ -211,14 +211,14 @@ static SbxVariable* MulDiv( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode*
     return refVar;
 }
 
-static SbxVariable* PlusMinus( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf )
+static SbxVariable* PlusMinus( SbxObject* pObj, SbxObject* pGbl, const sal_Unicode** ppBuf )
 {
-    const xub_Unicode* p = *ppBuf;
+    const sal_Unicode* p = *ppBuf;
     SbxVariableRef refVar( MulDiv( pObj, pGbl, &p ) );
     p = SkipWhitespace( p );
     while( refVar.Is() && ( *p == '+' || *p == '-' ) )
     {
-        xub_Unicode cOp = *p++;
+        sal_Unicode cOp = *p++;
         SbxVariableRef refVar2( MulDiv( pObj, pGbl, &p ) );
         if( refVar2.Is() )
         {
@@ -245,11 +245,11 @@ static SbxVariable* PlusMinus( SbxObject* pObj, SbxObject* pGbl, const xub_Unico
 
 
 static SbxVariable* Element
-    ( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf,
+    ( SbxObject* pObj, SbxObject* pGbl, const sal_Unicode** ppBuf,
       SbxClassType t, const SbxSimpleCharClass& rCharClass )
 {
     XubString aSym;
-    const xub_Unicode* p = Symbol( *ppBuf, aSym, rCharClass );
+    const sal_Unicode* p = Symbol( *ppBuf, aSym, rCharClass );
     SbxVariableRef refVar;
     if( aSym.Len() )
     {
@@ -310,7 +310,7 @@ static SbxVariable* Element
 SbxVariable* SbxObject::FindQualified( const XubString& rName, SbxClassType t )
 {
     SbxVariable* pVar = NULL;
-    const xub_Unicode* p = rName.GetBuffer();
+    const sal_Unicode* p = rName.GetBuffer();
     p = SkipWhitespace( p );
     if( !*p )
         return NULL;;
diff --git a/bf_basic/source/sbx/sbxint.cxx b/bf_basic/source/sbx/sbxint.cxx
index 62aef920b..33e3bc688 100644
--- a/bf_basic/source/sbx/sbxint.cxx
+++ b/bf_basic/source/sbx/sbxint.cxx
@@ -594,7 +594,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMINCHAR;
             }
-            *p->pChar = (xub_Unicode) n; break;
+            *p->pChar = (sal_Unicode) n; break;
         case SbxBYREF | SbxBYTE:
             if( n > SbxMAXBYTE )
             {
@@ -897,7 +897,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXCHAR;
             }
-            *p->pChar = (xub_Unicode) n; break;
+            *p->pChar = (sal_Unicode) n; break;
         case SbxBYREF | SbxBYTE:
             if( n > SbxMAXBYTE )
             {
diff --git a/bf_basic/source/sbx/sbxlng.cxx b/bf_basic/source/sbx/sbxlng.cxx
index e965259a2..991682e37 100644
--- a/bf_basic/source/sbx/sbxlng.cxx
+++ b/bf_basic/source/sbx/sbxlng.cxx
@@ -254,7 +254,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMINCHAR;
             }
-            *p->pChar = (xub_Unicode) n; break;
+            *p->pChar = (sal_Unicode) n; break;
         case SbxBYREF | SbxBYTE:
             if( n > SbxMAXBYTE )
             {
diff --git a/bf_basic/source/sbx/sbxscan.cxx b/bf_basic/source/sbx/sbxscan.cxx
index daf3e8a1d..ff51433dd 100644
--- a/bf_basic/source/sbx/sbxscan.cxx
+++ b/bf_basic/source/sbx/sbxscan.cxx
@@ -465,10 +465,10 @@ static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt
     if( nLen > nWidth ) rRes += '%';
     else {
         nWidth -= nLen;
-        while( nWidth-- ) rRes += (xub_Unicode)cFill;
-        if( cPre ) rRes += (xub_Unicode)cPre;
+        while( nWidth-- ) rRes += (sal_Unicode)cFill;
+        if( cPre ) rRes += (sal_Unicode)cPre;
     }
-    rRes += (xub_Unicode*)&(cBuf[0]);
+    rRes += (sal_Unicode*)&(cBuf[0]);
     if( bTrail )
         rRes += bNeg ? '-' : ' ';
 
diff --git a/bf_basic/source/sbx/sbxsng.cxx b/bf_basic/source/sbx/sbxsng.cxx
index 69fa3297d..48c5b56b6 100644
--- a/bf_basic/source/sbx/sbxsng.cxx
+++ b/bf_basic/source/sbx/sbxsng.cxx
@@ -252,7 +252,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMINCHAR;
             }
-            *p->pChar = (xub_Unicode) n; break;
+            *p->pChar = (sal_Unicode) n; break;
         case SbxBYREF | SbxBYTE:
             if( n > SbxMAXBYTE )
             {
diff --git a/bf_basic/source/sbx/sbxuint.cxx b/bf_basic/source/sbx/sbxuint.cxx
index 5e08233b3..8c4c88323 100644
--- a/bf_basic/source/sbx/sbxuint.cxx
+++ b/bf_basic/source/sbx/sbxuint.cxx
@@ -279,7 +279,7 @@ start:
         }
 
         case SbxBYREF | SbxCHAR:
-            *p->pChar = (xub_Unicode) n; break;
+            *p->pChar = (sal_Unicode) n; break;
         case SbxBYREF | SbxBYTE:
             if( n > SbxMAXBYTE )
             {
diff --git a/bf_basic/source/sbx/sbxulng.cxx b/bf_basic/source/sbx/sbxulng.cxx
index 04da31bc0..89a2e8c06 100644
--- a/bf_basic/source/sbx/sbxulng.cxx
+++ b/bf_basic/source/sbx/sbxulng.cxx
@@ -256,7 +256,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXCHAR;
             }
-            *p->pChar = (xub_Unicode) n; break;
+            *p->pChar = (sal_Unicode) n; break;
         case SbxBYREF | SbxBYTE:
             if( n > SbxMAXBYTE )
             {
diff --git a/bf_basic/source/sbx/sbxvalue.cxx b/bf_basic/source/sbx/sbxvalue.cxx
index 1413d84f5..7b0278527 100644
--- a/bf_basic/source/sbx/sbxvalue.cxx
+++ b/bf_basic/source/sbx/sbxvalue.cxx
@@ -288,7 +288,7 @@ SbxValue::SbxValue( SbxDataType t, void* p ) : SbxBase()
         case SbxUSHORT:
         case SbxBOOL:       n |= SbxBYREF; aData.pUShort = (UINT16*) p; break;
         case SbxULONG:      n |= SbxBYREF; aData.pULong = (UINT32*) p; break;
-        case SbxCHAR:       n |= SbxBYREF; aData.pChar = (xub_Unicode*) p; break;
+        case SbxCHAR:       n |= SbxBYREF; aData.pChar = (sal_Unicode*) p; break;
         case SbxBYTE:       n |= SbxBYREF; aData.pByte = (BYTE*) p; break;
         case SbxINT:        n |= SbxBYREF; aData.pInt = (int*) p; break;
         case SbxOBJECT:
@@ -653,7 +653,7 @@ BOOL SbxValue::GetBool() const
 t SbxValue::g() const { SbxValues aRes(e); Get( aRes ); return aRes.m; }
 
 GET( GetByte,     SbxBYTE,       BYTE,             nByte )
-GET( GetChar,     SbxCHAR,       xub_Unicode,           nChar )
+GET( GetChar,     SbxCHAR,       sal_Unicode,           nChar )
 GET( GetCurrency, SbxCURRENCY,   SbxINT64,         nLong64 )
 GET( GetDate,     SbxDATE,       double,           nDouble )
 GET( GetDouble,   SbxDOUBLE,     double,           nDouble )
@@ -812,7 +812,7 @@ BOOL SbxValue::p( t n ) \
 { SbxValues aRes(e); aRes.m = n; Put( aRes ); return BOOL( !IsError() ); }
 
 PUT( PutByte,     SbxBYTE,       BYTE,             nByte )
-PUT( PutChar,     SbxCHAR,       xub_Unicode,      nChar )
+PUT( PutChar,     SbxCHAR,       sal_Unicode,      nChar )
 PUT( PutCurrency, SbxCURRENCY,   const SbxINT64&,  nLong64 )
 PUT( PutDate,     SbxDATE,       double,           nDouble )
 PUT( PutDouble,   SbxDOUBLE,     double,           nDouble )
diff --git a/bf_basic/source/sbx/sbxvar.cxx b/bf_basic/source/sbx/sbxvar.cxx
index d14c3246b..a7fb01e6d 100644
--- a/bf_basic/source/sbx/sbxvar.cxx
+++ b/bf_basic/source/sbx/sbxvar.cxx
@@ -153,7 +153,7 @@ const XubString& SbxVariable::GetName( SbxNameType t ) const
     if( !pInfo
      || ( !pInfo->aParams.Count() && GetClass() == SbxCLASS_PROPERTY ) )
         return maName;
-    xub_Unicode cType = ' ';
+    sal_Unicode cType = ' ';
     XubString aTmp( maName );
     // Kurzer Typ? Dann holen, evtl. ist dieser 0.
     SbxDataType et = GetType();
@@ -228,7 +228,7 @@ USHORT SbxVariable::MakeHashCode( const XubString& rName )
     USHORT nLen = rName.Len();
     if( nLen > 6 )
         nLen = 6;
-    const xub_Unicode* p = rName.GetBuffer();
+    const sal_Unicode* p = rName.GetBuffer();
     while( nLen-- )
     {
         BYTE c = (BYTE)*p;