filter/source/xsltfilter/LibXSLTTransformer.cxx | 2 +-
sal/Module_sal.mk | 2 +-
vcl/win/source/window/salframe.cxx | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 845e8427fce66ad26a6b31219b9e1f13e7256c3f
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Jul 8 11:25:42 2014 +0300
Include <algorithm> for std::min() and max()
Change-Id: I88a590344292b4adf562ca83f5072d543b5924ad
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx
b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index de259dd..d0d850f 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -8,7 +8,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-
+#include <algorithm>
#include <cstdio>
#include <cstring>
#include <list>
commit b139eefeef9cfe3dd45228cd2b73d0cfd08d9bf3
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Jul 8 11:13:46 2014 +0300
Bypass CppunitTest_sal_osl_security with VS2013 for now, hangs
Change-Id: I8500b0cc4e541c96124425b713ba96226ff4715d
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 139ca5e..2cfbaee 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_Module_add_check_targets,sal,\
CppunitTest_sal_osl_file) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,CppunitTest_sal_osl_module) \
CppunitTest_sal_osl_old_test_file \
- CppunitTest_sal_osl_security \
+ $(if $(filter-out
MSC-120,$(COM)-$(VCVER)),CppunitTest_sal_osl_security) \
CppunitTest_sal_osl_thread \
CppunitTest_sal_rtl_alloc \
CppunitTest_sal_rtl_process \
commit eee44c951c104da342d55fd4de634efd51ae59ae
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
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index 9cd8fa2..e2620aa 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
