summaryrefslogtreecommitdiff
path: root/vcl/win
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-10-19 05:34:48 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-10-19 10:55:56 +0000
commit8eb5db89978547547510b2954918c9881eeecb52 (patch)
treea3b7bb76eb6b0aa6376fe54aa78d1ce8884a6f59 /vcl/win
parentbd5921b7371c41267ec42a2784778e7b34641ac5 (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/win')
-rw-r--r--vcl/win/source/gdi/salgdi3.cxx2
-rw-r--r--vcl/win/source/window/salframe.cxx8
2 files changed, 5 insertions, 5 deletions
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;