summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/sallayout.hxx4
-rw-r--r--vcl/inc/vcl/combobox.hxx10
-rw-r--r--vcl/inc/vcl/edit.hxx6
-rw-r--r--vcl/inc/vcl/event.hxx8
-rw-r--r--vcl/source/app/dbggui.cxx2
-rw-r--r--vcl/source/control/combobox.cxx6
-rw-r--r--vcl/source/control/edit.cxx6
-rw-r--r--vcl/source/control/field.cxx4
-rw-r--r--vcl/source/control/field2.cxx20
-rw-r--r--vcl/source/control/ilstbox.cxx2
-rw-r--r--vcl/source/control/quickselectionengine.cxx2
-rw-r--r--vcl/source/edit/textdoc.cxx4
-rw-r--r--vcl/source/edit/textview.cxx4
-rw-r--r--vcl/source/edit/xtextedt.cxx4
-rw-r--r--vcl/source/gdi/outdev3.cxx12
-rw-r--r--vcl/source/gdi/sallayout.cxx2
-rw-r--r--vcl/source/glyphs/graphite_layout.cxx2
-rw-r--r--vcl/source/window/dlgctrl.cxx6
-rw-r--r--vcl/source/window/menu.cxx14
-rw-r--r--vcl/source/window/winproc.cxx6
-rw-r--r--vcl/win/source/gdi/salgdi3.cxx2
-rw-r--r--vcl/win/source/window/salframe.cxx8
22 files changed, 67 insertions, 67 deletions
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 7ed0c935abf8..c2fb462c3ba7 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -105,7 +105,7 @@ public:
int mnLength;
int mnMinCharPos;
int mnEndCharPos;
- const xub_Unicode* mpStr;
+ const sal_Unicode* mpStr;
// positioning related inputs
const sal_Int32* mpDXArray; // in pixel units
@@ -117,7 +117,7 @@ public:
ImplLayoutRuns maReruns;
public:
- ImplLayoutArgs( const xub_Unicode* pStr, int nLength,
+ ImplLayoutArgs( const sal_Unicode* pStr, int nLength,
int nMinCharPos, int nEndCharPos, int nFlags );
void SetLayoutWidth( long nWidth ) { mnLayoutWidth = nWidth; }
diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx
index ccfb8c935839..5b21cf358741 100644
--- a/vcl/inc/vcl/combobox.hxx
+++ b/vcl/inc/vcl/combobox.hxx
@@ -52,7 +52,7 @@ private:
ImplBtn* mpBtn;
ImplListBoxFloatingWindow* mpFloatWin;
sal_uInt16 mnDDHeight;
- xub_Unicode mcMultiSep;
+ sal_Unicode mcMultiSep;
sal_Bool mbDDAutoSize : 1;
sal_Bool mbSyntheticModify : 1;
sal_Bool mbMatchCase : 1;
@@ -157,8 +157,8 @@ public:
void EnableMultiSelection( sal_Bool bMulti );
sal_Bool IsMultiSelectionEnabled() const;
- void SetMultiSelectionSeparator( xub_Unicode cSep ) { mcMultiSep = cSep; }
- xub_Unicode GetMultiSelectionSeparator() const { return mcMultiSep; }
+ void SetMultiSelectionSeparator( sal_Unicode cSep ) { mcMultiSep = cSep; }
+ sal_Unicode GetMultiSelectionSeparator() const { return mcMultiSep; }
void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
const Link& GetSelectHdl() const { return maSelectHdl; }
@@ -172,8 +172,8 @@ public:
Size CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const;
void GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const;
- void SetMRUEntries( const XubString& rEntries, xub_Unicode cSep = ';' );
- XubString GetMRUEntries( xub_Unicode cSep = ';' ) const;
+ void SetMRUEntries( const XubString& rEntries, sal_Unicode cSep = ';' );
+ XubString GetMRUEntries( sal_Unicode cSep = ';' ) const;
void SetMaxMRUCount( sal_uInt16 n );
sal_uInt16 GetMaxMRUCount() const;
diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx
index 7ddab48fa1a6..5cb189c4614b 100644
--- a/vcl/inc/vcl/edit.hxx
+++ b/vcl/inc/vcl/edit.hxx
@@ -80,7 +80,7 @@ private:
xub_StrLen mnMaxTextLen;
sal_Int32 mnMinWidthInChars;
AutocompleteAction meAutocompleteAction;
- xub_Unicode mcEchoChar;
+ sal_Unicode mcEchoChar;
sal_Bool mbModified:1,
mbInternModified:1,
mbReadOnly:1,
@@ -187,8 +187,8 @@ public:
virtual void DisableUpdateData() { delete mpUpdateDataTimer; mpUpdateDataTimer = NULL; }
virtual sal_uLong IsUpdateDataEnabled() const;
- void SetEchoChar( xub_Unicode c );
- xub_Unicode GetEchoChar() const { return mcEchoChar; }
+ void SetEchoChar( sal_Unicode c );
+ sal_Unicode GetEchoChar() const { return mcEchoChar; }
virtual void SetReadOnly( sal_Bool bReadOnly = sal_True );
virtual sal_Bool IsReadOnly() const { return mbReadOnly; }
diff --git a/vcl/inc/vcl/event.hxx b/vcl/inc/vcl/event.hxx
index 0850024cdceb..099858f34788 100644
--- a/vcl/inc/vcl/event.hxx
+++ b/vcl/inc/vcl/event.hxx
@@ -59,14 +59,14 @@ class VCL_DLLPUBLIC KeyEvent
private:
KeyCode maKeyCode;
sal_uInt16 mnRepeat;
- xub_Unicode mnCharCode;
+ sal_Unicode mnCharCode;
public:
KeyEvent();
- KeyEvent( xub_Unicode nChar, const KeyCode& rKeyCode,
+ KeyEvent( sal_Unicode nChar, const KeyCode& rKeyCode,
sal_uInt16 nRepeat = 0 );
- xub_Unicode GetCharCode() const { return mnCharCode; }
+ sal_Unicode GetCharCode() const { return mnCharCode; }
const KeyCode& GetKeyCode() const { return maKeyCode; }
sal_uInt16 GetRepeat() const { return mnRepeat; }
@@ -81,7 +81,7 @@ inline KeyEvent::KeyEvent()
mnRepeat = 0;
}
-inline KeyEvent::KeyEvent( xub_Unicode nChar, const KeyCode& rKeyCode,
+inline KeyEvent::KeyEvent( sal_Unicode nChar, const KeyCode& rKeyCode,
sal_uInt16 nRepeat ) :
maKeyCode( rKeyCode )
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index d3b87da95f36..2eae80f58d13 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 3ec6e64f1933..841a65f11cdc 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -43,7 +43,7 @@
// =======================================================================
-static void lcl_GetSelectedEntries( ::std::set< sal_uInt16 >& rSelectedPos, const XubString& rText, xub_Unicode cTokenSep, const ImplEntryList* pEntryList )
+static void lcl_GetSelectedEntries( ::std::set< sal_uInt16 >& rSelectedPos, const XubString& rText, sal_Unicode cTokenSep, const ImplEntryList* pEntryList )
{
for (xub_StrLen n = comphelper::string::getTokenCount(rText, cTokenSep); n;)
{
@@ -1363,14 +1363,14 @@ void ComboBox::SetSeparatorPos( sal_uInt16 n )
// -----------------------------------------------------------------------
-void ComboBox::SetMRUEntries( const XubString& rEntries, xub_Unicode cSep )
+void ComboBox::SetMRUEntries( const XubString& rEntries, sal_Unicode cSep )
{
mpImplLB->SetMRUEntries( rEntries, cSep );
}
// -----------------------------------------------------------------------
-XubString ComboBox::GetMRUEntries( xub_Unicode cSep ) const
+XubString ComboBox::GetMRUEntries( sal_Unicode cSep ) const
{
return mpImplLB->GetMRUEntries( cSep );
}
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 7d2c47630a7a..a8d018e8a7be 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -435,7 +435,7 @@ WinBits Edit::ImplInitStyle( WinBits nStyle )
sal_Bool Edit::IsCharInput( const KeyEvent& rKeyEvent )
{
// In the future we must use new Unicode functions for this
- xub_Unicode cCharCode = rKeyEvent.GetCharCode();
+ sal_Unicode cCharCode = rKeyEvent.GetCharCode();
return ((cCharCode >= 32) && (cCharCode != 127) &&
!rKeyEvent.GetKeyCode().IsMod3() &&
!rKeyEvent.GetKeyCode().IsMod2() &&
@@ -516,7 +516,7 @@ XubString Edit::ImplGetText() const
if ( mcEchoChar || (GetStyle() & WB_PASSWORD) )
{
XubString aText;
- xub_Unicode cEchoChar;
+ sal_Unicode cEchoChar;
if ( mcEchoChar )
cEchoChar = mcEchoChar;
else
@@ -2613,7 +2613,7 @@ void Edit::EnableUpdateData( sal_uLong nTimeout )
// -----------------------------------------------------------------------
-void Edit::SetEchoChar( xub_Unicode c )
+void Edit::SetEchoChar( sal_Unicode c )
{
mcEchoChar = c;
if ( mpSubEdit )
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 9474761969e5..f258ffcd6288 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -80,7 +80,7 @@ static sal_Bool ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt,
return sal_False;
else
{
- xub_Unicode cChar = rKEvt.GetCharCode();
+ sal_Unicode cChar = rKEvt.GetCharCode();
sal_uInt16 nGroup = rKEvt.GetKeyCode().GetGroup();
if ( (nGroup == KEYGROUP_FKEYS) || (nGroup == KEYGROUP_CURSOR) ||
@@ -1110,7 +1110,7 @@ static rtl::OUString ImplMetricGetUnitText(const rtl::OUString& rStr)
rtl::OUStringBuffer aStr;
for (sal_Int32 i = rStr.getLength()-1; i >= 0; --i)
{
- xub_Unicode c = rStr[i];
+ sal_Unicode c = rStr[i];
if ( (c == '\'') || (c == '\"') || (c == '%' ) || unicode::isAlpha(c) || unicode::isControl(c) )
aStr.insert(0, c);
else
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index ec5ad7e7df99..379aa5cb25ea 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -158,7 +158,7 @@ static void ImplSkipDelimiters( const sal_Unicode*& rpBuf )
// -----------------------------------------------------------------------
-static int ImplIsPatternChar( xub_Unicode cChar, sal_Char cEditMask )
+static int ImplIsPatternChar( sal_Unicode cChar, sal_Char cEditMask )
{
sal_Int32 nType = 0;
@@ -206,7 +206,7 @@ static int ImplIsPatternChar( xub_Unicode cChar, sal_Char cEditMask )
// -----------------------------------------------------------------------
-static xub_Unicode ImplPatternChar( xub_Unicode cChar, sal_Char cEditMask )
+static sal_Unicode ImplPatternChar( sal_Unicode cChar, sal_Char cEditMask )
{
if ( ImplIsPatternChar( cChar, cEditMask ) )
{
@@ -224,7 +224,7 @@ static xub_Unicode ImplPatternChar( xub_Unicode cChar, sal_Char cEditMask )
// -----------------------------------------------------------------------
-static int ImplKommaPointCharEqual( xub_Unicode c1, xub_Unicode c2 )
+static int ImplKommaPointCharEqual( sal_Unicode c1, sal_Unicode c2 )
{
if ( c1 == c2 )
return sal_True;
@@ -247,9 +247,9 @@ static XubString ImplPatternReformat( const XubString& rStr,
XubString aStr = rStr;
XubString aOutStr = rLiteralMask;
- xub_Unicode cTempChar;
- xub_Unicode cChar;
- xub_Unicode cLiteral;
+ sal_Unicode cTempChar;
+ sal_Unicode cChar;
+ sal_Unicode cLiteral;
sal_Char cMask;
xub_StrLen nStrIndex = 0;
xub_StrLen i = 0;
@@ -487,7 +487,7 @@ static sal_Bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
Selection aOldSel = pEdit->GetSelection();
KeyCode aCode = rKEvt.GetKeyCode();
- xub_Unicode cChar = rKEvt.GetCharCode();
+ sal_Unicode cChar = rKEvt.GetCharCode();
sal_uInt16 nKeyCode = aCode.GetCode();
sal_Bool bShift = aCode.IsShift();
xub_StrLen nCursorPos = (xub_StrLen)aOldSel.Max();
@@ -637,7 +637,7 @@ static sal_Bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
if ( nNewPos < rEditMask.getLength() )
{
- xub_Unicode cPattChar = ImplPatternChar( cChar, rEditMask[nNewPos] );
+ sal_Unicode cPattChar = ImplPatternChar( cChar, rEditMask[nNewPos] );
if ( cPattChar )
cChar = cPattChar;
else
@@ -1069,7 +1069,7 @@ static String ImplGetDateSep( const LocaleDataWrapper& rLocaleDataWrapper, ExtDa
static sal_Bool ImplDateProcessKeyInput( Edit*, const KeyEvent& rKEvt, ExtDateFieldFormat eFormat,
const LocaleDataWrapper& rLocaleDataWrapper )
{
- xub_Unicode cChar = rKEvt.GetCharCode();
+ sal_Unicode cChar = rKEvt.GetCharCode();
sal_uInt16 nGroup = rKEvt.GetKeyCode().GetGroup();
if ( (nGroup == KEYGROUP_FKEYS) || (nGroup == KEYGROUP_CURSOR) ||
(nGroup == KEYGROUP_MISC)||
@@ -2163,7 +2163,7 @@ static sal_Bool ImplTimeProcessKeyInput( Edit*, const KeyEvent& rKEvt,
TimeFieldFormat eFormat,
const LocaleDataWrapper& rLocaleDataWrapper )
{
- xub_Unicode cChar = rKEvt.GetCharCode();
+ sal_Unicode cChar = rKEvt.GetCharCode();
if ( !bStrictFormat )
return sal_False;
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 1d0c14688c06..714f0db66e7b 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2735,7 +2735,7 @@ sal_Bool ImplListBox::HandleWheelAsCursorTravel( const CommandEvent& rCEvt )
// -----------------------------------------------------------------------
-void ImplListBox::SetMRUEntries( const rtl::OUString& rEntries, xub_Unicode cSep )
+void ImplListBox::SetMRUEntries( const rtl::OUString& rEntries, sal_Unicode cSep )
{
sal_Bool bChanges = GetEntryList()->GetMRUCount() ? sal_True : sal_False;
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index b3e308ef858d..67840f62030a 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -127,7 +127,7 @@ namespace vcl
//--------------------------------------------------------------------
bool QuickSelectionEngine::HandleKeyEvent( const KeyEvent& _keyEvent )
{
- xub_Unicode c = _keyEvent.GetCharCode();
+ sal_Unicode c = _keyEvent.GetCharCode();
if ( ( c >= 32 ) && ( c != 127 ) && !_keyEvent.GetKeyCode().IsMod2() )
{
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index a8062ecefbf3..efb978645fa1 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 045fb304b065..c67e8aa54a1d 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 c434ad0d776e..d73c93257c5c 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 d743b4dde64f..4a0451e29a3c 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 7cc160ac48b5..9b981402e8db 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 b9977ed4c44b..1d6d1e2efcc2 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 a1b2f81da56a..845663ebcb97 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 2920878724bc..b2a0b7906b6f 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 31a2270b728a..e4122cde7810 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 e5eace21e474..78455615a9f4 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 25bb9a21a734..d4a066346ec1 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;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 16:07:46 +0000