summaryrefslogtreecommitdiff
path: root/vcl/win
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-02-08 19:01:36 +0100
committerLuboš Luňák <l.lunak@suse.cz>2013-02-08 19:01:36 +0100
commit6db8d0ba581463dfe1a791404044e7b1a1051bfa (patch)
tree919702157a660ad925e3d6151fbf4465cd47d015 /vcl/win
parent895f272ed9301ce41966a17a5c212c0e16925241 (diff)
win-specific fixes for 9e310cc32923ceb4b18d97ce68d54a339b935f01
Diffstat (limited to 'vcl/win')
-rw-r--r--vcl/win/source/gdi/salgdi3.cxx2
-rw-r--r--vcl/win/source/window/salframe.cxx14
2 files changed, 8 insertions, 8 deletions
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 406fa3000d68..a410028ac3d2 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -1457,7 +1457,7 @@ void ImplGetLogFontFromFontSelect( HDC hDC,
LOGFONTW& rLogFont,
bool /*bTestVerticalAvail*/ )
{
- OUString aName;
+ UniString aName;
if ( pFont->mpFontData )
aName = pFont->mpFontData->GetFamilyName();
else
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 235436f797b6..e1dd2b31321e 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -5170,7 +5170,7 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame,
delete [] pTextBuf;
}
- aEvt.mnCursorPos = aEvt.maText.Len();
+ aEvt.mnCursorPos = aEvt.maText.getLength();
pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aEvt );
pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, (void*)NULL );
ImplUpdateIMECursorPos( pFrame, hIMC );
@@ -5205,7 +5205,7 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame,
if ( pAttrBuf )
{
- xub_StrLen nTextLen2 = aEvt.maText.Len();
+ xub_StrLen nTextLen2 = aEvt.maText.getLength();
pSalAttrAry = new sal_uInt16[nTextLen2];
memset( pSalAttrAry, 0, nTextLen2*sizeof( sal_uInt16 ) );
for ( xub_StrLen i = 0; (i < nTextLen2) && (i < nAttrLen); i++ )
@@ -5468,12 +5468,12 @@ static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam )
// Retrieve the surrounding text from the focused control.
pFrame->CallCallback( SALEVENT_SURROUNDINGTEXTREQUEST, (void*)&aEvt );
- if( aEvt.maText.Len() == 0 )
+ if( aEvt.maText.isEmpty())
{
return 0;
}
- nRet = sizeof(RECONVERTSTRING) + (aEvt.maText.Len() + 1) * sizeof(WCHAR);
+ nRet = sizeof(RECONVERTSTRING) + (aEvt.maText.getLength() + 1) * sizeof(WCHAR);
}
else
{
@@ -5481,16 +5481,16 @@ static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam )
// Retrieve the surrounding text from the focused control.
pFrame->CallCallback( SALEVENT_SURROUNDINGTEXTREQUEST, (void*)&aEvt );
- nRet = sizeof(RECONVERTSTRING) + (aEvt.maText.Len() + 1) * sizeof(WCHAR);
+ nRet = sizeof(RECONVERTSTRING) + (aEvt.maText.getLength() + 1) * sizeof(WCHAR);
pReconvertString->dwStrOffset = sizeof(RECONVERTSTRING);
- pReconvertString->dwStrLen = aEvt.maText.Len();
+ pReconvertString->dwStrLen = aEvt.maText.getLength();
pReconvertString->dwCompStrOffset = aEvt.mnStart * sizeof(WCHAR);
pReconvertString->dwCompStrLen = aEvt.mnEnd - aEvt.mnStart;
pReconvertString->dwTargetStrOffset = pReconvertString->dwCompStrOffset;
pReconvertString->dwTargetStrLen = pReconvertString->dwCompStrLen;
- memcpy( (LPWSTR)(pReconvertString + 1), aEvt.maText.GetBuffer(), (aEvt.maText.Len() + 1) * sizeof(WCHAR) );
+ memcpy( (LPWSTR)(pReconvertString + 1), aEvt.maText.getStr(), (aEvt.maText.getLength() + 1) * sizeof(WCHAR) );
}
// just return the required size of buffer to reconvert.