summaryrefslogtreecommitdiff
path: root/vcl/win
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-10-14 09:54:50 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-10-14 11:54:59 +0100
commit7e7a487e904143cbc282a2b90c4cb3918bfa151f (patch)
treea3091c70d009ea75dd54c35540759aaec748fa91 /vcl/win
parentbe1ce88b8e5e06947e93146a052b0ba2c64dc479 (diff)
Related: fdo#38838 remove UniString::AppendAscii
Change-Id: I0f929843d73eb445c8b1aa56d59cbbce844b9008
Diffstat (limited to 'vcl/win')
-rw-r--r--vcl/win/source/window/salframe.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 95f88aa72757..963bce2b44f6 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -4675,14 +4675,14 @@ static int ImplMeasureItem( HWND hWnd, WPARAM wParam, LPARAM lParam )
HFONT hfntOld = (HFONT) SelectObject(hdc, (HFONT) CreateFontIndirect( &ncm.lfMenuFont ));
// menu text and accelerator
- String aStr(pSalMenuItem->mText);
+ OUString aStr(pSalMenuItem->mText);
if( pSalMenuItem->mAccelText.getLength() )
{
- aStr.AppendAscii(" ");
- aStr.Append( pSalMenuItem->mAccelText );
+ aStr += " ";
+ aStr += pSalMenuItem->mAccelText;
}
- GetTextExtentPoint32W( hdc, (LPWSTR) aStr.GetBuffer(),
- aStr.Len(), &strSize );
+ GetTextExtentPoint32W( hdc, (LPWSTR) aStr.getStr(),
+ aStr.getLength(), &strSize );
// image
Size bmpSize( 16, 16 );