diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-07-08 10:17:48 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-07-10 11:11:08 +0200 |
| commit | 64b92ecbd55f243eb8b80849cc1eb44ff22cdb5e (patch) | |
| tree | 20df4cf0aced6429982a83c174da64151113ecb9 /vcl | |
| parent | b0973f1cc2c14e710993049b8641b7ae8094dc0d (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
(cherry picked from commit eee44c951c104da342d55fd4de634efd51ae59ae)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 31047bae7c50..5db4d8c2417f 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -4615,7 +4615,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 |