summaryrefslogtreecommitdiff
path: root/vcl/win/source
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-07-08 10:17:48 +0300
committerTor Lillqvist <tml@collabora.com>2014-07-08 11:38:53 +0300
commiteee44c951c104da342d55fd4de634efd51ae59ae (patch)
tree384e7b8d77c7a3be53f989bd9b4582553f35cfd2 /vcl/win/source
parent58ceb16141eb003d921049cc231578ff2d685e60 (diff)
Fix some OUString construction error with VS2013
A bit unclear to me whether the code really did what was intended with earlier VS versions either. VS2013 said: error C2664: 'rtl::OUString::OUString(const sal_uInt32 *,sal_Int32)' : cannot convert argument 1 from 'const char *' to 'const rtl::OUString &' Reason: cannot convert from 'const char *' to 'const rtl::OUString' No constructor could take the source type, or constructor overload resolution was ambiguous Change-Id: Ie23d8382515064062a3ed46418d9d4a977b35d28
Diffstat (limited to 'vcl/win/source')
-rw-r--r--vcl/win/source/window/salframe.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 9cd8fa2398cd..e2620aafd806 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -4441,7 +4441,7 @@ static int ImplMenuChar( HWND, WPARAM wParam, LPARAM lParam )
{
int nRet = MNC_IGNORE;
HMENU hMenu = (HMENU) lParam;
- OUString aMnemonic( "&" + (sal_Unicode) LOWORD(wParam) );
+ OUString aMnemonic( "&" + OUString((sal_Unicode) LOWORD(wParam)) );
aMnemonic = aMnemonic.toAsciiLowerCase(); // we only have ascii mnemonics
// search the mnemonic in the current menu