diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-07-08 10:17:48 +0300 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-08 09:55:03 +0000 |
| commit | cdce546b9746de0f42df8e8dad86008ff13c74e0 (patch) | |
| tree | 252b6958543cfa6038b341847aa1c13c6de4c866 /vcl | |
| parent | 30d5ee596d725377cec38cfc99e5d5891b42b35d (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)
Reviewed-on: https://gerrit.libreoffice.org/10133
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-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 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 |