vcl/win/source/window/salframe.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b5ca532c6d9ebaf8ebe556e9f1cfdfb666f64526
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Jul 8 10:17:48 2014 +0300
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 <mst...@redhat.com>
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index d9f57b8..37ab712 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -4612,7 +4612,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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
