diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-10-19 05:34:48 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-10-19 10:55:56 +0000 |
commit | 8eb5db89978547547510b2954918c9881eeecb52 (patch) | |
tree | a3b7bb76eb6b0aa6376fe54aa78d1ce8884a6f59 /basic | |
parent | Updated core (diff) | |
download | core-8eb5db89978547547510b2954918c9881eeecb52.tar.gz core-8eb5db89978547547510b2954918c9881eeecb52.zip |
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>
Diffstat (limited to 'basic')
-rw-r--r-- | basic/source/sbx/sbxbool.cxx | 4 | ||||
-rw-r--r-- | basic/source/sbx/sbxbyte.cxx | 4 | ||||
-rw-r--r-- | basic/source/sbx/sbxchar.cxx | 24 | ||||
-rw-r--r-- | basic/source/sbx/sbxdate.cxx | 2 | ||||
-rw-r--r-- | basic/source/sbx/sbxdbl.cxx | 2 | ||||
-rw-r--r-- | basic/source/sbx/sbxexec.cxx | 38 | ||||
-rw-r--r-- | basic/source/sbx/sbxint.cxx | 4 | ||||
-rw-r--r-- | basic/source/sbx/sbxlng.cxx | 2 | ||||
-rw-r--r-- | basic/source/sbx/sbxscan.cxx | 16 | ||||
-rw-r--r-- | basic/source/sbx/sbxsng.cxx | 2 | ||||
-rw-r--r-- | basic/source/sbx/sbxuint.cxx | 2 | ||||
-rw-r--r-- | basic/source/sbx/sbxulng.cxx | 2 | ||||
-rw-r--r-- | basic/source/sbx/sbxvalue.cxx | 2 | ||||
-rw-r--r-- | basic/source/sbx/sbxvar.cxx | 4 |
14 files changed, 54 insertions, 54 deletions
diff --git a/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx index c843f1689273..1716037b36ca 100644 --- a/basic/source/sbx/sbxbool.cxx +++ b/basic/source/sbx/sbxbool.cxx @@ -142,7 +142,7 @@ void ImpPutBool( SbxValues* p, sal_Int16 n ) switch( +p->eType ) { case SbxCHAR: - p->nChar = (xub_Unicode) n; break; + p->nChar = (sal_Unicode) n; break; case SbxUINT: p->nByte = (sal_uInt8) n; break; case SbxINTEGER: @@ -189,7 +189,7 @@ void ImpPutBool( SbxValues* p, sal_Int16 n ) break; } case SbxBYREF | SbxCHAR: - *p->pChar = (xub_Unicode) n; break; + *p->pChar = (sal_Unicode) n; break; case SbxBYREF | SbxBYTE: *p->pByte = (sal_uInt8) n; break; case SbxBYREF | SbxINTEGER: diff --git a/basic/source/sbx/sbxbyte.cxx b/basic/source/sbx/sbxbyte.cxx index c6310e647e09..bcfebdaaf97d 100644 --- a/basic/source/sbx/sbxbyte.cxx +++ b/basic/source/sbx/sbxbyte.cxx @@ -253,7 +253,7 @@ void ImpPutByte( SbxValues* p, sal_uInt8 n ) break; case SbxCHAR: - p->nChar = (xub_Unicode) n; break; + p->nChar = (sal_Unicode) n; break; case SbxBYREF | SbxSTRING: case SbxSTRING: @@ -272,7 +272,7 @@ void ImpPutByte( SbxValues* p, sal_uInt8 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/basic/source/sbx/sbxchar.cxx b/basic/source/sbx/sbxchar.cxx index b699246b44c5..6ab71a64524a 100644 --- a/basic/source/sbx/sbxchar.cxx +++ b/basic/source/sbx/sbxchar.cxx @@ -21,10 +21,10 @@ #include <basic/sbx.hxx> #include "sbxconv.hxx" -xub_Unicode ImpGetChar( const SbxValues* p ) +sal_Unicode ImpGetChar( const SbxValues* p ) { SbxValues aTmp; - xub_Unicode nRes = 0; + sal_Unicode nRes = 0; start: switch( +p->eType ) { @@ -35,7 +35,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: @@ -44,11 +44,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 ) @@ -60,7 +60,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 ) @@ -68,7 +68,7 @@ start: SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXCHAR; } else - nRes = (xub_Unicode) p->nULong; + nRes = (sal_Unicode) p->nULong; break; case SbxCURRENCY: case SbxSALINT64: @@ -87,7 +87,7 @@ start: SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINCHAR; } else - nRes = (xub_Unicode) val; + nRes = (sal_Unicode) val; break; } case SbxSALUINT64: @@ -96,7 +96,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 ) @@ -108,7 +108,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: @@ -155,7 +155,7 @@ start: SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINCHAR; } else - nRes = (xub_Unicode) ImpRound( d ); + nRes = (sal_Unicode) ImpRound( d ); } break; case SbxOBJECT: @@ -205,7 +205,7 @@ start: return nRes; } -void ImpPutChar( SbxValues* p, xub_Unicode n ) +void ImpPutChar( SbxValues* p, sal_Unicode n ) { SbxValues aTmp; start: diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx index f168437552bb..7c78518ffcf8 100644 --- a/basic/source/sbx/sbxdate.cxx +++ b/basic/source/sbx/sbxdate.cxx @@ -296,7 +296,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/basic/source/sbx/sbxdbl.cxx b/basic/source/sbx/sbxdbl.cxx index 5fa87d437686..4add26a22a8a 100644 --- a/basic/source/sbx/sbxdbl.cxx +++ b/basic/source/sbx/sbxdbl.cxx @@ -215,7 +215,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/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx index ef7952f97786..74cf3b2a21b6 100644 --- a/basic/source/sbx/sbxexec.cxx +++ b/basic/source/sbx/sbxexec.cxx @@ -46,10 +46,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++; @@ -59,7 +59,7 @@ static const xub_Unicode* SkipWhitespace( const xub_Unicode* p ) // Scanning of a symbol. The symbol were inserted in rSym, the return value // is the new scan position. The symbol is at errors empty. -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 ) { sal_uInt16 nLen = 0; // Did we have a nonstandard symbol? @@ -93,12 +93,12 @@ static const xub_Unicode* Symbol( const xub_Unicode* p, XubString& rSym, const S // Qualified 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 == '[' ) { // Read in the element @@ -131,12 +131,12 @@ static SbxVariable* QualifiedName // a function (with optional parameters). 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 == '-' @@ -178,14 +178,14 @@ static SbxVariable* Operand // Read in of a simple term. The operands +, -, * and / // are supported. -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() ) { @@ -210,14 +210,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() ) { @@ -242,9 +242,9 @@ static SbxVariable* PlusMinus( SbxObject* pObj, SbxObject* pGbl, const xub_Unico return refVar; } -static SbxVariable* Assign( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf ) +static SbxVariable* Assign( SbxObject* pObj, SbxObject* pGbl, const sal_Unicode** ppBuf ) { - const xub_Unicode* p = *ppBuf; + const sal_Unicode* p = *ppBuf; SbxVariableRef refVar( Operand( pObj, pGbl, &p, true ) ); p = SkipWhitespace( p ); if( refVar.Is() ) @@ -285,11 +285,11 @@ static SbxVariable* Assign( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode* // specified object and the parameter list will be attached if necessary. 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() ) { @@ -351,7 +351,7 @@ static SbxVariable* Element SbxVariable* SbxObject::Execute( const XubString& rTxt ) { SbxVariable* pVar = NULL; - const xub_Unicode* p = rTxt.GetBuffer(); + const sal_Unicode* p = rTxt.GetBuffer(); for( ;; ) { p = SkipWhitespace( p ); @@ -376,7 +376,7 @@ SbxVariable* SbxObject::Execute( const XubString& rTxt ) 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/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx index 4966d24e1837..61b601e3aec8 100644 --- a/basic/source/sbx/sbxint.cxx +++ b/basic/source/sbx/sbxint.cxx @@ -566,7 +566,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 ) { @@ -840,7 +840,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/basic/source/sbx/sbxlng.cxx b/basic/source/sbx/sbxlng.cxx index 00613d25737a..90cf5f9e0038 100644 --- a/basic/source/sbx/sbxlng.cxx +++ b/basic/source/sbx/sbxlng.cxx @@ -246,7 +246,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/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index 7ea06b5e4fb5..c6f4d32f7dae 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -545,10 +545,10 @@ static sal_uInt16 printfmtnum( double nNum, XubString& rRes, const XubString& rW 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 ? '-' : ' '; @@ -559,9 +559,9 @@ static sal_uInt16 printfmtnum( double nNum, XubString& rRes, const XubString& rW static sal_uInt16 printfmtstr( const XubString& rStr, XubString& rRes, const XubString& rFmt ) { - const xub_Unicode* pStr = rStr.GetBuffer(); - const xub_Unicode* pFmtStart = rFmt.GetBuffer(); - const xub_Unicode* pFmt = pFmtStart; + const sal_Unicode* pStr = rStr.GetBuffer(); + const sal_Unicode* pFmtStart = rFmt.GetBuffer(); + const sal_Unicode* pFmt = pFmtStart; rRes.Erase(); switch( *pFmt ) { @@ -570,10 +570,10 @@ static sal_uInt16 printfmtstr( const XubString& rStr, XubString& rRes, const Xub case '\\': do { - rRes += *pStr ? *pStr++ : static_cast< xub_Unicode >(' '); + rRes += *pStr ? *pStr++ : static_cast< sal_Unicode >(' '); pFmt++; } while( *pFmt != '\\' ); - rRes += *pStr ? *pStr++ : static_cast< xub_Unicode >(' '); + rRes += *pStr ? *pStr++ : static_cast< sal_Unicode >(' '); pFmt++; break; case '&': rRes = rStr; diff --git a/basic/source/sbx/sbxsng.cxx b/basic/source/sbx/sbxsng.cxx index 0c88aa5bfb2c..f48d185e2829 100644 --- a/basic/source/sbx/sbxsng.cxx +++ b/basic/source/sbx/sbxsng.cxx @@ -239,7 +239,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/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx index 41710f911400..d9080c760069 100644 --- a/basic/source/sbx/sbxuint.cxx +++ b/basic/source/sbx/sbxuint.cxx @@ -272,7 +272,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/basic/source/sbx/sbxulng.cxx b/basic/source/sbx/sbxulng.cxx index acbf6336c4e9..53b8958221c6 100644 --- a/basic/source/sbx/sbxulng.cxx +++ b/basic/source/sbx/sbxulng.cxx @@ -240,7 +240,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/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 5d7f5179ad6c..50ff641af158 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -452,7 +452,7 @@ sal_Bool SbxValue::GetBool() const t SbxValue::g() const { SbxValues aRes(e); Get( aRes ); return aRes.m; } GET( GetByte, SbxBYTE, sal_uInt8, nByte ) -GET( GetChar, SbxCHAR, xub_Unicode, nChar ) +GET( GetChar, SbxCHAR, sal_Unicode, nChar ) GET( GetCurrency, SbxCURRENCY, sal_Int64, nInt64 ) GET( GetDate, SbxDATE, double, nDouble ) GET( GetDouble, SbxDOUBLE, double, nDouble ) diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 60e344840f42..9c8d13f10cce 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -230,7 +230,7 @@ const XubString& SbxVariable::GetName( SbxNameType t ) const if( !pInfo || ( pInfo->aParams.empty() && GetClass() == SbxCLASS_PROPERTY ) ) return maName; - xub_Unicode cType = ' '; + sal_Unicode cType = ' '; XubString aTmp( maName ); // short type? Then fetch it, posible this is 0. SbxDataType et = GetType(); @@ -304,7 +304,7 @@ sal_uInt16 SbxVariable::MakeHashCode( const XubString& rName ) sal_uInt16 nLen = rName.Len(); if( nLen > 6 ) nLen = 6; - const xub_Unicode* p = rName.GetBuffer(); + const sal_Unicode* p = rName.GetBuffer(); while( nLen-- ) { sal_uInt8 c = (sal_uInt8)*p; |