ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

sal_Unicode is always char16_t in LIBO_INTERNAL_ONLY code now

Browse Source 
...since 9ac98e6e34 "Finally switch MSVC to
sal_Unicode = char16_t, too"

Change-Id: I0df169307618aba3f609400312737c6e1e1d3aaf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110581
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2021-02-08 15:59:10 +01:00
parent 624ba77285
commit 896800a709
1 changed files with 8 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cppu/qa/test_any.cxx
+8 -29
View File
@@ -20,7 +20,6 @@
#include <sal/types.h>
#include <stdlib.h>
#include <type_traits>
#include <cppunit/TestFixture.h>
#include <cppunit/plugin/TestPlugIn.h>
@@ -498,13 +497,8 @@ void Test::testByte() {
}
{
sal_Unicode b = '2';
if (std::is_same< sal_Unicode, sal_uInt16 >::value) {
CPPUNIT_ASSERT_MESSAGE("@sal_Unicode", (a >>= b));
CPPUNIT_ASSERT_EQUAL_MESSAGE("@sal_Unicode", u'\u0001', b);
} else {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b));
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b));
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
@@ -613,13 +607,8 @@ void Test::testShort() {
}
{
sal_Unicode b = '2';
if (std::is_same< sal_Unicode, sal_uInt16 >::value) {
CPPUNIT_ASSERT_MESSAGE("@sal_Unicode", (a >>= b));
CPPUNIT_ASSERT_EQUAL_MESSAGE("@sal_Unicode", u'\u0001', b);
} else {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b));
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b));
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
@@ -730,13 +719,8 @@ void Test::testUnsignedShort() {
}
{
sal_Unicode b = '2';
if (std::is_same< sal_Unicode, sal_uInt16 >::value) {
CPPUNIT_ASSERT_MESSAGE("@sal_Unicode", (a >>= b));
CPPUNIT_ASSERT_EQUAL_MESSAGE("@sal_Unicode", u'\u0001', b);
} else {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b));
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b));
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
OUString b("2");
@@ -1506,13 +1490,8 @@ void Test::testChar() {
}
{
sal_Unicode b = '2';
if (std::is_same< sal_Unicode, sal_uInt16 >::value) {
CPPUNIT_ASSERT_MESSAGE("@sal_Unicode", !(a >>= b));
CPPUNIT_ASSERT_EQUAL_MESSAGE("@sal_Unicode", u'2', b);
} else {
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", (a >>= b));
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'1', b);
}
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", (a >>= b));
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'1', b);
}
{
OUString b("2");