diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-10-19 05:34:48 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-10-19 10:55:56 +0000 |
| commit | 8eb5db89978547547510b2954918c9881eeecb52 (patch) | |
| tree | a3b7bb76eb6b0aa6376fe54aa78d1ce8884a6f59 /vcl/source/gdi/outdev3.cxx | |
| parent | bd5921b7371c41267ec42a2784778e7b34641ac5 (diff) | |
replace sxub_Unicode by sal_Unicode
Change-Id: Icf4b434a1961cc4964ee6e362491868e898a1831
Reviewed-on: https://gerrit.libreoffice.org/887
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'vcl/source/gdi/outdev3.cxx')
| -rw-r--r-- | vcl/source/gdi/outdev3.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
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 ) { |