Revert "Revert "Generalize OUStringLiteral1""

This reverts commit 5cba714b4d03ed54debf71534ad8c8edc383a01e, now including a
workaround for <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53658> "internal
compiler error -- segmentation fault."

Change-Id: I31f6d9ddcb0b884134703df2b9dc1800ba0a84be

1 files changed, 14 insertions, 0 deletions

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