From 0b07406f7147b9abbb2095d9e038b13293cb8b10 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 18 Nov 2015 13:40:34 +0100 Subject: Use C++11 char16_t for sal_Unicode ...in LIBO_INTERNAL_ONLY, __cplusplus, non-MSVC case. It turns out that sal_Unicode happens to not be mangled into any symbols that make up the stable URE interface, so (for LIBO_INTERNAL_ONLY, at least) we are free to replace the typedef to sal_uInt16 with a typedef to any integral type layout-compatible with that. (sal_Unicode does appear in some symbols in sal's PRIVATE_textenc.1 section, but that is private between the sal and sal_textenc libraries, so changing those symbols does not require a change of SONAME.) C++11 chart16_t is the obvious choice (and will ultimately allow using u"..." to write literals of type array-of-sal_Unicode). Reportedly, char16_t is supported since GCC 4.4 and Clang 2.9 but will only be available in MSVC 2015. For plain C, we continue to use sal_uInt16. We could theoretically use C11 char16_t from , but at least the Mac OS X 10.11 SDK still does not offer that C11 header. For MSVC, we continue to use wchar_t (which is actually unsigned short, due to /Zc:wchar_t-) for now. Potential options there include dropping /Zc:wchar_t- and using true wchar_t, or using C++11 char16_t once support for MSVC 2013 is dropped. Some code needed to be adapted that was written in a way assuming that sal_Unicode is unsigned short (which indicates that changing sal_Unicode for non-LIBO_INTERNAL_ONLY would be an ABI change). OUStringBuffer::append can now differentiate between being called with sal_Unicode (to append a single character) and erroneously being called with sal_uInt16 (intending to append a number's textual representation, for which the sal_Int32 overload must be used instead). Bugs found are 379fe0409e7973b36210cffa3dd1dfd4032f0ecc "Assume that this code wants to append a number, not a character" and dc148335a6a438848325f24c49198fba81043279 "Assume this wants to append the numerical representation." The GDB support for pretty-printing of sal_Unicode-related data in solenv/gdb/libreoffice/sal.py can presumably be simplified now. Change-Id: I445b3a80e65b7cb004d9e08b38bdc9ee93bc9401 Reviewed-on: https://gerrit.libreoffice.org/20036 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann --- cppu/qa/test_unotype.cxx | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'cppu/qa') diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx index 27323371e28b..338c6f77103f 100644 --- a/cppu/qa/test_unotype.cxx +++ b/cppu/qa/test_unotype.cxx @@ -233,7 +233,11 @@ void Test::testUnoType() { } void Test::testGetTypeFavourUnsigned() { +#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode CPPUNIT_ASSERT(typeid(sal_Unicode) == typeid(sal_uInt16)); +#else + CPPUNIT_ASSERT(typeid(sal_Unicode) != typeid(sal_uInt16)); +#endif CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourUnsigned(static_cast(nullptr)), cppu::UnoType::get()); @@ -277,9 +281,15 @@ void Test::testGetTypeFavourUnsigned() { CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourUnsigned(static_cast(nullptr)), cppu::UnoType::get()); +#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourUnsigned(static_cast(nullptr)), cppu::UnoType::get()); +#else + CPPUNIT_ASSERT_EQUAL( + cppu::getTypeFavourUnsigned(static_cast(nullptr)), + cppu::UnoType::get()); +#endif CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourUnsigned(static_cast(nullptr)), cppu::UnoType::get()); @@ -316,6 +326,7 @@ void Test::testGetTypeFavourUnsigned() { cppu::UnoType< cppu::UnoSequenceType< cppu::UnoSequenceType>>::get()); +#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourUnsigned( static_cast *>(nullptr)), @@ -329,6 +340,20 @@ void Test::testGetTypeFavourUnsigned() { cppu::UnoType< cppu::UnoSequenceType< cppu::UnoSequenceType>>::get()); +#else + CPPUNIT_ASSERT_EQUAL( + cppu::getTypeFavourUnsigned( + static_cast *>(nullptr)), + cppu::UnoType>::get()); + CPPUNIT_ASSERT_EQUAL( + cppu::getTypeFavourUnsigned( + static_cast< + css::uno::Sequence< + css::uno::Sequence> *>(nullptr)), + cppu::UnoType< + cppu::UnoSequenceType< + cppu::UnoSequenceType>>::get()); +#endif CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourUnsigned( static_cast(nullptr)), @@ -399,7 +424,11 @@ void Test::testGetTypeFavourUnsigned() { } void Test::testGetTypeFavourChar() { +#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode CPPUNIT_ASSERT(typeid(sal_Unicode) == typeid(sal_uInt16)); +#else + CPPUNIT_ASSERT(typeid(sal_Unicode) != typeid(sal_uInt16)); +#endif CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourChar(static_cast(nullptr)), cppu::UnoType::get()); @@ -419,9 +448,15 @@ void Test::testGetTypeFavourChar() { cppu::getTypeFavourChar( static_cast(nullptr)), cppu::UnoType::get()); +#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourChar(static_cast(nullptr)), cppu::UnoType::get()); +#else + CPPUNIT_ASSERT_EQUAL( + cppu::getTypeFavourChar(static_cast(nullptr)), + cppu::UnoType::get()); +#endif CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourChar(static_cast(nullptr)), cppu::UnoType::get()); @@ -461,10 +496,18 @@ void Test::testGetTypeFavourChar() { cppu::UnoSequenceType *>(nullptr)), cppu::UnoType< cppu::UnoSequenceType>::get()); +#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourChar( static_cast *>(nullptr)), cppu::UnoType>::get()); +#else + CPPUNIT_ASSERT_EQUAL( + cppu::getTypeFavourChar( + static_cast *>(nullptr)), + cppu::UnoType< + cppu::UnoSequenceType>::get()); +#endif CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourChar( static_cast< @@ -474,6 +517,7 @@ void Test::testGetTypeFavourChar() { cppu::UnoType< cppu::UnoSequenceType< cppu::UnoSequenceType>>::get()); +#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourChar( static_cast< @@ -481,6 +525,15 @@ void Test::testGetTypeFavourChar() { cppu::UnoType< cppu::UnoSequenceType< cppu::UnoSequenceType>>::get()); +#else + CPPUNIT_ASSERT_EQUAL( + cppu::getTypeFavourChar( + static_cast< + css::uno::Sequence> *>(nullptr)), + cppu::UnoType< + cppu::UnoSequenceType< + cppu::UnoSequenceType>>::get()); +#endif CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourChar( static_cast *>(nullptr)), -- cgit