diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-04-28 17:54:18 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-04-28 18:26:55 +0200 |
commit | 622057bf0b621b56dedce6439cefce28156786db (patch) | |
tree | c5bf01b069ccac97bf1027a7029eb38d92d21e89 /sw/qa | |
parent | d9917e2009598b5b7d938bfb04393cbf5cda2862 (diff) |
loplugin:salunicodeliteral: sw
Change-Id: I3ec5a60fff8577677eaa4977cddf69bec4078cec
Diffstat (limited to 'sw/qa')
-rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 8 | ||||
-rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 2 | ||||
-rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 8 | ||||
-rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 7c488f719d0d..ebec4c6174c8 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -809,13 +809,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf89890, "tdf89890.docx") DECLARE_OOXMLEXPORT_TEST(testTdf91594, "tdf91594.docx") { uno::Reference<text::XTextRange> xPara1(getParagraph(1)); - CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf0fb), xPara1->getString()[0] ); + CPPUNIT_ASSERT_EQUAL(u'\xf0fb', xPara1->getString()[0] ); uno::Reference<text::XTextRange> xPara2(getParagraph(2)); - CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf0fc), xPara2->getString()[0] ); + CPPUNIT_ASSERT_EQUAL(u'\xf0fc', xPara2->getString()[0] ); uno::Reference<text::XTextRange> xPara3(getParagraph(3)); - CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf0fd), xPara3->getString()[0] ); + CPPUNIT_ASSERT_EQUAL(u'\xf0fd', xPara3->getString()[0] ); uno::Reference<text::XTextRange> xPara4(getParagraph(4)); - CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf0fe), xPara4->getString()[0] ); + CPPUNIT_ASSERT_EQUAL(u'\xf0fe', xPara4->getString()[0] ); uno::Reference<beans::XPropertySet> xRun(getRun(xPara1,1), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(OUString("Wingdings"), getProperty<OUString>(xRun, "CharFontName")); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx index 15e1f05e629e..80c5f85cf055 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -357,7 +357,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf103651, "tdf103651.docx") OUString sContent; xTextField->getPropertyValue("Content") >>= sContent; // Comment in the first paragraph should not have smiley ( 0xf04a ). - CPPUNIT_ASSERT_EQUAL( sal_Int32( -1 ) , sContent.indexOf( sal_Unicode( 0xf04a ) )); + CPPUNIT_ASSERT_EQUAL( sal_Int32( -1 ) , sContent.indexOf( u'\xf04a' )); } DECLARE_OOXMLEXPORT_TEST(testTdf99227, "tdf99227.docx") diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 741ee50fa336..a314b212b81a 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1233,10 +1233,10 @@ DECLARE_OOXMLIMPORT_TEST(testTdf103664, "tdf103664.docx") { // Wingdings symbols were displayed as rectangles uno::Reference<text::XTextRange> xPara(getParagraph(1)); - CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf020), xPara->getString()[0] ); - CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf0fc), xPara->getString()[1] ); - CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf0dc), xPara->getString()[2] ); - CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf081), xPara->getString()[3] ); + CPPUNIT_ASSERT_EQUAL(u'\xf020', xPara->getString()[0] ); + CPPUNIT_ASSERT_EQUAL(u'\xf0fc', xPara->getString()[1] ); + CPPUNIT_ASSERT_EQUAL(u'\xf0dc', xPara->getString()[2] ); + CPPUNIT_ASSERT_EQUAL(u'\xf081', xPara->getString()[3] ); uno::Reference<beans::XPropertySet> xRun(getRun(xPara,1), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(OUString("Wingdings"), getProperty<OUString>(xRun, "CharFontName")); diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index a0c80b150825..598e4700b733 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -597,7 +597,7 @@ DECLARE_RTFIMPORT_TEST(testFdo49692, "fdo49692.rtf") if (rProp.Name == "Suffix") { - OUString aExpected(static_cast<sal_Unicode>(0x200B)); + OUString aExpected(u'\x200B'); CPPUNIT_ASSERT_EQUAL(aExpected, rProp.Value.get<OUString>()); } } @@ -1473,10 +1473,10 @@ DECLARE_RTFIMPORT_TEST(testFdo81033, "fdo81033.rtf") CPPUNIT_ASSERT_EQUAL(sal_Int32(2), tabs.getLength()); CPPUNIT_ASSERT_EQUAL(sal_Int32(5808), tabs[0].Position); CPPUNIT_ASSERT_EQUAL(style::TabAlign_LEFT, tabs[0].Alignment); - CPPUNIT_ASSERT_EQUAL(sal_Unicode(' '), tabs[0].FillChar); + CPPUNIT_ASSERT_EQUAL(u' ', tabs[0].FillChar); CPPUNIT_ASSERT_EQUAL(sal_Int32(16002), tabs[1].Position); CPPUNIT_ASSERT_EQUAL(style::TabAlign_LEFT, tabs[1].Alignment); - CPPUNIT_ASSERT_EQUAL(sal_Unicode('_'), tabs[1].FillChar); + CPPUNIT_ASSERT_EQUAL(u'_', tabs[1].FillChar); } DECLARE_RTFIMPORT_TEST(testFdo66565, "fdo66565.rtf") |