[Libreoffice-commits] .: accessibility/source basic/source cppcanvas/source editeng/source extensions/source starmath/inc starmath/source svtools/inc svtools/source svx/source sw/source unotools/source vcl/inc vcl/source vcl/win
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Oct 19 03:56:44 PDT 2012
accessibility/source/standard/vclxaccessibleedit.cxx | 2 -
basic/source/sbx/sbxbool.cxx | 4 +-
basic/source/sbx/sbxbyte.cxx | 4 +-
basic/source/sbx/sbxchar.cxx | 24 ++++++------
basic/source/sbx/sbxdate.cxx | 2 -
basic/source/sbx/sbxdbl.cxx | 2 -
basic/source/sbx/sbxexec.cxx | 38 +++++++++----------
basic/source/sbx/sbxint.cxx | 4 +-
basic/source/sbx/sbxlng.cxx | 2 -
basic/source/sbx/sbxscan.cxx | 16 ++++----
basic/source/sbx/sbxsng.cxx | 2 -
basic/source/sbx/sbxuint.cxx | 2 -
basic/source/sbx/sbxulng.cxx | 2 -
basic/source/sbx/sbxvalue.cxx | 2 -
basic/source/sbx/sbxvar.cxx | 4 +-
cppcanvas/source/mtfrenderer/implrenderer.cxx | 2 -
editeng/source/editeng/editdoc.cxx | 2 -
editeng/source/editeng/editeng.cxx | 2 -
editeng/source/editeng/impedit.hxx | 2 -
editeng/source/editeng/impedit2.cxx | 4 +-
editeng/source/editeng/impedit3.cxx | 12 +++---
editeng/source/outliner/outliner.cxx | 2 -
extensions/source/bibliography/general.cxx | 2 -
starmath/inc/dialog.hxx | 2 -
starmath/inc/node.hxx | 4 +-
starmath/source/dialog.cxx | 2 -
starmath/source/node.cxx | 6 +--
starmath/source/rect.cxx | 22 +++++------
svtools/inc/svtools/ctrlbox.hxx | 4 +-
svtools/inc/svtools/svtabbx.hxx | 2 -
svtools/source/contnr/fileview.cxx | 4 +-
svtools/source/contnr/svtabbx.cxx | 12 +++---
svtools/source/control/ctrlbox.cxx | 6 +--
svx/source/dialog/ctredlin.cxx | 6 +--
sw/source/core/bastyp/calc.cxx | 2 -
sw/source/core/edit/edlingu.cxx | 2 -
sw/source/core/inc/scriptinfo.hxx | 2 -
sw/source/core/inc/swfont.hxx | 10 ++---
sw/source/core/text/frminf.cxx | 6 +--
sw/source/core/text/guess.cxx | 4 +-
sw/source/core/text/inftxt.cxx | 10 ++---
sw/source/core/text/inftxt.hxx | 14 +++----
sw/source/core/text/itratr.cxx | 4 +-
sw/source/core/text/itrform2.cxx | 4 +-
sw/source/core/text/porexp.cxx | 4 +-
sw/source/core/text/porexp.hxx | 4 +-
sw/source/core/text/porfld.cxx | 2 -
sw/source/core/text/porfld.hxx | 2 -
sw/source/core/text/porglue.cxx | 2 -
sw/source/core/text/porlay.cxx | 22 +++++------
sw/source/core/text/portab.hxx | 22 +++++------
sw/source/core/text/txtdrop.cxx | 2 -
sw/source/core/text/txtfrm.cxx | 2 -
sw/source/core/text/txttab.cxx | 6 +--
sw/source/core/txtnode/fntcache.cxx | 16 ++++----
sw/source/core/txtnode/ndtxt.cxx | 2 -
sw/source/core/txtnode/txtedt.cxx | 4 +-
sw/source/ui/ribbar/inputwin.cxx | 4 +-
unotools/source/config/fontcfg.cxx | 8 ++--
vcl/inc/sallayout.hxx | 4 +-
vcl/inc/vcl/combobox.hxx | 10 ++---
vcl/inc/vcl/edit.hxx | 6 +--
vcl/inc/vcl/event.hxx | 8 ++--
vcl/source/app/dbggui.cxx | 2 -
vcl/source/control/combobox.cxx | 6 +--
vcl/source/control/edit.cxx | 6 +--
vcl/source/control/field.cxx | 4 +-
vcl/source/control/field2.cxx | 20 +++++-----
vcl/source/control/ilstbox.cxx | 2 -
vcl/source/control/quickselectionengine.cxx | 2 -
vcl/source/edit/textdoc.cxx | 4 +-
vcl/source/edit/textview.cxx | 4 +-
vcl/source/edit/xtextedt.cxx | 4 +-
vcl/source/gdi/outdev3.cxx | 12 +++---
vcl/source/gdi/sallayout.cxx | 2 -
vcl/source/glyphs/graphite_layout.cxx | 2 -
vcl/source/window/dlgctrl.cxx | 6 +--
vcl/source/window/menu.cxx | 14 +++----
vcl/source/window/winproc.cxx | 6 +--
vcl/win/source/gdi/salgdi3.cxx | 2 -
vcl/win/source/window/salframe.cxx | 8 ++--
81 files changed, 251 insertions(+), 251 deletions(-)
New commits:
commit 8eb5db89978547547510b2954918c9881eeecb52
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Oct 19 05:34:48 2012 -0500
replace sxub_Unicode by sal_Unicode
Change-Id: Icf4b434a1961cc4964ee6e362491868e898a1831
Reviewed-on: https://gerrit.libreoffice.org/887
Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index 60b8414..20e4c86 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -143,7 +143,7 @@ OUString VCLXAccessibleEdit::implGetText()
if ( getAccessibleRole() == AccessibleRole::PASSWORD_TEXT )
{
- xub_Unicode cEchoChar = pEdit->GetEchoChar();
+ sal_Unicode cEchoChar = pEdit->GetEchoChar();
if ( !cEchoChar )
cEchoChar = '*';
OUStringBuffer sTmp;
diff --git a/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx
index c843f16..1716037 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 c6310e6..bcfebda 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 b699246..6ab71a6 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 f168437..7c78518 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 5fa87d4..4add26a 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 ef7952f..74cf3b2 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 4966d24..61b601e 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 00613d2..90cf5f9 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 7ea06b5..c6f4d32 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 0c88aa5..f48d185 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 41710f9..d9080c7 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 acbf633..53b8958 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 5d7f517..50ff641 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 60e3448..9c8d13f 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;
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index b257dd6..298be37 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1045,7 +1045,7 @@ namespace cppcanvas
{
long nWidth = rParms.mrVDev.GetTextWidth( rString,nIndex,nLength );
- xub_Unicode pChars[4];
+ sal_Unicode pChars[4];
if ( rState.textStrikeoutStyle == STRIKEOUT_X )
pChars[0] = 'X';
else
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 560d7ca..8b03496 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2062,7 +2062,7 @@ XubString EditDoc::GetText( LineEnd eEnd ) const
nLen += (nNodes - 1) * nSepSize;
rtl_uString* newStr = comphelper::string::rtl_uString_alloc(nLen);
- xub_Unicode* pCur = newStr->buffer;
+ sal_Unicode* pCur = newStr->buffer;
size_t nLastNode = nNodes-1;
for ( sal_uInt16 nNode = 0; nNode < nNodes; nNode++ )
{
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 258e8a5..5b691c2 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1341,7 +1341,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
#endif
if ( !bReadOnly && IsSimpleCharInput( rKeyEvent ) )
{
- xub_Unicode nCharCode = rKeyEvent.GetCharCode();
+ sal_Unicode nCharCode = rKeyEvent.GetCharCode();
pEditView->pImpEditView->DrawSelection();
// Autocorrection?
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 750b470..4f3f5f5 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -1179,7 +1179,7 @@ inline Cursor* ImpEditView::GetCursor()
void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit );
void ConvertAndPutItems( SfxItemSet& rDest, const SfxItemSet& rSource, const MapUnit* pSourceUnit = NULL, const MapUnit* pDestUnit = NULL );
-sal_uInt8 GetCharTypeForCompression( xub_Unicode cChar );
+sal_uInt8 GetCharTypeForCompression( sal_Unicode cChar );
Point Rotate( const Point& rPoint, short nOrientation, const Point& rOrigin );
#endif // _IMPEDIT_HXX
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 0249020..233f9c1 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2527,7 +2527,7 @@ void ImpEditEngine::ImpRemoveParagraph( sal_uInt16 nPara )
}
}
-EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c,
+EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, sal_Unicode c,
sal_Bool bOverwrite, Window* pFrameWin )
{
EditSelection aSel( rCurSel );
@@ -2590,7 +2590,7 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c,
EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel,
- xub_Unicode c, sal_Bool bOverwrite, sal_Bool bIsUserInput )
+ sal_Unicode c, sal_Bool bOverwrite, sal_Bool bIsUserInput )
{
OSL_ENSURE( c != '\t', "Tab for InsertText ?" );
OSL_ENSURE( c != '\n', "Word wrapping for InsertText ?");
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 2e00179..57ae2ea 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -128,7 +128,7 @@ Point Rotate( const Point& rPoint, short nOrientation, const Point& rOrigin )
return aTranslatedPos;
}
-sal_uInt8 GetCharTypeForCompression( xub_Unicode cChar )
+sal_uInt8 GetCharTypeForCompression( sal_Unicode cChar )
{
switch ( cChar )
{
@@ -254,7 +254,7 @@ static Point lcl_ImplCalcRotatedPos( Point rPos, Point rOrigin, double nSin, dou
return aTranslatedPos;
}
-static sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode cNextCh ) // For Kashidas from sw/source/core/text/porlay.txt
+static sal_Bool lcl_IsLigature( sal_Unicode cCh, sal_Unicode cNextCh ) // For Kashidas from sw/source/core/text/porlay.txt
{
// Lam + Alef
return ( 0x644 == cCh && 0x627 == cNextCh ) ||
@@ -262,7 +262,7 @@ static sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode cNextCh ) // For Ka
( 0x628 == cCh && 0x631 == cNextCh );
}
-static sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode cPrevCh ) // For Kashidas from sw/source/core/text/porlay.txt
+static sal_Bool lcl_ConnectToPrev( sal_Unicode cCh, sal_Unicode cPrevCh ) // For Kashidas from sw/source/core/text/porlay.txt
{
// Alef, Dal, Thal, Reh, Zain, and Waw do not connect to the left
sal_Bool bRet = 0x627 != cPrevCh && 0x62F != cPrevCh && 0x630 != cPrevCh &&
@@ -2128,8 +2128,8 @@ void ImpEditEngine::ImpFindKashidas( ContentNode* pNode, sal_uInt16 nStart, sal_
xub_StrLen nIdx = 0;
xub_StrLen nKashidaPos = STRING_LEN;
- xub_Unicode cCh;
- xub_Unicode cPrevCh = 0;
+ sal_Unicode cCh;
+ sal_Unicode cPrevCh = 0;
while ( nIdx < aWord.Len() )
{
@@ -2177,7 +2177,7 @@ void ImpEditEngine::ImpFindKashidas( ContentNode* pNode, sal_uInt16 nStart, sal_
DBG_ASSERT( 0 != cPrevCh, "No previous character" );
// check if next character is Reh, Yeh or Alef Maksura
- xub_Unicode cNextCh = aWord.GetChar( nIdx + 1 );
+ sal_Unicode cNextCh = aWord.GetChar( nIdx + 1 );
if ( 0x631 == cNextCh || 0x64A == cNextCh ||
0x649 == cNextCh )
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index b45373c..51eb8b7 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -486,7 +486,7 @@ bool Outliner::ImpConvertEdtToOut( sal_uInt32 nPara,EditView* pView)
XubString aNumber_US( RTL_CONSTASCII_USTRINGPARAM( "Numbering" ) );
XubString aStr( pEditEngine->GetText( (sal_uInt16)nPara ) );
- xub_Unicode* pPtr = (xub_Unicode*)aStr.GetBuffer();
+ sal_Unicode* pPtr = (sal_Unicode*)aStr.GetBuffer();
sal_uInt16 nHeadingNumberStart = 0;
sal_uInt16 nNumberingNumberStart = 0;
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index eccb955..b0fbc3b 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -810,7 +810,7 @@ sal_Bool BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent )
DBG_ASSERT( KEY_MOD2 == rKeyEvent.GetKeyCode().GetModifier(), "+BibGeneralPage::HandleShortCutKey(): this is not for me!" );
const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
- const xub_Unicode c = rKeyEvent.GetCharCode();
+ const sal_Unicode c = rKeyEvent.GetCharCode();
sal_Bool bHandled = sal_False;
sal_Int16 i;
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 6636ad0..51782f0 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -514,7 +514,7 @@ public:
bool SelectFont(const OUString &rFontName) { return SelectFont(rFontName, true); }
bool SelectStyle(const OUString &rStyleName) { return SelectStyle(rStyleName, true); };
- void SelectChar(xub_Unicode cChar);
+ void SelectChar(sal_Unicode cChar);
};
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 45c9669..eb706dd 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -561,8 +561,8 @@ protected:
SmMathSymbolNode(SmNodeType eNodeType, const SmToken &rNodeToken)
: SmSpecialNode(eNodeType, rNodeToken, FNT_MATH)
{
- xub_Unicode cChar = GetToken().cMathChar;
- if ((xub_Unicode) '\0' != cChar)
+ sal_Unicode cChar = GetToken().cMathChar;
+ if ((sal_Unicode) '\0' != cChar)
SetText(rtl::OUString(cChar));
}
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 82a0e72..9561087 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -2485,7 +2485,7 @@ bool SmSymDefineDialog::SelectStyle(const OUString &rStyleName, bool bApplyFont)
}
-void SmSymDefineDialog::SelectChar(xub_Unicode cChar)
+void SmSymDefineDialog::SelectChar(sal_Unicode cChar)
{
aCharsetDisplay.SelectCharacter( cChar );
aSymbolDisplay.SetSymbol( cChar, aCharsetDisplay.GetFont() );
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 972f725..fc86c6e 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -1750,7 +1750,7 @@ void SmBraceNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
aTmpSize.Width() *= 182;
aTmpSize.Width() /= 267;
- xub_Unicode cChar = pLeft->GetToken().cMathChar;
+ sal_Unicode cChar = pLeft->GetToken().cMathChar;
if (cChar != MS_LINE && cChar != MS_DLINE)
pLeft ->GetFont().SetSize(aTmpSize);
@@ -2651,8 +2651,8 @@ SmNode * SmMatrixNode::GetLeftMost()
SmMathSymbolNode::SmMathSymbolNode(const SmToken &rNodeToken)
: SmSpecialNode(NMATH, rNodeToken, FNT_MATH)
{
- xub_Unicode cChar = GetToken().cMathChar;
- if ((xub_Unicode) '\0' != cChar)
+ sal_Unicode cChar = GetToken().cMathChar;
+ if ((sal_Unicode) '\0' != cChar)
SetText(rtl::OUString(cChar));
}
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index fc93660..31cf876 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -35,17 +35,17 @@
// '\0' terminated Array with symbol, which should be treat as letters in
// StarMath Font, (to get a normal (non-clipped) SmRect in contrast to the
// other operators and symbols).
-static xub_Unicode const aMathAlpha[] =
+static sal_Unicode const aMathAlpha[] =
{
MS_ALEPH, MS_IM, MS_RE,
- MS_WP, xub_Unicode(0xE070), MS_EMPTYSET,
- xub_Unicode(0x2113), xub_Unicode(0xE0D6), xub_Unicode(0x2107),
- xub_Unicode(0x2127), xub_Unicode(0x210A), MS_HBAR,
+ MS_WP, sal_Unicode(0xE070), MS_EMPTYSET,
+ sal_Unicode(0x2113), sal_Unicode(0xE0D6), sal_Unicode(0x2107),
+ sal_Unicode(0x2127), sal_Unicode(0x210A), MS_HBAR,
MS_LAMBDABAR, MS_SETN, MS_SETZ,
MS_SETQ, MS_SETR, MS_SETC,
- xub_Unicode(0x2373), xub_Unicode(0xE0A5), xub_Unicode(0x2112),
- xub_Unicode(0x2130), xub_Unicode(0x2131),
- xub_Unicode('\0')
+ sal_Unicode(0x2373), sal_Unicode(0xE0A5), sal_Unicode(0x2112),
+ sal_Unicode(0x2130), sal_Unicode(0x2131),
+ sal_Unicode('\0')
};
bool SmIsMathAlpha(const rtl::OUString &rText)
@@ -55,18 +55,18 @@ bool SmIsMathAlpha(const rtl::OUString &rText)
return false;
OSL_ENSURE(rText.getLength() == 1, "Sm : string must be exactly one character long");
- xub_Unicode cChar = rText[0];
+ sal_Unicode cChar = rText[0];
// is it a greek symbol?
- if (xub_Unicode(0xE0AC) <= cChar && cChar <= xub_Unicode(0xE0D4))
+ if (sal_Unicode(0xE0AC) <= cChar && cChar <= sal_Unicode(0xE0D4))
return true;
else
{
// appears it in 'aMathAlpha'?
- const xub_Unicode *pChar = aMathAlpha;
+ const sal_Unicode *pChar = aMathAlpha;
while (*pChar && *pChar != cChar)
pChar++;
- return *pChar != xub_Unicode('\0');
+ return *pChar != sal_Unicode('\0');
}
}
diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 77962c3..169ce09 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 d219b93..a10fb4c 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 7e9c895..212e581 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 64a1bd8..d9f0c55 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 b3a095d..6196400 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 != '%') )
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 99d3a08..aad70d4 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -462,9 +462,9 @@ void SvxRedlinTable::InitEntry( SvTreeListEntry* pEntry, const XubString& rStr,
XubString aToken;
- xub_Unicode* pCurToken = (xub_Unicode*)aCurEntry.GetBuffer();
+ sal_Unicode* pCurToken = (sal_Unicode*)aCurEntry.GetBuffer();
sal_uInt16 nCurTokenLen;
- xub_Unicode* pNextToken = (xub_Unicode*)GetToken( pCurToken, nCurTokenLen );
+ sal_Unicode* pNextToken = (sal_Unicode*)GetToken( pCurToken, nCurTokenLen );
sal_uInt16 nCount = TabCount(); nCount--;
for( sal_uInt16 nToken = 0; nToken < nCount; nToken++ )
@@ -479,7 +479,7 @@ void SvxRedlinTable::InitEntry( SvTreeListEntry* pEntry, const XubString& rStr,
pCurToken = pNextToken;
if( pCurToken )
- pNextToken = (xub_Unicode*)GetToken( pCurToken, nCurTokenLen );
+ pNextToken = (sal_Unicode*)GetToken( pCurToken, nCurTokenLen );
else
nCurTokenLen = 0;
}
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 450d290..65c3eac 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -1507,7 +1507,7 @@ namespace
const LocaleDataWrapper* const pLclData )
{
OSL_ASSERT(pLclData);
- const xub_Unicode nCurrCmdPos = rCommandPos;
+ const sal_Unicode nCurrCmdPos = rCommandPos;
rtl_math_ConversionStatus eStatus;
const sal_Unicode* pEnd;
rVal = rtl_math_uStringToDouble( rCommand.GetBuffer() + rCommandPos,
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index f986e75..9c9c370 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -1820,7 +1820,7 @@ void SwSpellIter::AddPortion(uno::Reference< XSpellAlternatives > xAlt,
bool bField = false;
//read the character at the current position to check if it's a field
- xub_Unicode cChar = pTxtNode->GetTxt().GetChar( pCrsr->GetMark()->nContent.GetIndex() );
+ sal_Unicode cChar = pTxtNode->GetTxt().GetChar( pCrsr->GetMark()->nContent.GetIndex() );
if( CH_TXTATR_BREAKWORD == cChar || CH_TXTATR_INWORD == cChar)
{
const SwTxtAttr* pTxtAttr = pTxtNode->GetTxtAttrForCharAt(
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index df22ffa..20398b4 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -202,7 +202,7 @@ public:
*/
static sal_uInt16 MaskHiddenRanges( const SwTxtNode& rNode, XubString& rText,
const xub_StrLen nStt, const xub_StrLen nEnd,
- const xub_Unicode cChar );
+ const sal_Unicode cChar );
/** Hidden text attribute handling
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 4bcb98f..8379a35 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -43,11 +43,11 @@ class SwScriptInfo; // _GetTxtSize
class ViewShell;
class IDocumentSettingAccess;
-const xub_Unicode CH_BLANK = ' '; // ' ' Leerzeichen
-const xub_Unicode CH_BREAK = 0x0A; //
-const xub_Unicode CH_TAB = '\t'; // \t
-const xub_Unicode CH_PAR = 0xB6; // Paragraph
-const xub_Unicode CH_BULLET = 0xB7; // mittiger Punkt
+const sal_Unicode CH_BLANK = ' '; // ' ' Leerzeichen
+const sal_Unicode CH_BREAK = 0x0A; //
+const sal_Unicode CH_TAB = '\t'; // \t
+const sal_Unicode CH_PAR = 0xB6; // Paragraph
+const sal_Unicode CH_BULLET = 0xB7; // mittiger Punkt
class SwSubFont : public SvxFont
{
diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx
index 36f7336..65e8872 100644
--- a/sw/source/core/text/frminf.cxx
+++ b/sw/source/core/text/frminf.cxx
@@ -43,7 +43,7 @@ xub_StrLen SwTxtMargin::GetTxtStart() const
for( i = nTmpPos; i < nEnd; ++i )
{
- const xub_Unicode aChar = rTxt.GetChar( i );
+ const sal_Unicode aChar = rTxt.GetChar( i );
if( CH_TAB != aChar && ' ' != aChar )
return i;
}
@@ -62,7 +62,7 @@ xub_StrLen SwTxtMargin::GetTxtEnd() const
long i;
for( i = nEnd - 1; i >= nTmpPos; --i )
{
- xub_Unicode aChar = rTxt.GetChar( static_cast<xub_StrLen>(i) );
+ sal_Unicode aChar = rTxt.GetChar( static_cast<xub_StrLen>(i) );
if( CH_TAB != aChar && CH_BREAK != aChar && ' ' != aChar )
return static_cast<xub_StrLen>(i + 1);
}
@@ -347,7 +347,7 @@ KSHORT SwTxtFrmInfo::GetBigIndent( xub_StrLen& rFndPos,
// Is on front of a non-space
const XubString& rTxt = aInf.GetTxt();
- xub_Unicode aChar = rTxt.GetChar( rFndPos );
+ sal_Unicode aChar = rTxt.GetChar( rFndPos );
if( CH_TAB == aChar || CH_BREAK == aChar || ' ' == aChar ||
(( CH_TXTATR_BREAKWORD == aChar || CH_TXTATR_INWORD == aChar ) &&
aInf.HasHint( rFndPos ) ) )
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index b7545c8..161d5e9 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -217,7 +217,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
xub_StrLen nPorLen = 0;
// do not call the break iterator nCutPos is a blank
- xub_Unicode cCutChar = rInf.GetTxt().GetChar( nCutPos );
+ sal_Unicode cCutChar = rInf.GetTxt().GetChar( nCutPos );
if( CH_BLANK == cCutChar || CH_FULL_BLANK == cCutChar )
{
nBreakPos = nCutPos;
@@ -258,7 +258,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
// the field portion, we trigger an underflow.
xub_StrLen nOldIdx = rInf.GetIdx();
- xub_Unicode cFldChr = 0;
+ sal_Unicode cFldChr = 0;
#if OSL_DEBUG_LEVEL > 0
XubString aDebugString;
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 32bb3ab..e070151 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1482,17 +1482,17 @@ xub_StrLen SwTxtFormatInfo::ScanPortionEnd( const xub_StrLen nStart,
//
// Used for decimal tab handling:
//
- const xub_Unicode cTabDec = GetLastTab() ? (sal_Unicode)GetTabDecimal() : 0;
- const xub_Unicode cThousandSep = ',' == cTabDec ? '.' : ',';
+ const sal_Unicode cTabDec = GetLastTab() ? (sal_Unicode)GetTabDecimal() : 0;
+ const sal_Unicode cThousandSep = ',' == cTabDec ? '.' : ',';
// #i45951# German (Switzerland) uses ' as thousand separator
- const xub_Unicode cThousandSep2 = ',' == cTabDec ? '.' : '\'';
+ const sal_Unicode cThousandSep2 = ',' == cTabDec ? '.' : '\'';
bool bNumFound = false;
const bool bTabCompat = GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TAB_COMPAT);
for( ; i < nEnd; ++i )
{
- const xub_Unicode cPos = GetChar( i );
+ const sal_Unicode cPos = GetChar( i );
switch( cPos )
{
case CH_TXTATR_BREAKWORD:
@@ -1558,7 +1558,7 @@ xub_StrLen SwTxtFormatInfo::ScanPortionEnd( const xub_StrLen nStart,
// to become the hook:
if ( i == nEnd && i < GetTxt().Len() && bNumFound )
{
- const xub_Unicode cPos = GetChar( i );
+ const sal_Unicode cPos = GetChar( i );
if ( cPos != cTabDec && cPos != cThousandSep && cPos !=cThousandSep2 && ( 0x2F >= cPos || cPos >= 0x3A ) )
{
cHookChar = GetChar( i );
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index a975d04..c4cb8d7 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -273,7 +273,7 @@ public:
inline const SwViewOption &GetOpt() const { return *pOpt; }
inline const XubString &GetTxt() const { return *pTxt; }
- inline xub_Unicode GetChar( const xub_StrLen nPos ) const
+ inline sal_Unicode GetChar( const xub_StrLen nPos ) const
{ return pTxt->GetChar( nPos ); }
inline KSHORT GetTxtHeight() const;
@@ -553,8 +553,8 @@ class SwTxtFormatInfo : public SwTxtPaintInfo
// the beginning of a line
sal_Bool bTabOverflow; // Tabs are expanding after the end margin
- xub_Unicode cTabDecimal; // the current decimal delimiter
- xub_Unicode cHookChar; // For tabs in fields etc.
+ sal_Unicode cTabDecimal; // the current decimal delimiter
+ sal_Unicode cHookChar; // For tabs in fields etc.
sal_uInt8 nMaxHyph; // Max. line count of followup hyphenations
sal_Bool bTestFormat; // Test formatting from WouldFit, no notification etc.
@@ -660,16 +660,16 @@ public:
// Tabs
inline SwTabPortion *GetLastTab() { return pLastTab; }
inline void SetLastTab( SwTabPortion *pNew ) { pLastTab = pNew; }
- inline xub_Unicode GetTabDecimal() const { return cTabDecimal; }
- inline void SetTabDecimal( const xub_Unicode cNew ) { cTabDecimal = cNew;}
+ inline sal_Unicode GetTabDecimal() const { return cTabDecimal; }
+ inline void SetTabDecimal( const sal_Unicode cNew ) { cTabDecimal = cNew;}
// Last*
inline SwFldPortion *GetLastFld() { return pLastFld; }
inline void SetLastFld( SwFldPortion *pNew ) { pLastFld = pNew; }
inline void ClearHookChar() { cHookChar = 0; }
- inline void SetHookChar( const xub_Unicode cNew ) { cHookChar = cNew; }
- inline xub_Unicode GetHookChar() const { return cHookChar; }
+ inline void SetHookChar( const sal_Unicode cNew ) { cHookChar = cNew; }
+ inline sal_Unicode GetHookChar() const { return cHookChar; }
// Done-Flags
inline sal_Bool IsFtnDone() const { return bFtnDone; }
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index bc043b7..48b99f4 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -643,7 +643,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
if( nNextChg > nStop )
nNextChg = nStop;
SwTxtAttr *pHint = NULL;
- xub_Unicode cChar = CH_BLANK;
+ sal_Unicode cChar = CH_BLANK;
nStop = nIdx;
while( nStop < nLen && nStop < nNextChg &&
CH_TAB != ( cChar = m_Text.GetChar( nStop ) ) &&
@@ -890,7 +890,7 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd
nNextChg = nStop;
nStop = nIdx;
- xub_Unicode cChar = CH_BLANK;
+ sal_Unicode cChar = CH_BLANK;
SwTxtAttr* pHint = NULL;
// stop at special characters in [ nIdx, nNextChg ]
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 763f459..22c087f 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1271,7 +1271,7 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
}
}
// 5010: Tabs und Felder
- xub_Unicode cChar = rInf.GetHookChar();
+ sal_Unicode cChar = rInf.GetHookChar();
if( cChar )
{
@@ -1990,7 +1990,7 @@ sal_Bool SwTxtFormatter::AllowRepaintOpt() const
const xub_StrLen nReformat = GetInfo().GetReformatStart();
if( bOptimizeRepaint && STRING_LEN != nReformat )
{
- const xub_Unicode cCh = GetInfo().GetTxt().GetChar( nReformat );
+ const sal_Unicode cCh = GetInfo().GetTxt().GetChar( nReformat );
bOptimizeRepaint = ( CH_TXTATR_BREAKWORD != cCh && CH_TXTATR_INWORD != cCh )
|| ! GetInfo().HasHint( nReformat );
}
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 3624ec0..5973102 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -156,7 +156,7 @@ MSHORT SwBlankPortion::MayUnderFlow( const SwTxtFormatInfo &rInf,
xub_StrLen nBlank = nIdx;
while( --nBlank > rInf.GetLineStart() )
{
- const xub_Unicode cCh = rInf.GetChar( nBlank );
+ const sal_Unicode cCh = rInf.GetChar( nBlank );
if( CH_BLANK == cCh ||
(( CH_TXTATR_BREAKWORD == cCh || CH_TXTATR_INWORD == cCh )
&& rInf.HasHint( nBlank ) ) )
@@ -166,7 +166,7 @@ MSHORT SwBlankPortion::MayUnderFlow( const SwTxtFormatInfo &rInf,
return 0;
}
}
- xub_Unicode cCh;
+ sal_Unicode cCh;
if( nIdx < 2 || CH_BLANK == (cCh = rInf.GetChar( nIdx - 1 )) )
return 1;
if( CH_BREAK == cCh )
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index 087c610..b5a9add 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -49,10 +49,10 @@ public:
class SwBlankPortion : public SwExpandPortion
{
- xub_Unicode cChar;
+ sal_Unicode cChar;
sal_Bool bMulti; // For multiportion brackets
public:
- inline SwBlankPortion( xub_Unicode cCh, sal_Bool bMult = sal_False )
+ inline SwBlankPortion( sal_Unicode cCh, sal_Bool bMult = sal_False )
: cChar( cCh ), bMulti( bMult )
{ cChar = cCh; SetLen(1); SetWhichPor( POR_BLANK ); }
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 4ef411d..387602a 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -780,7 +780,7 @@ static sal_Char const sDoubleSpace[] = " ";
* class SwBulletPortion
*************************************************************************/
-SwBulletPortion::SwBulletPortion( const xub_Unicode cBullet,
+SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet,
const XubString& rBulletFollowedBy,
SwFont *pFont,
const sal_Bool bLft,
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 32198e7..cdccfa4 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -174,7 +174,7 @@ public:
class SwBulletPortion : public SwNumberPortion
{
public:
- SwBulletPortion( const xub_Unicode cCh,
+ SwBulletPortion( const sal_Unicode cCh,
const XubString& rBulletFollowedBy,
SwFont *pFnt,
const sal_Bool bLeft,
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index 6cd9dfc..38a3cd4 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -106,7 +106,7 @@ void SwGluePortion::Paint( const SwTxtPaintInfo &rInf ) const
if( rInf.OnWin() && rInf.GetOpt().IsBlank() && rInf.IsNoSymbol() )
{
#if OSL_DEBUG_LEVEL > 0
- const xub_Unicode cChar = rInf.GetChar( rInf.GetIdx() );
+ const sal_Unicode cChar = rInf.GetChar( rInf.GetIdx() );
OSL_ENSURE( CH_BLANK == cChar || CH_BULLET == cChar,
"SwGluePortion::Paint: blank expected" );
#endif
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index aa13594..3da8d99 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -88,7 +88,7 @@ using namespace i18n::ScriptType;
#endif
#define isSeenOrSadChar(c) (IS_JOINING_GROUP((c), SAD) || IS_JOINING_GROUP((c), SEEN))
-sal_Bool isTransparentChar ( xub_Unicode cCh )
+sal_Bool isTransparentChar ( sal_Unicode cCh )
{
return u_getIntPropertyValue( cCh, UCHAR_JOINING_TYPE ) == U_JT_TRANSPARENT;
}
@@ -99,7 +99,7 @@ sal_Bool isTransparentChar ( xub_Unicode cCh )
* Checks if cCh + cNectCh builds a ligature (used for Kashidas)
*************************************************************************/
-static sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode cNextCh )
+static sal_Bool lcl_IsLigature( sal_Unicode cCh, sal_Unicode cNextCh )
{
// Lam + Alef
return ( isLamChar ( cCh ) && isAlefChar ( cNextCh ));
@@ -111,7 +111,7 @@ static sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode cNextCh )
* Checks if cCh is connectable to cPrevCh (used for Kashidas)
*************************************************************************/
-static sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode cPrevCh )
+static sal_Bool lcl_ConnectToPrev( sal_Unicode cCh, sal_Unicode cPrevCh )
{
const int32_t nJoiningType = u_getIntPropertyValue( cPrevCh, UCHAR_JOINING_TYPE );
sal_Bool bRet = nJoiningType != U_JT_RIGHT_JOINING && nJoiningType != U_JT_NON_JOINING;
@@ -277,7 +277,7 @@ static bool lcl_HasOnlyBlanks( const XubString& rTxt, xub_StrLen nStt, xub_StrLe
bool bBlankOnly = true;
while ( nStt < nEnd )
{
- const xub_Unicode cChar = rTxt.GetChar( nStt++ );
+ const sal_Unicode cChar = rTxt.GetChar( nStt++ );
if ( ' ' != cChar && 0x3000 != cChar )
{
bBlankOnly = false;
@@ -932,7 +932,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
while ( nLastCompression < nChg )
{
- xub_Unicode cChar = rTxt.GetChar( nLastCompression );
+ sal_Unicode cChar = rTxt.GetChar( nLastCompression );
// examine current character
switch ( cChar )
@@ -1000,8 +1000,8 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
xub_StrLen nIdx = 0;
xub_StrLen nKashidaPos = STRING_LEN;
- xub_Unicode cCh;
- xub_Unicode cPrevCh = 0;
+ sal_Unicode cCh;
+ sal_Unicode cPrevCh = 0;
sal_uInt16 nPriorityLevel = 7; // 0..6 = level found
// 7 not found
@@ -1082,7 +1082,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
if ( isBaaChar ( cCh )) // Bah
{
// check if next character is Reh, Yeh or Alef Maksura
- xub_Unicode cNextCh = rWord.GetChar( nIdx + 1 );
+ sal_Unicode cNextCh = rWord.GetChar( nIdx + 1 );
if ( isRehChar ( cNextCh ) || isYehChar ( cNextCh ))
{
SAL_WARN_IF( 0 == cPrevCh, "sw.core", "No previous character" );
@@ -1369,7 +1369,7 @@ sal_uInt8 SwScriptInfo::DirType( const xub_StrLen nPos ) const
sal_uInt16 SwScriptInfo::MaskHiddenRanges( const SwTxtNode& rNode, XubString& rText,
const xub_StrLen nStt, const xub_StrLen nEnd,
- const xub_Unicode cChar )
+ const sal_Unicode cChar )
{
assert(rNode.GetTxt().Len() == rText.Len());
@@ -1850,7 +1850,7 @@ bool SwScriptInfo::IsArabicText( const rtl::OUString& rTxt, sal_Int32 nStt, sal_
if( nIdx >= 0 )
{
- const xub_Unicode cCh = rTxt[nIdx];
+ const sal_Unicode cCh = rTxt[nIdx];
const sal_Int16 type = unicode::getUnicodeScriptType( cCh, typeList, UnicodeScript_kScriptCount );
return type == UnicodeScript_kArabic;
}
@@ -2049,7 +2049,7 @@ sal_Int32 SwScriptInfo::ThaiJustify( const rtl::OUString& rTxt, sal_Int32* pKern
for (sal_Int32 nI = 0; nI < nLen; ++nI)
{
- const xub_Unicode cCh = rTxt[nStt + nI];
+ const sal_Unicode cCh = rTxt[nStt + nI];
// check if character is not above or below base
if ( ( 0xE34 > cCh || cCh > 0xE3A ) &&
diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx
index 7159c60..3740a43 100644
--- a/sw/source/core/text/portab.hxx
+++ b/sw/source/core/text/portab.hxx
@@ -37,13 +37,13 @@
class SwTabPortion : public SwFixPortion
{
const KSHORT nTabPos;
- const xub_Unicode cFill;
+ const sal_Unicode cFill;
const bool bAutoTabStop;
// Format() branches either into PreFormat() or PostFormat()
sal_Bool PreFormat( SwTxtFormatInfo &rInf );
public:
- SwTabPortion( const KSHORT nTabPos, const xub_Unicode cFill = '\0', const bool bAutoTab = true );
+ SwTabPortion( const KSHORT nTabPos, const sal_Unicode cFill = '\0', const bool bAutoTab = true );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
virtual void FormatEOL( SwTxtFormatInfo &rInf );
@@ -65,7 +65,7 @@ public:
class SwTabLeftPortion : public SwTabPortion
{
public:
- inline SwTabLeftPortion( const KSHORT nTabPosVal, const xub_Unicode cFillChar='\0', bool bAutoTab = true )
+ inline SwTabLeftPortion( const KSHORT nTabPosVal, const sal_Unicode cFillChar='\0', bool bAutoTab = true )
: SwTabPortion( nTabPosVal, cFillChar, bAutoTab )
{ SetWhichPor( POR_TABLEFT ); }
OUTPUT_OPERATOR
@@ -78,7 +78,7 @@ public:
class SwTabRightPortion : public SwTabPortion
{
public:
- inline SwTabRightPortion( const KSHORT nTabPosVal, const xub_Unicode cFillChar='\0' )
+ inline SwTabRightPortion( const KSHORT nTabPosVal, const sal_Unicode cFillChar='\0' )
: SwTabPortion( nTabPosVal, cFillChar )
{ SetWhichPor( POR_TABRIGHT ); }
OUTPUT_OPERATOR
@@ -91,7 +91,7 @@ public:
class SwTabCenterPortion : public SwTabPortion
{
public:
- inline SwTabCenterPortion( const KSHORT nTabPosVal, const xub_Unicode cFillChar='\0' )
+ inline SwTabCenterPortion( const KSHORT nTabPosVal, const sal_Unicode cFillChar='\0' )
: SwTabPortion( nTabPosVal, cFillChar )
{ SetWhichPor( POR_TABCENTER ); }
OUTPUT_OPERATOR
@@ -103,7 +103,7 @@ public:
class SwTabDecimalPortion : public SwTabPortion
{
- const xub_Unicode mcTab;
+ const sal_Unicode mcTab;
/*
* During text formatting, we already store the width of the portions
@@ -113,14 +113,14 @@ class SwTabDecimalPortion : public SwTabPortion
sal_uInt16 mnWidthOfPortionsUpTpDecimalPosition;
public:
- inline SwTabDecimalPortion( const KSHORT nTabPosVal, const xub_Unicode cTab,
- const xub_Unicode cFillChar = '\0' )
+ inline SwTabDecimalPortion( const KSHORT nTabPosVal, const sal_Unicode cTab,
+ const sal_Unicode cFillChar = '\0' )
: SwTabPortion( nTabPosVal, cFillChar ),
mcTab(cTab),
mnWidthOfPortionsUpTpDecimalPosition( USHRT_MAX )
{ SetWhichPor( POR_TABDECIMAL ); }
- inline xub_Unicode GetTabDecimal() const { return mcTab; }
+ inline sal_Unicode GetTabDecimal() const { return mcTab; }
inline void SetWidthOfPortionsUpToDecimalPosition( sal_uInt16 nNew )
{
@@ -142,8 +142,8 @@ public:
class SwAutoTabDecimalPortion : public SwTabDecimalPortion
{
public:
- inline SwAutoTabDecimalPortion( const KSHORT nTabPosVal, const xub_Unicode cTab,
- const xub_Unicode cFillChar = '\0' )
+ inline SwAutoTabDecimalPortion( const KSHORT nTabPosVal, const sal_Unicode cTab,
+ const sal_Unicode cFillChar = '\0' )
: SwTabDecimalPortion( nTabPosVal, cTab, cFillChar )
{ SetLen( 0 ); }
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index a75cfa4..c58cf8e 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -190,7 +190,7 @@ MSHORT SwTxtNode::GetDropLen( MSHORT nWishLen ) const
xub_StrLen i = 0;
for( ; i < nEnd; ++i )
{
- xub_Unicode cChar = GetTxt().GetChar( i );
+ sal_Unicode cChar = GetTxt().GetChar( i );
if( CH_TAB == cChar || CH_BREAK == cChar ||
(( CH_TXTATR_BREAKWORD == cChar || CH_TXTATR_INWORD == cChar )
&& SwTxtSizeInfo::_HasHint( this, i ) ) )
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index f795666..b2d7522 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -519,7 +519,7 @@ bool sw_HideObj( const SwTxtFrm& _rFrm,
pIDSA->get(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION) &&
_rFrm.IsInDocBody() && !_rFrm.FindNextCnt() )
{
- const xub_Unicode cAnchorChar =
+ const sal_Unicode cAnchorChar =
_rFrm.GetTxtNode()->GetTxt().GetChar( _nObjAnchorPos );
if ( cAnchorChar == CH_TXTATR_BREAKWORD )
{
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 0bd8b9a..a7eb24a 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -83,8 +83,8 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto )
{
SwTabPortion *pTabPor = 0;
- xub_Unicode cFill = 0;
- xub_Unicode cDec = 0;
+ sal_Unicode cFill = 0;
+ sal_Unicode cDec = 0;
SvxTabAdjust eAdj;
KSHORT nNewTabPos;
@@ -329,7 +329,7 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto )
// Die Basisklasse wird erstmal ohne alles initialisiert.
-SwTabPortion::SwTabPortion( const KSHORT nTabPosition, const xub_Unicode cFillChar, const bool bAutoTab )
+SwTabPortion::SwTabPortion( const KSHORT nTabPosition, const sal_Unicode cFillChar, const bool bAutoTab )
: SwFixPortion( 0, 0 ), nTabPos(nTabPosition), cFill(cFillChar), bAutoTabStop( bAutoTab )
{
nLineLength = 1;
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index e7e1e18..289708b 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -632,7 +632,7 @@ void SwFntObj::SetDevFont( const ViewShell *pSh, OutputDevice& rOut )
*
*************************************************************************/
-static sal_uInt8 lcl_WhichPunctuation( xub_Unicode cChar )
+static sal_uInt8 lcl_WhichPunctuation( sal_Unicode cChar )
{
if ( ( cChar < 0x3001 || cChar > 0x3002 ) &&
( cChar < 0x3008 || cChar > 0x3011 ) &&
@@ -655,8 +655,8 @@ static sal_uInt8 lcl_WhichPunctuation( xub_Unicode cChar )
static sal_Bool lcl_IsMonoSpaceFont( const OutputDevice& rOut )
{
- const rtl::OUString aStr1( xub_Unicode( 0x3008 ) );
- const rtl::OUString aStr2( xub_Unicode( 0x307C ) );
+ const rtl::OUString aStr1( sal_Unicode( 0x3008 ) );
+ const rtl::OUString aStr2( sal_Unicode( 0x307C ) );
const long nWidth1 = rOut.GetTextWidth( aStr1 );
const long nWidth2 = rOut.GetTextWidth( aStr2 );
return nWidth1 == nWidth2;
@@ -991,7 +991,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
long nNextFix;
// punctuation characters are not centered
- xub_Unicode cChar = rInf.GetText().GetChar( rInf.GetIdx() );
+ sal_Unicode cChar = rInf.GetText().GetChar( rInf.GetIdx() );
sal_uInt8 nType = lcl_WhichPunctuation( cChar );
switch ( nType )
{
@@ -1558,7 +1558,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
nCnt = nCnt - rInf.GetIdx();
nCnt = Min( nCnt, rInf.GetLen() );
long nKernSum = rInf.GetKern();
- xub_Unicode cChPrev = rInf.GetText().GetChar( rInf.GetIdx() );
+ sal_Unicode cChPrev = rInf.GetText().GetChar( rInf.GetIdx() );
// In case of a single underlined space in justified text,
// have to output 2 spaces:
@@ -1582,7 +1582,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
}
else
{
- xub_Unicode nCh;
+ sal_Unicode nCh;
// In case of Pair Kerning the printer influence on the positioning
// grows
@@ -1936,9 +1936,9 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf )
else
nCnt = nCnt - rInf.GetIdx();
nCnt = Min (nCnt, nLn);
- xub_Unicode nChPrev = rInf.GetText().GetChar( rInf.GetIdx() );
+ sal_Unicode nChPrev = rInf.GetText().GetChar( rInf.GetIdx() );
- xub_Unicode nCh;
+ sal_Unicode nCh;
// In case of Pair Kerning the printer influence on the positioning
// grows
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 899b93a..dadfe42 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2967,7 +2967,7 @@ sal_Bool SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx,
sTmpText.SearchAndReplaceAll('\t', ' ');
// mask hidden characters
- const xub_Unicode cChar = CH_TXTATR_BREAKWORD;
+ const sal_Unicode cChar = CH_TXTATR_BREAKWORD;
sal_uInt16 nHiddenChrs =
SwScriptInfo::MaskHiddenRanges( *this, sTmpText, 0, sTmpText.Len(), cChar );
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 97e680a..4681d88 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -105,7 +105,7 @@ extern SwTxtFrm *pLinguFrm;
static sal_uInt16 lcl_MaskRedlines( const SwTxtNode& rNode, XubString& rText,
const xub_StrLen nStt, const xub_StrLen nEnd,
- const xub_Unicode cChar )
+ const sal_Unicode cChar )
{
sal_uInt16 nNumOfMaskedRedlines = 0;
@@ -150,7 +150,7 @@ static sal_uInt16 lcl_MaskRedlines( const SwTxtNode& rNode, XubString& rText,
static sal_uInt16 lcl_MaskRedlinesAndHiddenText( const SwTxtNode& rNode, XubString& rText,
const xub_StrLen nStt, const xub_StrLen nEnd,
- const xub_Unicode cChar = CH_TXTATR_INWORD,
+ const sal_Unicode cChar = CH_TXTATR_INWORD,
bool bCheckShowHiddenChar = true )
{
sal_uInt16 nRedlinesMasked = 0;
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx
index 8380898..ba66665 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/ui/ribbar/inputwin.cxx
@@ -429,8 +429,8 @@ void SwInputWindow::CancelFormula()
}
//==================================================================
-const xub_Unicode CH_LRE = 0x202a;
-const xub_Unicode CH_PDF = 0x202c;
+const sal_Unicode CH_LRE = 0x202a;
+const sal_Unicode CH_PDF = 0x202c;
IMPL_LINK( SwInputWindow, SelTblCellsNotify, SwWrtShell *, pCaller )
{
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index 0f6b39b..9a4b52c 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -677,8 +677,8 @@ static bool ImplKillLeading( String& rName, const char* const* ppStr )
for(; *ppStr; ++ppStr )
{
const char* pStr = *ppStr;
- const xub_Unicode* pNameStr = rName.GetBuffer();
- while ( (*pNameStr == (xub_Unicode)(unsigned char)*pStr) && *pStr )
+ const sal_Unicode* pNameStr = rName.GetBuffer();
+ while ( (*pNameStr == (sal_Unicode)(unsigned char)*pStr) && *pStr )
{
pNameStr++;
pStr++;
@@ -693,7 +693,7 @@ static bool ImplKillLeading( String& rName, const char* const* ppStr )
// special case for Baekmuk
// TODO: allow non-ASCII KillLeading list
- const xub_Unicode* pNameStr = rName.GetBuffer();
+ const sal_Unicode* pNameStr = rName.GetBuffer();
if( (pNameStr[0]==0xBC31) && (pNameStr[1]==0xBC35) )
{
xub_StrLen nLen = (pNameStr[2]==0x0020) ? 3 : 2;
@@ -712,7 +712,7 @@ static xub_StrLen ImplIsTrailing( const String& rName, const char* pStr )
if( nStrLen >= rName.Len() )
return 0;
- const xub_Unicode* pEndName = rName.GetBuffer() + rName.Len();
+ const sal_Unicode* pEndName = rName.GetBuffer() + rName.Len();
const sal_Unicode* pNameStr = pEndName - nStrLen;
do if( *(pNameStr++) != *(pStr++) )
return 0;
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 7ed0c93..c2fb462 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 ccfb8c9..5b21cf3 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 7ddab48..5cb189c 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 0850024..099858f 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 )
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index d3b87da..2eae80f 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -1255,7 +1255,7 @@ void DbgDialogTest( Window* pWindow )
XubString aText = pChild->GetText();
XubString aErrorText = aText;
sal_uInt16 nAccelPos = STRING_NOTFOUND;
- xub_Unicode cAccel = 0;
+ sal_Unicode cAccel = 0;
if ( aErrorText.Len() > 128 )
{
aErrorText.Erase( 128 );
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 3ec6e64..841a65f 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 7d2c476..a8d018e 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 9474761..f258ffc 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 ec5ad7e..379aa5c 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 1d0c146..714f0db 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 b3e308e..67840f6 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() )
{
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index a8062ec..efb9786 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -524,7 +524,7 @@ XubString TextDoc::GetText( sal_uLong nPara ) const
}
-sal_uLong TextDoc::GetTextLen( const xub_Unicode* pSep, const TextSelection* pSel ) const
+sal_uLong TextDoc::GetTextLen( const sal_Unicode* pSep, const TextSelection* pSel ) const
{
sal_uLong nLen = 0;
sal_uLong nNodes = maTextNodes.Count();
@@ -559,7 +559,7 @@ sal_uLong TextDoc::GetTextLen( const xub_Unicode* pSep, const TextSelection* pSe
return nLen;
}
-TextPaM TextDoc::InsertText( const TextPaM& rPaM, xub_Unicode c )
+TextPaM TextDoc::InsertText( const TextPaM& rPaM, sal_Unicode c )
{
DBG_ASSERT( c != 0x0A, "TextDoc::InsertText: Zeilentrenner in Absatz nicht erlaubt!" );
DBG_ASSERT( c != 0x0D, "TextDoc::InsertText: Zeilentrenner in Absatz nicht erlaubt!" );
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 045fb30..c67e8aa 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -763,7 +763,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent )
{
if ( TextEngine::IsSimpleCharInput( rKeyEvent ) )
{
- xub_Unicode nCharCode = rKeyEvent.GetCharCode();
+ sal_Unicode nCharCode = rKeyEvent.GetCharCode();
if ( !mpImpl->mbReadOnly && ImplCheckTextLen( rtl::OUString(nCharCode) ) ) // sonst trotzdem das Zeichen schlucken...
{
aCurSel = mpImpl->mpTextEngine->ImpInsertText( nCharCode, aCurSel, !IsInsertMode(), sal_True );
@@ -1648,7 +1648,7 @@ TextPaM TextView::CursorEndOfLine( const TextPaM& rPaM )
if ( pLine->GetEnd() > pLine->GetStart() ) // Leerzeile
{
- xub_Unicode cLastChar = pPPortion->GetNode()->GetText().GetChar((sal_uInt16)(aPaM.GetIndex()-1) );
+ sal_Unicode cLastChar = pPPortion->GetNode()->GetText().GetChar((sal_uInt16)(aPaM.GetIndex()-1) );
if ( ( cLastChar == ' ' ) && ( aPaM.GetIndex() != pPPortion->GetNode()->GetText().Len() ) )
{
// Bei einem Blank in einer autom. umgebrochenen Zeile macht es Sinn,
diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx
index c434ad0..d73c932 100644
--- a/vcl/source/edit/xtextedt.cxx
+++ b/vcl/source/edit/xtextedt.cxx
@@ -98,8 +98,8 @@ TextSelection ExtTextEngine::MatchGroup( const TextPaM& rCursor ) const
else
{
// Rueckwaerts suchen...
- xub_Unicode nEC = maGroupChars.GetChar( nMatchChar );
- xub_Unicode nSC = maGroupChars.GetChar( nMatchChar-1 );
+ sal_Unicode nEC = maGroupChars.GetChar( nMatchChar );
+ sal_Unicode nSC = maGroupChars.GetChar( nMatchChar-1 );
sal_uInt16 nCur = rCursor.GetIndex()-1;
sal_uInt16 nLevel = 1;
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index d743b4d..4a0451e 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -811,7 +811,7 @@ public:
int mnFaceMatch;
int mnHeightMatch;
int mnWidthMatch;
- const xub_Unicode* mpTargetStyleName;
+ const sal_Unicode* mpTargetStyleName;
};
bool PhysicalFontFace::IsBetterMatch( const FontSelectPattern& rFSD, FontMatchStatus& rStatus ) const
@@ -1180,7 +1180,7 @@ PhysicalFontFace* ImplDevFontListData::FindBestFontFace( const FontSelectPattern
// FontName+StyleName should map to FamilyName+StyleName
const String& rSearchName = rFSD.maTargetName;
- const xub_Unicode* pTargetStyleName = NULL;
+ const sal_Unicode* pTargetStyleName = NULL;
if( (rSearchName.Len() > maSearchName.Len())
&& rSearchName.Equals( maSearchName, 0, maSearchName.Len() ) )
pTargetStyleName = rSearchName.GetBuffer() + maSearchName.Len() + 1;
@@ -4139,7 +4139,7 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY,
cStrikeoutChar = 'X';
static const int nTestStrLen = 4;
static const int nMaxStrikeStrLen = 2048;
- xub_Unicode aChars[nMaxStrikeStrLen+1]; // +1 for valgrind...
+ sal_Unicode aChars[nMaxStrikeStrLen+1]; // +1 for valgrind...
for( int i = 0; i < nTestStrLen; ++i)
aChars[i] = cStrikeoutChar;
const rtl::OUString aStrikeoutTest(aChars, nTestStrLen);
@@ -5983,8 +5983,8 @@ ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs( String& rStr,
else if( 0 == (mnTextLayoutMode & TEXT_LAYOUT_BIDI_RTL) )
{
// disable Bidi if no RTL hint and no RTL codes used
- const xub_Unicode* pStr = rStr.GetBuffer() + nMinIndex;
- const xub_Unicode* pEnd = rStr.GetBuffer() + nEndIndex;
+ const sal_Unicode* pStr = rStr.GetBuffer() + nMinIndex;
+ const sal_Unicode* pEnd = rStr.GetBuffer() + nEndIndex;
for( ; pStr < pEnd; ++pStr )
if( ((*pStr >= 0x0580) && (*pStr < 0x0800)) // middle eastern scripts
|| ((*pStr >= 0xFB18) && (*pStr < 0xFE00)) // hebrew + arabic A presentation forms
@@ -6952,7 +6952,7 @@ Rectangle OutputDevice::GetTextRect( const Rectangle& rRect,
// -----------------------------------------------------------------------
-static sal_Bool ImplIsCharIn( xub_Unicode c, const sal_Char* pStr )
+static sal_Bool ImplIsCharIn( sal_Unicode c, const sal_Char* pStr )
{
while ( *pStr )
{
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 7cc160a..9b98140 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -431,7 +431,7 @@ bool ImplLayoutRuns::GetRun( int* nMinRunPos, int* nEndRunPos, bool* bRightToLef
// =======================================================================
-ImplLayoutArgs::ImplLayoutArgs( const xub_Unicode* pStr, int nLen,
+ImplLayoutArgs::ImplLayoutArgs( const sal_Unicode* pStr, int nLen,
int nMinCharPos, int nEndCharPos, int nFlags )
:
mnFlags( nFlags ),
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index b9977ed..1d6d1e2 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -114,7 +114,7 @@ namespace
return is_subrange(s.first, s.second, b, e);
}
- int findSameDirLimit(const xub_Unicode* buffer, int charCount, bool rtl)
+ int findSameDirLimit(const sal_Unicode* buffer, int charCount, bool rtl)
{
UErrorCode status = U_ZERO_ERROR;
UBiDi *ubidi = ubidi_openSized(charCount, 0, &status);
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index a1b2f81..845663e 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -409,13 +409,13 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt
// -----------------------------------------------------------------------
-static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, xub_Unicode cCharCode,
+static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Unicode cCharCode,
sal_uInt16 nFormStart, sal_uInt16 nFormEnd, sal_Bool bCheckEnable = sal_True )
{
DBG_ASSERT( (rIndex >= nFormStart) && (rIndex <= nFormEnd),
"Window::ImplFindAccelWindow() - rIndex not in Form" );
- xub_Unicode cCompareChar;
+ sal_Unicode cCompareChar;
sal_uInt16 nStart = rIndex;
sal_uInt16 i = rIndex;
int bSearch = sal_True;
@@ -853,7 +853,7 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput )
}
else
{
- xub_Unicode c = rKEvt.GetCharCode();
+ sal_Unicode c = rKEvt.GetCharCode();
if ( c )
{
pSWindow = ::ImplFindAccelWindow( this, i, c, nFormStart, nFormEnd );
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 2920878..b2a0b79 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -208,13 +208,13 @@ public:
}
MenuItemData* SearchItem(
- xub_Unicode cSelectChar,
+ sal_Unicode cSelectChar,
KeyCode aKeyCode,
sal_uInt16& rPos,
sal_uInt16& nDuplicates,
sal_uInt16 nCurrentPos
) const;
- size_t GetItemCount( xub_Unicode cSelectChar ) const;
+ size_t GetItemCount( sal_Unicode cSelectChar ) const;
size_t GetItemCount( KeyCode aKeyCode ) const;
size_t size()
{
@@ -330,7 +330,7 @@ MenuItemData* MenuItemList::GetData( sal_uInt16 nSVId, size_t& rPos ) const
}
MenuItemData* MenuItemList::SearchItem(
- xub_Unicode cSelectChar,
+ sal_Unicode cSelectChar,
KeyCode aKeyCode,
sal_uInt16& rPos,
sal_uInt16& nDuplicates,
@@ -376,7 +376,7 @@ MenuItemData* MenuItemList::SearchItem(
if ( n != STRING_NOTFOUND )
{
KeyCode mnKeyCode;
- xub_Unicode mnUnicode = pData->aText.GetChar(n+1);
+ sal_Unicode mnUnicode = pData->aText.GetChar(n+1);
Window* pDefWindow = ImplGetDefaultWindow();
if( ( pDefWindow
&& pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( mnUnicode, Application::GetSettings().GetUILanguage(), mnKeyCode )
@@ -400,7 +400,7 @@ MenuItemData* MenuItemList::SearchItem(
return NULL;
}
-size_t MenuItemList::GetItemCount( xub_Unicode cSelectChar ) const
+size_t MenuItemList::GetItemCount( sal_Unicode cSelectChar ) const
{
// returns number of entries with same mnemonic
const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
@@ -4951,7 +4951,7 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent )
break;
default:
{
- xub_Unicode nCharCode = rKEvent.GetCharCode();
+ sal_Unicode nCharCode = rKEvent.GetCharCode();
sal_uInt16 nPos = 0;
sal_uInt16 nDuplicates = 0;
MenuItemData* pData = (nCharCode && pMenu) ? pMenu->GetItemList()->SearchItem( nCharCode, rKEvent.GetKeyCode(), nPos, nDuplicates, nHighlightedItem ) : NULL;
@@ -5728,7 +5728,7 @@ sal_Bool MenuBarWindow::ImplHandleKeyEvent( const KeyEvent& rKEvent, sal_Bool bF
if ( !bDone && ( bFromMenu || rKEvent.GetKeyCode().IsMod2() ) )
{
- xub_Unicode nCharCode = rKEvent.GetCharCode();
+ sal_Unicode nCharCode = rKEvent.GetCharCode();
if ( nCharCode )
{
sal_uInt16 nEntry, nDuplicates;
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 31a2270..e4122cd 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -964,7 +964,7 @@ static long ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent,
// allow application key listeners to remove the key event
// but make sure we're not forwarding external KeyEvents, (ie where bForward is sal_False)
// becasue those are coming back from the listener itself and MUST be processed
- KeyEvent aKeyEvent( (xub_Unicode)nCharCode, aKeyCode, nRepeat );
+ KeyEvent aKeyEvent( (sal_Unicode)nCharCode, aKeyCode, nRepeat );
if( bForward )
{
sal_uInt16 nVCLEvent;
@@ -1096,7 +1096,7 @@ static long ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent,
ImplDelData aDelData;
pChild->ImplAddDel( &aDelData );
- KeyEvent aKeyEvt( (xub_Unicode)nCharCode, aKeyCode, nRepeat );
+ KeyEvent aKeyEvt( (sal_Unicode)nCharCode, aKeyCode, nRepeat );
NotifyEvent aNotifyEvt( nSVEvent, pChild, &aKeyEvt );
sal_Bool bKeyPreNotify = (ImplCallPreNotify( aNotifyEvt ) != 0);
long nRet = 1;
@@ -1209,7 +1209,7 @@ static long ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent,
// call handler
ImplDelData aChildDelData( pChild );
- KeyEvent aKEvt( (xub_Unicode)nCharCode, aKeyCode, nRepeat );
+ KeyEvent aKEvt( (sal_Unicode)nCharCode, aKeyCode, nRepeat );
NotifyEvent aNEvt( nSVEvent, pChild, &aKEvt );
sal_Bool bPreNotify = (ImplCallPreNotify( aNEvt ) != 0);
if ( aChildDelData.IsDead() )
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index e5eace2..7845561 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -1010,7 +1010,7 @@ static ImplWinFontData* ImplLogMetricToDevFontDataW( const ENUMLOGFONTEXW* pLogF
void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont )
{
- rtl::OUString aFontName( reinterpret_cast<const xub_Unicode*>(rLogFont.lfFaceName) );
+ rtl::OUString aFontName( reinterpret_cast<const sal_Unicode*>(rLogFont.lfFaceName) );
if (!aFontName.isEmpty())
{
rFont.SetName( aFontName );
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 25bb9a2..d4a0663 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -1105,7 +1105,7 @@ sal_Bool WinSalFrame::PostEvent( void* pData )
void WinSalFrame::SetTitle( const rtl::OUString& rTitle )
{
- DBG_ASSERT( sizeof( WCHAR ) == sizeof( xub_Unicode ), "WinSalFrame::SetTitle(): WCHAR != sal_Unicode" );
+ DBG_ASSERT( sizeof( WCHAR ) == sizeof( sal_Unicode ), "WinSalFrame::SetTitle(): WCHAR != sal_Unicode" );
SetWindowTextW( mhWnd, reinterpret_cast<LPCWSTR>(rTitle.getStr()) );
}
@@ -2387,7 +2387,7 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf,
UINT& rCount, UINT nMaxSize,
const sal_Char* pReplace )
{
- DBG_ASSERT( sizeof( WCHAR ) == sizeof( xub_Unicode ), "WinSalFrame::ImplGetKeyNameTextW(): WCHAR != sal_Unicode" );
+ DBG_ASSERT( sizeof( WCHAR ) == sizeof( sal_Unicode ), "WinSalFrame::ImplGetKeyNameTextW(): WCHAR != sal_Unicode" );
static const int nMaxKeyLen = 350;
WCHAR aKeyBuf[ nMaxKeyLen ];
@@ -5167,7 +5167,7 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame,
{
WCHAR* pTextBuf = new WCHAR[nTextLen];
ImmGetCompositionStringW( hIMC, GCS_RESULTSTR, pTextBuf, nTextLen*sizeof( WCHAR ) );
- aEvt.maText = rtl::OUString( reinterpret_cast<const xub_Unicode*>(pTextBuf), (sal_Int32)nTextLen );
+ aEvt.maText = rtl::OUString( reinterpret_cast<const sal_Unicode*>(pTextBuf), (sal_Int32)nTextLen );
delete [] pTextBuf;
}
@@ -5193,7 +5193,7 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame,
{
WCHAR* pTextBuf = new WCHAR[nTextLen];
ImmGetCompositionStringW( hIMC, GCS_COMPSTR, pTextBuf, nTextLen*sizeof( WCHAR ) );
- aEvt.maText = rtl::OUString( reinterpret_cast<const xub_Unicode*>(pTextBuf), (sal_Int32)nTextLen );
+ aEvt.maText = rtl::OUString( reinterpret_cast<const sal_Unicode*>(pTextBuf), (sal_Int32)nTextLen );
delete [] pTextBuf;
BYTE* pAttrBuf = NULL;
More information about the Libreoffice-commits
mailing list