Make OUStringLiteral1 a wrapper around UTF-16 instead of just ASCII

...not merely an ASCII character

Change-Id: Id2b381b35fe3a15574728ed973d60263dfef7249
Reviewed-on: https://gerrit.libreoffice.org/28446
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index aa496a4779f1..ec4bbe244862 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -218,18 +218,20 @@ void test::oustring::StringLiterals::checkOUStringLiteral()
 void test::oustring::StringLiterals::checkOUStringLiteral1()
 {
     auto l1 = rtlunittest::OUStringLiteral1<'A'>();
-    CPPUNIT_ASSERT_EQUAL('A', l1.c);
+    CPPUNIT_ASSERT_EQUAL(sal_Unicode('A'), l1.c);
 
     char const c2 = 'A';
     auto l2 = rtlunittest::OUStringLiteral1<c2>();
-    CPPUNIT_ASSERT_EQUAL('A', l2.c);
+    CPPUNIT_ASSERT_EQUAL(sal_Unicode('A'), l2.c);
 
     // char c3 = 'A'; auto l3 = rtlunittest::OUStringLiteral1<c3>();
 
     auto l4 = rtlunittest::OUStringLiteral1<sal_Unicode('A')>();
-    CPPUNIT_ASSERT_EQUAL('A', l4.c);
+    CPPUNIT_ASSERT_EQUAL(sal_Unicode('A'), l4.c);
 
-    // auto l5 = rtlunittest::OUStringLiteral1<sal_Unicode(0x100)>();
+    sal_Unicode const c5 = 0x100;
+    auto l5 = rtlunittest::OUStringLiteral1<c5>();
+    CPPUNIT_ASSERT_EQUAL(c5, l5.c);
 
     rtl::OUString s1{rtlunittest::OUStringLiteral1<'A'>()};
     CPPUNIT_ASSERT_EQUAL(sal_Int32(1), s1.getLength());