sw/qa/extras/accessibility/accessible_relation_set.cxx | 5
sw/qa/extras/accessibility/basics.cxx | 27
sw/qa/extras/accessibility/dialogs.cxx | 20
sw/qa/extras/docbookexport/docbookexport.cxx | 4
sw/qa/extras/fodfexport/fodfexport.cxx | 9
sw/qa/extras/globalfilter/globalfilter.cxx | 448 ++---
sw/qa/extras/htmlexport/htmlexport.cxx | 606 +++----
sw/qa/extras/htmlexport/xhtmlexport.cxx | 18
sw/qa/extras/htmlimport/htmlimport.cxx | 158 -
sw/qa/extras/indexing/IndexingExportTest.cxx | 242 +-
sw/qa/extras/indexing/SearchResultLocatorTest.cxx | 2
sw/qa/extras/layout/layout.cxx | 1462 ++++++++---------
sw/qa/extras/layout/layout2.cxx | 629 +++----
sw/qa/extras/layout/layout3.cxx | 354 ++--
sw/qa/extras/mailmerge/mailmerge.cxx | 78
sw/qa/extras/mailmerge/mailmerge2.cxx | 72
sw/qa/extras/odfexport/odfexport.cxx | 1458 ++++++++--------
sw/qa/extras/odfexport/odfexport2.cxx | 720 ++++----
sw/qa/extras/odfimport/odfimport.cxx | 494 ++---
sw/qa/extras/ooxmlexport/ooxml_ThemeExport.cxx | 24
sw/qa/extras/ooxmlexport/ooxmlencryption.cxx | 10
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 422 ++--
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 248 +-
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 340 +--
sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 1174 ++++++-------
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 652 +++----
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 614 +++----
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 502 ++---
sw/qa/extras/ooxmlexport/ooxmlexport16.cxx | 342 +--
sw/qa/extras/ooxmlexport/ooxmlexport17.cxx | 454 ++---
sw/qa/extras/ooxmlexport/ooxmlexport18.cxx | 390 ++--
sw/qa/extras/ooxmlexport/ooxmlexport19.cxx | 376 ++--
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 446 ++---
sw/qa/extras/ooxmlexport/ooxmlexport20.cxx | 452 ++---
sw/qa/extras/ooxmlexport/ooxmlexport21.cxx | 383 ++--
sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 528 +++---
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 394 ++--
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 296 +--
sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 368 ++--
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 410 ++--
sw/qa/extras/ooxmlexport/ooxmlexport8.cxx | 324 +--
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 706 ++++----
sw/qa/extras/ooxmlexport/ooxmlexport_template.cxx | 13
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 358 ++--
sw/qa/extras/ooxmlexport/ooxmllinks.cxx | 46
sw/qa/extras/ooxmlexport/ooxmlw14export.cxx | 624 +++----
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 688 ++++----
sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 301 +--
sw/qa/extras/pdf/HybridPdfTest.cxx | 8
sw/qa/extras/rtfexport/rtfexport.cxx | 326 +--
sw/qa/extras/rtfexport/rtfexport2.cxx | 261 +--
sw/qa/extras/rtfexport/rtfexport3.cxx | 284 +--
sw/qa/extras/rtfexport/rtfexport4.cxx | 415 ++--
sw/qa/extras/rtfexport/rtfexport5.cxx | 335 ++-
sw/qa/extras/rtfexport/rtfexport6.cxx | 265 +--
sw/qa/extras/rtfexport/rtfexport8.cxx | 6
sw/qa/extras/rtfimport/rtfimport.cxx | 920 +++++-----
sw/qa/extras/tiledrendering/tiledrendering.cxx | 376 ++--
sw/qa/extras/tiledrendering2/tiledrendering2.cxx | 6
sw/qa/extras/txtencexport/txtencexport.cxx | 6
sw/qa/extras/txtexport/txtexport.cxx | 10
sw/qa/extras/txtimport/txtimport.cxx | 16
sw/qa/extras/uiwriter/uiwriter.cxx | 444 ++---
sw/qa/extras/uiwriter/uiwriter2.cxx | 1109 ++++++------
sw/qa/extras/uiwriter/uiwriter3.cxx | 776 ++++-----
sw/qa/extras/uiwriter/uiwriter4.cxx | 525 +++---
sw/qa/extras/uiwriter/uiwriter5.cxx | 1094 ++++++------
sw/qa/extras/uiwriter/uiwriter6.cxx | 523 +++---
sw/qa/extras/uiwriter/uiwriter7.cxx | 540 +++---
sw/qa/extras/uiwriter/uiwriter8.cxx | 998 +++++------
sw/qa/extras/uiwriter/uiwriter9.cxx | 102 -
sw/qa/extras/unowriter/unowriter.cxx | 351 ++--
sw/qa/extras/ww8export/ww8export.cxx | 458 ++---
sw/qa/extras/ww8export/ww8export2.cxx | 516 +++---
sw/qa/extras/ww8export/ww8export3.cxx | 510 ++---
sw/qa/extras/ww8export/ww8export4.cxx | 64
sw/qa/extras/ww8import/ww8import.cxx | 14
77 files changed, 15145 insertions(+), 14804 deletions(-)
New commits:
commit 3c41e714497fdb13cdcbc4d6ba31887d4aaa4b61
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Jun 10 08:57:37 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Jun 10 10:35:00 2024 +0200
loplugin:ostr in sw/qa/extras
Change-Id: Ia11b13ec7ed2402e717a4e64e7c7e4aa0b41d70f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168598
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/qa/extras/accessibility/accessible_relation_set.cxx
b/sw/qa/extras/accessibility/accessible_relation_set.cxx
index d23b5432af10..020c9256b92a 100644
--- a/sw/qa/extras/accessibility/accessible_relation_set.cxx
+++ b/sw/qa/extras/accessibility/accessible_relation_set.cxx
@@ -44,7 +44,7 @@ class AccessibleRelationSet : public UnoApiTest
{
public:
AccessibleRelationSet()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
{
}
@@ -62,7 +62,8 @@ void
AccessibleRelationSet::init(uno::Reference<css::accessibility::XAccessible>
uno::Reference<css::accessibility::XAccessible>& para2,
uno::Reference<css::accessibility::XAccessible>& para3)
{
- mxComponent = loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument");
+ mxComponent
+ = loadFromDesktop(u"private:factory/swriter"_ustr,
u"com.sun.star.text.TextDocument"_ustr);
uno::Reference<text::XTextDocument> xTextDoc(mxComponent, uno::UNO_QUERY);
css::uno::Reference<text::XText> oText(xTextDoc->getText(),
uno::UNO_SET_THROW);
diff --git a/sw/qa/extras/accessibility/basics.cxx
b/sw/qa/extras/accessibility/basics.cxx
index 6bdd992c22d0..a6006480c84e 100644
--- a/sw/qa/extras/accessibility/basics.cxx
+++ b/sw/qa/extras/accessibility/basics.cxx
@@ -24,15 +24,15 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase,
TestBasicStructure)
dumpA11YTree(xContext);
CPPUNIT_ASSERT_EQUAL(
-
rtl::OUString("<PARAGRAPH>String1</PARAGRAPH><PARAGRAPH/><PARAGRAPH/><PARAGRAPH/>"
- "<TABLE name=\"Table1-1\" description=\"Table1 on page
1\">"
- "<TABLE_CELL name=\"A1\" description=\"A1\">"
- "<PARAGRAPH>String2</PARAGRAPH>"
- "</TABLE_CELL>"
- "</TABLE>"
- "<PARAGRAPH/>"
- "<TEXT_FRAME
name=\"Frame1\"><PARAGRAPH>Frame1</PARAGRAPH></TEXT_FRAME>"
- "<TEXT_FRAME
name=\"Frame2\"><PARAGRAPH>Frame2</PARAGRAPH></TEXT_FRAME>"),
+ u"<PARAGRAPH>String1</PARAGRAPH><PARAGRAPH/><PARAGRAPH/><PARAGRAPH/>"
+ "<TABLE name=\"Table1-1\" description=\"Table1 on page 1\">"
+ "<TABLE_CELL name=\"A1\" description=\"A1\">"
+ "<PARAGRAPH>String2</PARAGRAPH>"
+ "</TABLE_CELL>"
+ "</TABLE>"
+ "<PARAGRAPH/>"
+ "<TEXT_FRAME
name=\"Frame1\"><PARAGRAPH>Frame1</PARAGRAPH></TEXT_FRAME>"
+ "<TEXT_FRAME
name=\"Frame2\"><PARAGRAPH>Frame2</PARAGRAPH></TEXT_FRAME>"_ustr,
collectText(xContext));
}
@@ -49,7 +49,7 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase,
TestTypeSimple)
documentPostKeyEvent(LOK_KEYEVENT_KEYINPUT, 'o', 0);
Scheduler::ProcessEventsToIdle();
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("<PARAGRAPH>hello</PARAGRAPH>"),
collectText(xContext));
+ CPPUNIT_ASSERT_EQUAL(u"<PARAGRAPH>hello</PARAGRAPH>"_ustr,
collectText(xContext));
}
CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestTypeMultiPara)
@@ -66,7 +66,7 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase,
TestTypeMultiPara)
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(
-
rtl::OUString("<PARAGRAPH>A</PARAGRAPH><PARAGRAPH>B</PARAGRAPH><PARAGRAPH>C</PARAGRAPH>"),
+
u"<PARAGRAPH>A</PARAGRAPH><PARAGRAPH>B</PARAGRAPH><PARAGRAPH>C</PARAGRAPH>"_ustr,
collectText(xContext));
}
@@ -74,7 +74,7 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase,
TestMenuInsertPageNumber)
{
load(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(activateMenuItem(u"Insert", u"Field", u"Page Number"));
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("<PARAGRAPH>1</PARAGRAPH>"),
collectText());
+ CPPUNIT_ASSERT_EQUAL(u"<PARAGRAPH>1</PARAGRAPH>"_ustr, collectText());
}
CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, TestMenuInsertPageBreak)
@@ -87,8 +87,7 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase,
TestMenuInsertPageBreak)
documentPostKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::DOWN);
CPPUNIT_ASSERT(activateMenuItem(u"Insert", u"Field", u"Page Number"));
-
CPPUNIT_ASSERT_EQUAL(rtl::OUString("<PARAGRAPH>1</PARAGRAPH><PARAGRAPH>2</PARAGRAPH>"),
- collectText());
+
CPPUNIT_ASSERT_EQUAL(u"<PARAGRAPH>1</PARAGRAPH><PARAGRAPH>2</PARAGRAPH>"_ustr,
collectText());
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/extras/accessibility/dialogs.cxx
b/sw/qa/extras/accessibility/dialogs.cxx
index 2e047fdf9d72..451b90ce1206 100644
--- a/sw/qa/extras/accessibility/dialogs.cxx
+++ b/sw/qa/extras/accessibility/dialogs.cxx
@@ -109,8 +109,7 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase,
BasicTestHyperlinkDialog)
CPPUNIT_ASSERT(activateMenuItem(u"Insert", u"Hyperlink..."));
CPPUNIT_ASSERT(dialogWaiter->waitEndDialog());
-
CPPUNIT_ASSERT_EQUAL(rtl::OUString("<PARAGRAPH>https://libreoffice.org/</PARAGRAPH>"),
- collectText());
+
CPPUNIT_ASSERT_EQUAL(u"<PARAGRAPH>https://libreoffice.org/</PARAGRAPH>"_ustr,
collectText());
}
CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, BasicTestBookmarkDialog)
@@ -133,8 +132,7 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase,
BasicTestBookmarkDialog)
CPPUNIT_ASSERT(activateMenuItem(u"Insert", u"Bookmark..."));
CPPUNIT_ASSERT(dialogWaiter->waitEndDialog());
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("<PARAGRAPH>#Test Bookmark 1 Bookmark
</PARAGRAPH>"),
- collectText());
+ CPPUNIT_ASSERT_EQUAL(u"<PARAGRAPH>#Test Bookmark 1 Bookmark
</PARAGRAPH>"_ustr, collectText());
}
CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, BasicTestSectionDialog)
@@ -152,7 +150,7 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase,
BasicTestSectionDialog)
CPPUNIT_ASSERT(activateMenuItem(u"Insert", u"Section..."));
CPPUNIT_ASSERT(dialogWaiter->waitEndDialog());
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("<PARAGRAPH/><PARAGRAPH/>"),
collectText());
+ CPPUNIT_ASSERT_EQUAL(u"<PARAGRAPH/><PARAGRAPH/>"_ustr, collectText());
}
CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, BasicTestFontworkDialog)
@@ -170,10 +168,9 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase,
BasicTestFontworkDialog)
CPPUNIT_ASSERT(activateMenuItem(u"Insert", u"Fontwork..."));
CPPUNIT_ASSERT(dialogWaiter->waitEndDialog());
- CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("<PARAGRAPH/><SHAPE name=\"Fontwork 1\" description=\"
\"><PARAGRAPH "
- "description=\"Paragraph: 0
Simple\">Simple</PARAGRAPH></SHAPE>"),
- collectText());
+ CPPUNIT_ASSERT_EQUAL(u"<PARAGRAPH/><SHAPE name=\"Fontwork 1\"
description=\" \"><PARAGRAPH "
+ "description=\"Paragraph: 0
Simple\">Simple</PARAGRAPH></SHAPE>"_ustr,
+ collectText());
}
CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase, BasicTestFrameDialog)
@@ -189,9 +186,8 @@ CPPUNIT_TEST_FIXTURE(test::SwAccessibleTestBase,
BasicTestFrameDialog)
CPPUNIT_ASSERT(activateMenuItem(u"Insert", u"Frame", u"Frame..."));
CPPUNIT_ASSERT(dialogWaiter->waitEndDialog());
- CPPUNIT_ASSERT_EQUAL(
- rtl::OUString("<PARAGRAPH/><TEXT_FRAME
name=\"Frame1\"><PARAGRAPH/></TEXT_FRAME>"),
- collectText());
+ CPPUNIT_ASSERT_EQUAL(u"<PARAGRAPH/><TEXT_FRAME
name=\"Frame1\"><PARAGRAPH/></TEXT_FRAME>"_ustr,
+ collectText());
}
#endif //defined(MACOSX)
diff --git a/sw/qa/extras/docbookexport/docbookexport.cxx
b/sw/qa/extras/docbookexport/docbookexport.cxx
index d454427df880..2a80507c0fb9 100644
--- a/sw/qa/extras/docbookexport/docbookexport.cxx
+++ b/sw/qa/extras/docbookexport/docbookexport.cxx
@@ -15,7 +15,7 @@ class DocbookExportTest : public SwModelTestBase
{
public:
DocbookExportTest() :
- SwModelTestBase("/sw/qa/extras/docbookexport/data/", "DocBook File")
+ SwModelTestBase(u"/sw/qa/extras/docbookexport/data/"_ustr, u"DocBook
File"_ustr)
{}
};
@@ -26,7 +26,7 @@ CPPUNIT_TEST_FIXTURE(DocbookExportTest, testsimple)
xmlDocUniquePtr pDoc = parseXml(maTempFile);
CPPUNIT_ASSERT(pDoc);
- assertXPathContent(pDoc, "/article/para"_ostr, "aaaa");
+ assertXPathContent(pDoc, "/article/para"_ostr, u"aaaa"_ustr);
}
/* the test actually should crash with this file */
diff --git a/sw/qa/extras/fodfexport/fodfexport.cxx
b/sw/qa/extras/fodfexport/fodfexport.cxx
index eefb35c6395e..3540176b010f 100644
--- a/sw/qa/extras/fodfexport/fodfexport.cxx
+++ b/sw/qa/extras/fodfexport/fodfexport.cxx
@@ -17,7 +17,8 @@ class Test : public SwModelTestBase
{
public:
Test()
- : SwModelTestBase("/sw/qa/extras/fodfexport/data/", "OpenDocument Text
Flat XML")
+ : SwModelTestBase(u"/sw/qa/extras/fodfexport/data/"_ustr,
+ u"OpenDocument Text Flat XML"_ustr)
{
}
};
@@ -29,7 +30,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf113696)
CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
- save("OpenDocument Text Flat XML");
+ save(u"OpenDocument Text Flat XML"_ustr);
// Test that an image which is written in svm format (image/x-vclgraphic)
// is accompanied by a png fallback graphic.
xmlDocUniquePtr pXmlDoc = parseExportedFile();
@@ -46,7 +47,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf113696WriterImage)
CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
- save("OpenDocument Text Flat XML");
+ save(u"OpenDocument Text Flat XML"_ustr);
// Same as testTdf113696, but with a writer image instead of a draw image
// (they use different code paths).
xmlDocUniquePtr pXmlDoc = parseExportedFile();
@@ -68,7 +69,7 @@ DECLARE_FODFEXPORT_TEST(testSvgImageRoundtrip,
"SvgImageTest.fodt")
uno::Reference<beans::XPropertySet> XPropertySet(xShape,
uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT(XPropertySet.is());
uno::Reference<graphic::XGraphic> xGraphic;
- XPropertySet->getPropertyValue("Graphic") >>= xGraphic;
+ XPropertySet->getPropertyValue(u"Graphic"_ustr) >>= xGraphic;
CPPUNIT_ASSERT(xGraphic.is());
Graphic aGraphic(xGraphic);
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx
b/sw/qa/extras/globalfilter/globalfilter.cxx
index d4ef7c16fd20..574f00be467d 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -43,7 +43,7 @@ namespace
class Test : public SwModelTestBase
{
public:
- Test() : SwModelTestBase("/sw/qa/extras/globalfilter/data/") {}
+ Test() : SwModelTestBase(u"/sw/qa/extras/globalfilter/data/"_ustr) {}
void testEmbeddedGraphicRoundtrip();
void testLinkedGraphicRT();
@@ -100,10 +100,10 @@ public:
void Test::testEmbeddedGraphicRoundtrip()
{
OUString aFilterNames[] = {
- "writer8",
- "Rich Text Format",
- "MS Word 97",
- "Office Open XML Text",
+ u"writer8"_ustr,
+ u"Rich Text Format"_ustr,
+ u"MS Word 97"_ustr,
+ u"Office Open XML Text"_ustr,
};
for (OUString const & rFilterName : aFilterNames)
@@ -126,7 +126,7 @@ void Test::testEmbeddedGraphicRoundtrip()
// Check graphic, size
{
uno::Reference<graphic::XGraphic> xGraphic;
- XPropSet->getPropertyValue("Graphic") >>= xGraphic;
+ XPropSet->getPropertyValue(u"Graphic"_ustr) >>= xGraphic;
CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xGraphic.is());
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
graphic::GraphicType::PIXEL, xGraphic->getType());
uno::Reference<awt::XBitmap> xBitmap(xGraphic, uno::UNO_QUERY);
@@ -142,7 +142,7 @@ void Test::testEmbeddedGraphicRoundtrip()
// Check graphic, size
{
uno::Reference<graphic::XGraphic> xGraphic;
- XPropSet->getPropertyValue("Graphic") >>= xGraphic;
+ XPropSet->getPropertyValue(u"Graphic"_ustr) >>= xGraphic;
CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xGraphic.is());
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
graphic::GraphicType::PIXEL, xGraphic->getType());
uno::Reference<awt::XBitmap> xBitmap(xGraphic, uno::UNO_QUERY);
@@ -156,10 +156,10 @@ void Test::testEmbeddedGraphicRoundtrip()
void Test::testLinkedGraphicRT()
{
const OUString aFilterNames[] = {
- "writer8",
+ u"writer8"_ustr,
// "Rich Text Format", Note: picture is there, but SwGrfNode is not
found?
- "MS Word 97",
- "Office Open XML Text",
+ u"MS Word 97"_ustr,
+ u"Office Open XML Text"_ustr,
};
for (OUString const & rFilterName : aFilterNames)
@@ -214,10 +214,10 @@ void Test::testImageWithSpecialID()
// which is generated by LO.
const OUString aFilterNames[] = {
- "writer8",
- "Rich Text Format",
- "MS Word 97",
- "Office Open XML Text",
+ u"writer8"_ustr,
+ u"Rich Text Format"_ustr,
+ u"MS Word 97"_ustr,
+ u"Office Open XML Text"_ustr,
};
for (OUString const & rFilterName : aFilterNames)
@@ -237,7 +237,7 @@ void Test::testImageWithSpecialID()
// Check graphic, size
{
uno::Reference<graphic::XGraphic> xGraphic;
- XPropSet->getPropertyValue("Graphic") >>= xGraphic;
+ XPropSet->getPropertyValue(u"Graphic"_ustr) >>= xGraphic;
CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xGraphic.is());
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
graphic::GraphicType::PIXEL, xGraphic->getType());
uno::Reference<awt::XBitmap> xBitmap(xGraphic, uno::UNO_QUERY);
@@ -253,7 +253,7 @@ void Test::testImageWithSpecialID()
// Check graphic, size
{
uno::Reference<graphic::XGraphic> xGraphic;
- XPropSet->getPropertyValue("Graphic") >>= xGraphic;
+ XPropSet->getPropertyValue(u"Graphic"_ustr) >>= xGraphic;
CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xGraphic.is());
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
graphic::GraphicType::PIXEL, xGraphic->getType());
uno::Reference<awt::XBitmap> xBitmap(xGraphic, uno::UNO_QUERY);
@@ -275,7 +275,7 @@ uno::Reference<drawing::XShape> lcl_getShape(const
uno::Reference<lang::XCompone
{
uno::Reference<beans::XPropertySet>
xShapeProperties(xDrawPage->getByIndex(i), uno::UNO_QUERY);
uno::Reference<graphic::XGraphic> xGraphic;
- xShapeProperties->getPropertyValue("Graphic") >>= xGraphic;
+ xShapeProperties->getPropertyValue(u"Graphic"_ustr) >>= xGraphic;
if (xGraphic.is())
{
Graphic aGraphic(xGraphic);
@@ -297,10 +297,10 @@ void Test::testGraphicShape()
// 2) graphic shape handled by SdrGrafObj (e.g. after copy&paste from
Impress).
const OUString aFilterNames[] = {
- "writer8",
- "Rich Text Format",
- "MS Word 97",
- "Office Open XML Text",
+ u"writer8"_ustr,
+ u"Rich Text Format"_ustr,
+ u"MS Word 97"_ustr,
+ u"Office Open XML Text"_ustr,
};
for (OUString const & rFilterName : aFilterNames)
@@ -321,7 +321,7 @@ void Test::testGraphicShape()
// Check size
{
uno::Reference<graphic::XGraphic> xGraphic;
- XPropSet->getPropertyValue("Graphic") >>= xGraphic;
+ XPropSet->getPropertyValue(u"Graphic"_ustr) >>= xGraphic;
CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xGraphic.is());
uno::Reference<awt::XBitmap> xBitmap(xGraphic, uno::UNO_QUERY);
CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xBitmap.is());
@@ -342,7 +342,7 @@ void Test::testGraphicShape()
// Check size
{
uno::Reference<graphic::XGraphic> xGraphic;
- XPropSet->getPropertyValue("Graphic") >>= xGraphic;
+ XPropSet->getPropertyValue(u"Graphic"_ustr) >>= xGraphic;
CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xGraphic.is());
Graphic aGraphic(xGraphic);
@@ -368,7 +368,7 @@ std::vector<uno::Reference<graphic::XGraphic>>
{
uno::Reference<beans::XPropertySet>
xShapeProperties(xDrawPage->getByIndex(i), uno::UNO_QUERY);
uno::Reference<graphic::XGraphic> xGraphic;
- xShapeProperties->getPropertyValue("Graphic") >>= xGraphic;
+ xShapeProperties->getPropertyValue(u"Graphic"_ustr) >>= xGraphic;
if (xGraphic.is())
{
aGraphics.push_back(xGraphic);
@@ -386,10 +386,10 @@ void Test::testMultipleIdenticalGraphics()
// works as expected.
const OUString aFilterNames[] {
- "writer8",
+ u"writer8"_ustr,
//"Rich Text Format", // doesn't work correctly for now
- "MS Word 97",
- "Office Open XML Text",
+ u"MS Word 97"_ustr,
+ u"Office Open XML Text"_ustr,
};
for (OUString const & rFilterName : aFilterNames)
@@ -428,10 +428,10 @@ void Test::testCharHighlightBody()
// MS filters handle these attributes separately, but ODF export merges
them into one background attribute
const OUString aFilterNames[] = {
- "writer8",
- "Rich Text Format",
- "MS Word 97",
- "Office Open XML Text",
+ u"writer8"_ustr,
+ u"Rich Text Format"_ustr,
+ u"MS Word 97"_ustr,
+ u"Office Open XML Text"_ustr,
};
for (OUString const & rFilterName : aFilterNames)
@@ -472,13 +472,13 @@ void Test::testCharHighlightBody()
if (rFilterName == "writer8")
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,"CharHighlight"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
nHighlightColor, getProperty<Color>(xRun,"CharBackColor"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,u"CharHighlight"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
nHighlightColor, getProperty<Color>(xRun,u"CharBackColor"_ustr));
}
else // MS filters
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
nHighlightColor, getProperty<Color>(xRun,"CharHighlight"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
nBackColor, getProperty<Color>(xRun,"CharBackColor"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
nHighlightColor, getProperty<Color>(xRun,u"CharHighlight"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
nBackColor, getProperty<Color>(xRun,u"CharBackColor"_ustr));
}
}
@@ -487,21 +487,21 @@ void Test::testCharHighlightBody()
const uno::Reference<beans::XPropertySet> xRun(getRun(xPara,18),
uno::UNO_QUERY);
if (rFilterName == "writer8")
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,"CharHighlight"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_LIGHTRED, getProperty<Color>(xRun,"CharBackColor"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,u"CharHighlight"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_LIGHTRED, getProperty<Color>(xRun,u"CharBackColor"_ustr));
}
else
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_LIGHTRED, getProperty<Color>(xRun,"CharHighlight"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,"CharBackColor"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_LIGHTRED, getProperty<Color>(xRun,u"CharHighlight"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,u"CharBackColor"_ustr));
}
}
// Only background
{
const uno::Reference<beans::XPropertySet> xRun(getRun(xPara,19),
uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,"CharHighlight"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_LIGHTBLUE, getProperty<Color>(xRun,"CharBackColor"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,u"CharHighlight"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_LIGHTBLUE, getProperty<Color>(xRun,u"CharBackColor"_ustr));
}
}
}
@@ -512,9 +512,9 @@ void Test::testCharStyleHighlight()
// However, their character style can only accept shading. It ignores the
highlighting value.
const OUString aFilterNames[] = {
- "Rich Text Format",
- "MS Word 97",
- "Office Open XML Text",
+ u"Rich Text Format"_ustr,
+ u"MS Word 97"_ustr,
+ u"Office Open XML Text"_ustr,
};
for (OUString const & rFilterName : aFilterNames)
@@ -527,12 +527,12 @@ void Test::testCharStyleHighlight()
saveAndReload(rFilterName);
uno::Reference<beans::XPropertySet> xCharStyle;
- getStyles("CharacterStyles")->getByName("charBackground") >>=
xCharStyle;
+ getStyles(u"CharacterStyles"_ustr)->getByName(u"charBackground"_ustr)
>>= xCharStyle;
const Color nBackColor(0xFFDBB6); //orange-y
// Always export character style's background colour as shading, never
as highlighting.
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), COL_TRANSPARENT,
getProperty<Color>(xCharStyle,"CharHighlight"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), nBackColor,
getProperty<Color>(xCharStyle,"CharBackColor"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), COL_TRANSPARENT,
getProperty<Color>(xCharStyle,u"CharHighlight"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), nBackColor,
getProperty<Color>(xCharStyle,u"CharBackColor"_ustr));
}
}
@@ -565,55 +565,55 @@ void Test::testCharHighlightODF()
switch (i)
{
case 1: // non-transparent highlight
- xRun->setPropertyValue("CharBackColor",
uno::Any(static_cast<sal_Int32>(128)));
- xRun->setPropertyValue("CharBackTransparent", uno::Any(true));
- xRun->setPropertyValue("CharHighlight",
uno::Any(static_cast<sal_Int32>(64)));
+ xRun->setPropertyValue(u"CharBackColor"_ustr,
uno::Any(static_cast<sal_Int32>(128)));
+ xRun->setPropertyValue(u"CharBackTransparent"_ustr,
uno::Any(true));
+ xRun->setPropertyValue(u"CharHighlight"_ustr,
uno::Any(static_cast<sal_Int32>(64)));
break;
case 2: // transparent backcolor
- xRun->setPropertyValue("CharBackColor",
uno::Any(static_cast<sal_Int32>(128)));
- xRun->setPropertyValue("CharBackTransparent", uno::Any(true));
- xRun->setPropertyValue("CharHighlight",
uno::Any(static_cast<sal_Int32>(COL_TRANSPARENT)));
+ xRun->setPropertyValue(u"CharBackColor"_ustr,
uno::Any(static_cast<sal_Int32>(128)));
+ xRun->setPropertyValue(u"CharBackTransparent"_ustr,
uno::Any(true));
+ xRun->setPropertyValue(u"CharHighlight"_ustr,
uno::Any(static_cast<sal_Int32>(COL_TRANSPARENT)));
break;
case 3: // non-transparent backcolor
- xRun->setPropertyValue("CharBackColor",
uno::Any(static_cast<sal_Int32>(128)));
- xRun->setPropertyValue("CharBackTransparent", uno::Any(false));
- xRun->setPropertyValue("CharHighlight",
uno::Any(static_cast<sal_Int32>(COL_TRANSPARENT)));
+ xRun->setPropertyValue(u"CharBackColor"_ustr,
uno::Any(static_cast<sal_Int32>(128)));
+ xRun->setPropertyValue(u"CharBackTransparent"_ustr,
uno::Any(false));
+ xRun->setPropertyValue(u"CharHighlight"_ustr,
uno::Any(static_cast<sal_Int32>(COL_TRANSPARENT)));
break;
case 4: // non-transparent highlight again
- xRun->setPropertyValue("CharBackColor",
uno::Any(static_cast<sal_Int32>(128)));
- xRun->setPropertyValue("CharBackTransparent", uno::Any(false));
- xRun->setPropertyValue("CharHighlight",
uno::Any(static_cast<sal_Int32>(64)));
+ xRun->setPropertyValue(u"CharBackColor"_ustr,
uno::Any(static_cast<sal_Int32>(128)));
+ xRun->setPropertyValue(u"CharBackTransparent"_ustr,
uno::Any(false));
+ xRun->setPropertyValue(u"CharHighlight"_ustr,
uno::Any(static_cast<sal_Int32>(64)));
break;
}
}
- saveAndReload("writer8");
+ saveAndReload(u"writer8"_ustr);
xPara.set(getParagraph(1));
for (int i = 1; i <= 4; ++i)
{
uno::Reference<beans::XPropertySet> xRun(getRun(xPara,i),
uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(COL_TRANSPARENT),
getProperty<sal_Int32>(xRun, "CharHighlight"));
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(COL_TRANSPARENT),
getProperty<sal_Int32>(xRun, u"CharHighlight"_ustr));
switch (i)
{
case 1: // non-transparent highlight
- CPPUNIT_ASSERT_EQUAL(Color(0x000040), getProperty<Color>(xRun,
"CharBackColor"));
- CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xRun,
"CharBackTransparent"));
+ CPPUNIT_ASSERT_EQUAL(Color(0x000040), getProperty<Color>(xRun,
u"CharBackColor"_ustr));
+ CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xRun,
u"CharBackTransparent"_ustr));
break;
case 2: // transparent backcolor
- CPPUNIT_ASSERT_EQUAL(COL_TRANSPARENT, getProperty<Color>(xRun,
"CharBackColor"));
- CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xRun,
"CharBackTransparent"));
+ CPPUNIT_ASSERT_EQUAL(COL_TRANSPARENT, getProperty<Color>(xRun,
u"CharBackColor"_ustr));
+ CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xRun,
u"CharBackTransparent"_ustr));
break;
case 3: // non-transparent backcolor
- CPPUNIT_ASSERT_EQUAL(COL_BLUE, getProperty<Color>(xRun,
"CharBackColor"));
- CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xRun,
"CharBackTransparent"));
+ CPPUNIT_ASSERT_EQUAL(COL_BLUE, getProperty<Color>(xRun,
u"CharBackColor"_ustr));
+ CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xRun,
u"CharBackTransparent"_ustr));
break;
case 4: // non-transparent highlight again
- CPPUNIT_ASSERT_EQUAL(Color(0x000040), getProperty<Color>(xRun,
"CharBackColor"));
- CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xRun,
"CharBackTransparent"));
+ CPPUNIT_ASSERT_EQUAL(Color(0x000040), getProperty<Color>(xRun,
u"CharBackColor"_ustr));
+ CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xRun,
u"CharBackTransparent"_ustr));
break;
}
}
@@ -625,10 +625,10 @@ void Test::testMSCharBackgroundEditing()
// and check how export behaves.
const OUString aFilterNames[] = {
- "writer8",
- "Rich Text Format",
- "MS Word 97",
- "Office Open XML Text",
+ u"writer8"_ustr,
+ u"Rich Text Format"_ustr,
+ u"MS Word 97"_ustr,
+ u"Office Open XML Text"_ustr,
};
auto batch = comphelper::ConfigurationChanges::create();
@@ -645,20 +645,20 @@ void Test::testMSCharBackgroundEditing()
uno::Reference< text::XTextRange > xPara = getParagraph(1);
{
uno::Reference<beans::XPropertySet> xRun(getRun(xPara,1),
uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,"CharHighlight"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_LIGHTRED, getProperty<Color>(xRun,"CharBackColor"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,u"CharHighlight"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_LIGHTRED, getProperty<Color>(xRun,u"CharBackColor"_ustr));
xRun.set(getRun(xPara,2), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_LIGHTBLUE, getProperty<Color>(xRun,"CharHighlight"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,"CharBackColor"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_LIGHTBLUE, getProperty<Color>(xRun,u"CharHighlight"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,u"CharBackColor"_ustr));
xRun.set(getRun(xPara,3), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_LIGHTBLUE, getProperty<Color>(xRun,"CharHighlight"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_LIGHTRED, getProperty<Color>(xRun,"CharBackColor"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_LIGHTBLUE, getProperty<Color>(xRun,u"CharHighlight"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_LIGHTRED, getProperty<Color>(xRun,u"CharBackColor"_ustr));
xRun.set(getRun(xPara,4), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,"CharHighlight"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,"CharBackColor"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,u"CharHighlight"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,u"CharBackColor"_ustr));
}
// Simulate editing
@@ -674,11 +674,11 @@ void Test::testMSCharBackgroundEditing()
case 3: nBackColor = COL_LIGHTGREEN; break; //green 0x00ff00
case 4: nBackColor = COL_LIGHTMAGENTA; break; //magenta
0xff00ff
}
- xRun->setPropertyValue("CharBackColor", uno::Any(nBackColor));
+ xRun->setPropertyValue(u"CharBackColor"_ustr,
uno::Any(nBackColor));
// Remove highlighting
- xRun->setPropertyValue("CharHighlight", uno::Any(COL_TRANSPARENT));
+ xRun->setPropertyValue(u"CharHighlight"_ustr,
uno::Any(COL_TRANSPARENT));
// Remove shading marker
- uno::Sequence<beans::PropertyValue> aGrabBag =
getProperty<uno::Sequence<beans::PropertyValue> >(xRun,"CharInteropGrabBag");
+ uno::Sequence<beans::PropertyValue> aGrabBag =
getProperty<uno::Sequence<beans::PropertyValue>
>(xRun,u"CharInteropGrabBag"_ustr);
for (beans::PropertyValue& rProp : asNonConstRange(aGrabBag))
{
if (rProp.Name == "CharShadingMarker")
@@ -687,7 +687,7 @@ void Test::testMSCharBackgroundEditing()
rProp.Value <<= false;
}
}
- xRun->setPropertyValue("CharInteropGrabBag", uno::Any(aGrabBag));
+ xRun->setPropertyValue(u"CharInteropGrabBag"_ustr,
uno::Any(aGrabBag));
}
// Export the document and import again for a check
@@ -708,13 +708,13 @@ void Test::testMSCharBackgroundEditing()
const uno::Reference<beans::XPropertySet> xRun(getRun(xPara,i),
uno::UNO_QUERY);
if (rFilterName == "writer8")
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,"CharHighlight"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
nBackColor, getProperty<Color>(xRun,"CharBackColor"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,u"CharHighlight"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
nBackColor, getProperty<Color>(xRun,u"CharBackColor"_ustr));
}
else
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
nBackColor, getProperty<Color>(xRun,"CharHighlight"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,"CharBackColor"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
nBackColor, getProperty<Color>(xRun,u"CharHighlight"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_TRANSPARENT, getProperty<Color>(xRun,u"CharBackColor"_ustr));
}
}
}
@@ -726,9 +726,9 @@ void Test::testCharBackgroundToHighlighting()
// to these values
const OUString aFilterNames[] = {
- "Rich Text Format",
- "MS Word 97",
- "Office Open XML Text",
+ u"Rich Text Format"_ustr,
+ u"MS Word 97"_ustr,
+ u"Office Open XML Text"_ustr,
};
for (OUString const & rFilterName : aFilterNames)
@@ -773,7 +773,7 @@ void Test::testCharBackgroundToHighlighting()
case 19: nHighlightColor = COL_YELLOW; break; //yellow 0xffff00
}
const OString sMessage = sFailedMessage +". Index of run with
unmatched color: " + OString::number(nRun);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sMessage.getStr(), nHighlightColor,
getProperty<Color>(xRun,"CharHighlight"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sMessage.getStr(), nHighlightColor,
getProperty<Color>(xRun,u"CharHighlight"_ustr));
}
}
}
@@ -816,7 +816,7 @@ void Test::testSkipImages()
XPropSet.set( xShape, uno::UNO_QUERY_THROW );
try
{
- XPropSet->getPropertyValue("Graphic") >>= xGraphic;
+ XPropSet->getPropertyValue(u"Graphic"_ustr) >>= xGraphic;
xBitmap.set(xGraphic, uno::UNO_QUERY);
if (xBitmap.is())
nImageCount++;
@@ -933,30 +933,30 @@ auto Test::verifyText13(char const*const pTestName) ->
void
{
// OFFICE-3789 style:header-first/style:footer-first
uno::Reference<beans::XPropertySet> xPageStyle;
- getStyles("PageStyles")->getByName("Standard") >>= xPageStyle;
- uno::Reference<text::XText>
xHF(getProperty<uno::Reference<text::XText>>(xPageStyle, "HeaderTextFirst"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(pTestName, OUString("Header first"),
xHF->getString());
- uno::Reference<text::XText>
xFF(getProperty<uno::Reference<text::XText>>(xPageStyle, "FooterTextFirst"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(pTestName, OUString("Footer first"),
xFF->getString());
+ getStyles(u"PageStyles"_ustr)->getByName(u"Standard"_ustr) >>= xPageStyle;
+ uno::Reference<text::XText>
xHF(getProperty<uno::Reference<text::XText>>(xPageStyle,
u"HeaderTextFirst"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(pTestName, u"Header first"_ustr,
xHF->getString());
+ uno::Reference<text::XText>
xFF(getProperty<uno::Reference<text::XText>>(xPageStyle,
u"FooterTextFirst"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(pTestName, u"Footer first"_ustr,
xFF->getString());
// OFFICE-3767 text:contextual-spacing
uno::Reference<text::XTextRange> xPara(getParagraph(1));
- CPPUNIT_ASSERT_MESSAGE(pTestName, getProperty<bool>(xPara,
"ParaContextMargin"));
+ CPPUNIT_ASSERT_MESSAGE(pTestName, getProperty<bool>(xPara,
u"ParaContextMargin"_ustr));
// OFFICE-3776 meta:creator-initials
uno::Reference<text::XTextRange> xRun(getRun(xPara, 1));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(pTestName, OUString("Annotation"),
getProperty<OUString>(xRun, "TextPortionType"));
- uno::Reference<beans::XPropertySet>
xComment(getProperty<uno::Reference<beans::XPropertySet>>(xRun, "TextField"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(pTestName, OUString("dj"),
getProperty<OUString>(xComment, "Initials"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(pTestName, u"Annotation"_ustr,
getProperty<OUString>(xRun, u"TextPortionType"_ustr));
+ uno::Reference<beans::XPropertySet>
xComment(getProperty<uno::Reference<beans::XPropertySet>>(xRun,
u"TextField"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(pTestName, u"dj"_ustr,
getProperty<OUString>(xComment, u"Initials"_ustr));
// OFFICE-3941 text:index-entry-link-start/text:index-entry-link-end
uno::Reference<text::XDocumentIndexesSupplier> xDIS(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xIndexes(xDIS->getDocumentIndexes());
uno::Reference<text::XDocumentIndex> xIndex(xIndexes->getByIndex(0),
uno::UNO_QUERY);
- uno::Reference<container::XIndexReplace>
xLevels(getProperty<uno::Reference<container::XIndexReplace>>(xIndex,
"LevelFormat"));
+ uno::Reference<container::XIndexReplace>
xLevels(getProperty<uno::Reference<container::XIndexReplace>>(xIndex,
u"LevelFormat"_ustr));
uno::Sequence<beans::PropertyValues> format;
xLevels->getByIndex(1) >>= format; // 1-based?
- CPPUNIT_ASSERT_EQUAL_MESSAGE(pTestName, OUString("TokenType"),
format[0][0].Name);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(pTestName, OUString("TokenHyperlinkStart"),
format[0][0].Value.get<OUString>());
- CPPUNIT_ASSERT_EQUAL_MESSAGE(pTestName, OUString("TokenType"),
format[4][0].Name);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(pTestName, OUString("TokenHyperlinkEnd"),
format[4][0].Value.get<OUString>());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(pTestName, u"TokenType"_ustr,
format[0][0].Name);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(pTestName, u"TokenHyperlinkStart"_ustr,
format[0][0].Value.get<OUString>());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(pTestName, u"TokenType"_ustr,
format[4][0].Name);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(pTestName, u"TokenHyperlinkEnd"_ustr,
format[4][0].Value.get<OUString>());
}
// test ODF 1.3 new text document features
@@ -982,10 +982,10 @@ void Test::testODF13()
officecfg::Office::Common::Save::ODF::DefaultVersion::set(10, pBatch);
pBatch->commit();
- saveAndReload("writer8");
+ saveAndReload(u"writer8"_ustr);
// check XML
- xmlDocUniquePtr pContentXml = parseExport("content.xml");
+ xmlDocUniquePtr pContentXml = parseExport(u"content.xml"_ustr);
assertXPath(pContentXml,
"/office:document-content/office:automatic-styles/style:style/style:paragraph-properties[@style:contextual-spacing='true']"_ostr);
assertXPath(pContentXml,
"/office:document-content/office:body/office:text/text:p/office:annotation/meta:creator-initials"_ostr);
assertXPath(pContentXml,
"/office:document-content/office:body/office:text/text:p/office:annotation/loext:sender-initials"_ostr,
0);
@@ -993,7 +993,7 @@ void Test::testODF13()
assertXPath(pContentXml,
"/office:document-content/office:body/office:text/text:illustration-index/text:illustration-index-source/text:illustration-index-entry-template/loext:index-entry-link-start"_ostr,
0);
assertXPath(pContentXml,
"/office:document-content/office:body/office:text/text:illustration-index/text:illustration-index-source/text:illustration-index-entry-template/text:index-entry-link-end"_ostr);
assertXPath(pContentXml,
"/office:document-content/office:body/office:text/text:illustration-index/text:illustration-index-source/text:illustration-index-entry-template/loext:index-entry-link-end"_ostr,
0);
- xmlDocUniquePtr pStylesXml = parseExport("styles.xml");
+ xmlDocUniquePtr pStylesXml = parseExport(u"styles.xml"_ustr);
assertXPath(pStylesXml,
"/office:document-styles/office:master-styles/style:master-page/style:header-first"_ostr);
assertXPath(pStylesXml,
"/office:document-styles/office:master-styles/style:master-page/loext:header-first"_ostr,
0);
assertXPath(pStylesXml,
"/office:document-styles/office:master-styles/style:master-page/style:footer-first"_ostr);
@@ -1012,13 +1012,13 @@ void Test::testODF13()
// FIXME: it's not possible to use 'reload' here because the
validation fails with
// Error: unexpected attribute "loext:contextual-spacing"
utl::MediaDescriptor aMediaDescriptor;
- aMediaDescriptor["FilterName"] <<= OUString("writer8");
+ aMediaDescriptor[u"FilterName"_ustr] <<= u"writer8"_ustr;
uno::Reference<frame::XStorable> const xStorable(mxComponent,
uno::UNO_QUERY);
xStorable->storeToURL(maTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
// check XML
- xmlDocUniquePtr pContentXml = parseExport("content.xml");
+ xmlDocUniquePtr pContentXml = parseExport(u"content.xml"_ustr);
assertXPath(pContentXml,
"/office:document-content/office:automatic-styles/style:style/style:paragraph-properties[@loext:contextual-spacing='true']"_ostr);
assertXPath(pContentXml,
"/office:document-content/office:body/office:text/text:p/office:annotation/loext:sender-initials"_ostr);
assertXPath(pContentXml,
"/office:document-content/office:body/office:text/text:p/office:annotation/meta:creator-initials"_ostr,
0);
@@ -1026,7 +1026,7 @@ void Test::testODF13()
assertXPath(pContentXml,
"/office:document-content/office:body/office:text/text:illustration-index/text:illustration-index-source/text:illustration-index-entry-template/text:index-entry-link-start"_ostr,
0);
assertXPath(pContentXml,
"/office:document-content/office:body/office:text/text:illustration-index/text:illustration-index-source/text:illustration-index-entry-template/loext:index-entry-link-end"_ostr);
assertXPath(pContentXml,
"/office:document-content/office:body/office:text/text:illustration-index/text:illustration-index-source/text:illustration-index-entry-template/text:index-entry-link-end"_ostr,
0);
- xmlDocUniquePtr pStylesXml = parseExport("styles.xml");
+ xmlDocUniquePtr pStylesXml = parseExport(u"styles.xml"_ustr);
assertXPath(pStylesXml,
"/office:document-styles/office:master-styles/style:master-page/loext:header-first"_ostr);
assertXPath(pStylesXml,
"/office:document-styles/office:master-styles/style:master-page/style:header-first"_ostr,
0);
assertXPath(pStylesXml,
"/office:document-styles/office:master-styles/style:master-page/loext:footer-first"_ostr);
@@ -1034,7 +1034,7 @@ void Test::testODF13()
// reload
mxComponent->dispose();
- mxComponent = loadFromDesktop(maTempFile.GetURL(),
"com.sun.star.text.TextDocument");
+ mxComponent = loadFromDesktop(maTempFile.GetURL(),
u"com.sun.star.text.TextDocument"_ustr);
// check model
verifyText13("1.2 Extended reload");
@@ -1047,10 +1047,10 @@ void Test::testODF13()
pBatch->commit();
// don't reload - no point
- save("writer8");
+ save(u"writer8"_ustr);
// check XML
- xmlDocUniquePtr pContentXml = parseExport("content.xml");
+ xmlDocUniquePtr pContentXml = parseExport(u"content.xml"_ustr);
assertXPathNoAttribute(pContentXml,
"/office:document-content/office:automatic-styles/style:style/style:paragraph-properties"_ostr,
"contextual-spacing"_ostr);
assertXPath(pContentXml,
"/office:document-content/office:body/office:text/text:p/office:annotation/meta:creator-initials"_ostr,
0);
assertXPath(pContentXml,
"/office:document-content/office:body/office:text/text:p/office:annotation/loext:sender-initials"_ostr,
0);
@@ -1058,7 +1058,7 @@ void Test::testODF13()
assertXPath(pContentXml,
"/office:document-content/office:body/office:text/text:illustration-index/text:illustration-index-source/text:illustration-index-entry-template/loext:index-entry-link-start"_ostr,
0);
assertXPath(pContentXml,
"/office:document-content/office:body/office:text/text:illustration-index/text:illustration-index-source/text:illustration-index-entry-template/text:index-entry-link-end"_ostr,
0);
assertXPath(pContentXml,
"/office:document-content/office:body/office:text/text:illustration-index/text:illustration-index-source/text:illustration-index-entry-template/loext:index-entry-link-end"_ostr,
0);
- xmlDocUniquePtr pStylesXml = parseExport("styles.xml");
+ xmlDocUniquePtr pStylesXml = parseExport(u"styles.xml"_ustr);
assertXPath(pStylesXml,
"/office:document-styles/office:master-styles/style:master-page/style:header-first"_ostr,
0);
assertXPath(pStylesXml,
"/office:document-styles/office:master-styles/style:master-page/loext:header-first"_ostr,
0);
assertXPath(pStylesXml,
"/office:document-styles/office:master-styles/style:master-page/style:footer-first"_ostr,
0);
@@ -1069,17 +1069,17 @@ void Test::testODF13()
void Test::testRedlineFlags()
{
const OUString aFilterNames[] = {
- "writer8",
- "Rich Text Format",
- "MS Word 97",
- "Office Open XML Text",
+ u"writer8"_ustr,
+ u"Rich Text Format"_ustr,
+ u"MS Word 97"_ustr,
+ u"Office Open XML Text"_ustr,
};
createSwDoc();
SwDoc* pDoc = getSwDoc();
SwPaM pam(SwPosition(pDoc->GetNodes().GetEndOfContent(),
SwNodeOffset(-1)));
- pDoc->getIDocumentContentOperations().InsertString(pam, "foo bar baz");
+ pDoc->getIDocumentContentOperations().InsertString(pam, u"foo bar
baz"_ustr);
IDocumentRedlineAccess & rIDRA(pDoc->getIDocumentRedlineAccess());
// enable change tracking
@@ -1112,10 +1112,10 @@ void Test::testRedlineFlags()
void Test::testBulletAsImage()
{
OUString aFilterNames[] = {
- "writer8",
- "MS Word 97",
- "Office Open XML Text",
- "Rich Text Format",
+ u"writer8"_ustr,
+ u"MS Word 97"_ustr,
+ u"Office Open XML Text"_ustr,
+ u"Rich Text Format"_ustr,
};
for (OUString const & rFilterName : aFilterNames)
@@ -1129,7 +1129,7 @@ void Test::testBulletAsImage()
uno::Reference<text::XTextRange> xPara(getParagraph(1));
uno::Reference<beans::XPropertySet> xPropertySet(xPara,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xLevels;
- xLevels.set(xPropertySet->getPropertyValue("NumberingRules"),
uno::UNO_QUERY);
+
xLevels.set(xPropertySet->getPropertyValue(u"NumberingRules"_ustr),
uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aProperties;
xLevels->getByIndex(0) >>= aProperties;
uno::Reference<awt::XBitmap> xBitmap;
@@ -1177,7 +1177,7 @@ void Test::testBulletAsImage()
uno::Reference<text::XTextRange> xPara(getParagraph(1));
uno::Reference<beans::XPropertySet> xPropertySet(xPara,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xLevels;
- xLevels.set(xPropertySet->getPropertyValue("NumberingRules"),
uno::UNO_QUERY);
+
xLevels.set(xPropertySet->getPropertyValue(u"NumberingRules"_ustr),
uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aProperties;
xLevels->getByIndex(0) >>= aProperties;
uno::Reference<awt::XBitmap> xBitmap;
@@ -1242,7 +1242,7 @@ CPPUNIT_TEST_FIXTURE(Test, testListLabelPDFExport)
uno::Reference<text::XText> xText(xDoc->getText());
uno::Reference<lang::XMultiServiceFactory> xFactory(mxComponent,
uno::UNO_QUERY_THROW);
uno::Reference<container::XIndexReplace> xNumRule(
- xFactory->createInstance("com.sun.star.text.NumberingRules"),
+ xFactory->createInstance(u"com.sun.star.text.NumberingRules"_ustr),
uno::UNO_QUERY_THROW);
OUString listFormat;
for (sal_Int32 i = 0; i < xNumRule->getCount(); ++i)
@@ -1270,19 +1270,19 @@ CPPUNIT_TEST_FIXTURE(Test, testListLabelPDFExport)
}
xNumRule->replaceByIndex(i, uno::Any(format));
}
- uno::Reference<beans::XPropertySet>(getParagraph(1),
uno::UNO_QUERY_THROW)->setPropertyValue("NumberingRules", uno::Any(xNumRule));
+ uno::Reference<beans::XPropertySet>(getParagraph(1),
uno::UNO_QUERY_THROW)->setPropertyValue(u"NumberingRules"_ustr,
uno::Any(xNumRule));
xText->insertControlCharacter(xText->getEnd(),
text::ControlCharacter::PARAGRAPH_BREAK, false);
- uno::Reference<beans::XPropertySet>(getParagraph(2),
uno::UNO_QUERY_THROW)->setPropertyValue("NumberingLevel",
uno::Any(sal_Int16(1)));
+ uno::Reference<beans::XPropertySet>(getParagraph(2),
uno::UNO_QUERY_THROW)->setPropertyValue(u"NumberingLevel"_ustr,
uno::Any(sal_Int16(1)));
xText->insertControlCharacter(xText->getEnd(),
text::ControlCharacter::PARAGRAPH_BREAK, false);
- uno::Reference<beans::XPropertySet>(getParagraph(3),
uno::UNO_QUERY_THROW)->setPropertyValue("NumberingLevel",
uno::Any(sal_Int16(2)));
+ uno::Reference<beans::XPropertySet>(getParagraph(3),
uno::UNO_QUERY_THROW)->setPropertyValue(u"NumberingLevel"_ustr,
uno::Any(sal_Int16(2)));
// check PDF export of the list items (label in particular)
utl::MediaDescriptor aMediaDescriptor;
- aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export");
+ aMediaDescriptor[u"FilterName"_ustr] <<= u"writer_pdf_Export"_ustr;
// Enable PDF/UA
uno::Sequence<beans::PropertyValue> aFilterData(
comphelper::InitPropertySequence({ { "PDFUACompliance", uno::Any(true)
} }));
- aMediaDescriptor["FilterData"] <<= aFilterData;
+ aMediaDescriptor[u"FilterData"_ustr] <<= aFilterData;
css::uno::Reference<frame::XStorable> xStorable(mxComponent,
css::uno::UNO_QUERY_THROW);
xStorable->storeToURL(maTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
@@ -1670,41 +1670,41 @@ CPPUNIT_TEST_FIXTURE(Test, testListLabelPDFExport)
CPPUNIT_TEST_FIXTURE(Test, testTdf143311)
{
createSwDoc("tdf143311-1.docx");
- CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getShape(1), "Decorative"));
+ CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getShape(1),
u"Decorative"_ustr));
{
// add another one that's a SdrObject
uno::Reference<css::lang::XMultiServiceFactory> xFactory(mxComponent,
uno::UNO_QUERY);
uno::Reference<drawing::XShape> xShape(
- xFactory->createInstance("com.sun.star.drawing.RectangleShape"),
uno::UNO_QUERY);
+
xFactory->createInstance(u"com.sun.star.drawing.RectangleShape"_ustr),
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xShapeProps(xShape,
uno::UNO_QUERY);
- xShapeProps->setPropertyValue("Decorative", uno::Any(true));
+ xShapeProps->setPropertyValue(u"Decorative"_ustr, uno::Any(true));
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage>
xDrawPage(xDrawPageSupplier->getDrawPage());
xDrawPage->add(xShape);
}
// check DOCX filters
- saveAndReload("Office Open XML Text");
- CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getShape(1), "Decorative"));
- CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getShape(2), "Decorative"));
+ saveAndReload(u"Office Open XML Text"_ustr);
+ CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getShape(1),
u"Decorative"_ustr));
+ CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getShape(2),
u"Decorative"_ustr));
{
// tdf#153925 not imported - check default and set it to test ODF
filters
- uno::Reference<beans::XPropertySet> const
xStyle(getStyles("FrameStyles")->getByName("Formula"), uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xStyle, "Decorative"));
- xStyle->setPropertyValue("Decorative", uno::Any(true));
+ uno::Reference<beans::XPropertySet> const
xStyle(getStyles(u"FrameStyles"_ustr)->getByName(u"Formula"_ustr),
uno::UNO_QUERY_THROW);
+ CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xStyle,
u"Decorative"_ustr));
+ xStyle->setPropertyValue(u"Decorative"_ustr, uno::Any(true));
}
// check ODF filters
- saveAndReload("writer8");
- CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getShape(1), "Decorative"));
- CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getShape(2), "Decorative"));
- CPPUNIT_ASSERT_EQUAL(true,
getProperty<bool>(getStyles("FrameStyles")->getByName("Formula"),
"Decorative"));
+ saveAndReload(u"writer8"_ustr);
+ CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getShape(1),
u"Decorative"_ustr));
+ CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getShape(2),
u"Decorative"_ustr));
+ CPPUNIT_ASSERT_EQUAL(true,
getProperty<bool>(getStyles(u"FrameStyles"_ustr)->getByName(u"Formula"_ustr),
u"Decorative"_ustr));
// check PDF export
utl::MediaDescriptor aMediaDescriptor;
- aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export");
+ aMediaDescriptor[u"FilterName"_ustr] <<= u"writer_pdf_Export"_ustr;
// Enable PDF/UA
uno::Sequence<beans::PropertyValue> aFilterData(
comphelper::InitPropertySequence({ { "PDFUACompliance", uno::Any(true)
} }));
- aMediaDescriptor["FilterData"] <<= aFilterData;
+ aMediaDescriptor[u"FilterData"_ustr] <<= aFilterData;
css::uno::Reference<frame::XStorable> xStorable(mxComponent,
css::uno::UNO_QUERY_THROW);
xStorable->storeToURL(maTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
@@ -1788,9 +1788,9 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf143311)
void Test::testTextFormField()
{
const OUString aFilterNames[] = {
- "writer8",
- "MS Word 97",
- "Office Open XML Text",
+ u"writer8"_ustr,
+ u"MS Word 97"_ustr,
+ u"Office Open XML Text"_ustr,
};
for (const OUString& rFilterName : aFilterNames)
@@ -1821,29 +1821,29 @@ void Test::testTextFormField()
// In the first paragraph we have an empty text form field with the
placeholder spaces
const uno::Reference< text::XTextRange > xPara = getParagraph(1);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("TextFieldStart"), getProperty<OUString>(getRun(xPara, 1),
"TextPortionType"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("TextFieldSeparator"), getProperty<OUString>(getRun(xPara, 2),
"TextPortionType"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("Text"), getProperty<OUString>(getRun(xPara, 3), "TextPortionType"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"TextFieldStart"_ustr, getProperty<OUString>(getRun(xPara, 1),
u"TextPortionType"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"TextFieldSeparator"_ustr, getProperty<OUString>(getRun(xPara, 2),
u"TextPortionType"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), u"Text"_ustr,
getProperty<OUString>(getRun(xPara, 3), u"TextPortionType"_ustr));
sal_Unicode vEnSpaces[5] = {8194, 8194, 8194, 8194, 8194};
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString(vEnSpaces, 5), getRun(xPara, 3)->getString());
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("TextFieldEnd"), getProperty<OUString>(getRun(xPara, 4),
"TextPortionType"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"TextFieldEnd"_ustr, getProperty<OUString>(getRun(xPara, 4),
u"TextPortionType"_ustr));
// In the second paragraph we have a set text
const uno::Reference< text::XTextRange > xPara2 = getParagraph(2);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("TextFieldStart"), getProperty<OUString>(getRun(xPara2, 1),
"TextPortionType"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("TextFieldSeparator"), getProperty<OUString>(getRun(xPara2, 2),
"TextPortionType"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("Text"), getProperty<OUString>(getRun(xPara2, 3), "TextPortionType"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("xxxxx"), getRun(xPara2, 3)->getString());
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("TextFieldEnd"), getProperty<OUString>(getRun(xPara2, 4),
"TextPortionType"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"TextFieldStart"_ustr, getProperty<OUString>(getRun(xPara2, 1),
u"TextPortionType"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"TextFieldSeparator"_ustr, getProperty<OUString>(getRun(xPara2, 2),
u"TextPortionType"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), u"Text"_ustr,
getProperty<OUString>(getRun(xPara2, 3), u"TextPortionType"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), u"xxxxx"_ustr,
getRun(xPara2, 3)->getString());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"TextFieldEnd"_ustr, getProperty<OUString>(getRun(xPara2, 4),
u"TextPortionType"_ustr));
}
}
void Test::testCheckBoxFormField()
{
const OUString aFilterNames[] = {
- "writer8",
- "MS Word 97",
- "Office Open XML Text",
+ u"writer8"_ustr,
+ u"MS Word 97"_ustr,
+ u"Office Open XML Text"_ustr,
};
for (const OUString& rFilterName : aFilterNames)
@@ -1894,9 +1894,9 @@ void Test::testCheckBoxFormField()
void Test::testDropDownFormField()
{
const OUString aFilterNames[] = {
- "writer8",
- "MS Word 97",
- "Office Open XML Text",
+ u"writer8"_ustr,
+ u"MS Word 97"_ustr,
+ u"Office Open XML Text"_ustr,
};
for (const OUString& rFilterName : aFilterNames)
@@ -1956,10 +1956,10 @@ void Test::testDropDownFormField()
{
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
sal_Int32(4), vListEntries.getLength());
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
sal_Int32(1), nSelection);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("1000"), vListEntries[0]);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("2000"), vListEntries[1]);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("3000"), vListEntries[2]);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("4000"), vListEntries[3]);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"1000"_ustr, vListEntries[0]);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"2000"_ustr, vListEntries[1]);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"3000"_ustr, vListEntries[2]);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"4000"_ustr, vListEntries[3]);
}
++nIndex;
}
@@ -1970,8 +1970,8 @@ void Test::testDropDownFormField()
void Test::testDateFormField()
{
const OUString aFilterNames[] = {
- "writer8",
- "Office Open XML Text",
+ u"writer8"_ustr,
+ u"Office Open XML Text"_ustr,
};
for (const OUString& rFilterName : aFilterNames)
@@ -2022,8 +2022,8 @@ void Test::testDateFormField()
if(nIndex == 0)
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("MM/DD/YY"), sDateFormat);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("en-US"), sLang);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"MM/DD/YY"_ustr, sDateFormat);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"en-US"_ustr, sLang);
sal_Unicode vEnSpaces[ODF_FORMFIELD_DEFAULT_LENGTH] =
{8194, 8194, 8194, 8194, 8194};
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString(vEnSpaces, 5), sCurrentDate);
@@ -2032,18 +2032,18 @@ void Test::testDateFormField()
}
else if (nIndex == 1) // The second has the default format
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("MM/DD/YY"), sDateFormat);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("en-US"), sLang);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("06/12/19"), sCurrentDate);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"MM/DD/YY"_ustr, sDateFormat);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"en-US"_ustr, sLang);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"06/12/19"_ustr, sCurrentDate);
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
SwNodeOffset(9), pFieldmark->GetMarkStart().GetNodeIndex());
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
sal_Int32(20), pFieldmark->GetMarkStart().GetContentIndex());
}
else if (nIndex == 2) // The third one has special format
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("[NatNum12 MMMM=abbreviation]YYYY\". \"MMMM D."), sDateFormat);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("hu-HU"), sLang);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("2019. febr. 12."), sCurrentDate);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"[NatNum12 MMMM=abbreviation]YYYY\". \"MMMM D."_ustr, sDateFormat);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"hu-HU"_ustr, sLang);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"2019. febr. 12."_ustr, sCurrentDate);
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
SwNodeOffset(9), pFieldmark->GetMarkStart().GetNodeIndex());
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
sal_Int32(40), pFieldmark->GetMarkStart().GetContentIndex());
@@ -2051,9 +2051,9 @@ void Test::testDateFormField()
}
else if (nIndex == 3) // The fourth one has placeholder text
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("D, MMM YY"), sDateFormat);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("bm-ML"), sLang);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("[select date]"), sCurrentDate);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), u"D,
MMM YY"_ustr, sDateFormat);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"bm-ML"_ustr, sLang);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"[select date]"_ustr, sCurrentDate);
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
SwNodeOffset(9), pFieldmark->GetMarkStart().GetNodeIndex());
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
sal_Int32(62), pFieldmark->GetMarkStart().GetContentIndex());
@@ -2061,9 +2061,9 @@ void Test::testDateFormField()
}
else // The last one is really empty
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("MM/DD/YY"), sDateFormat);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("en-US"), sLang);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString(""), sCurrentDate);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"MM/DD/YY"_ustr, sDateFormat);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"en-US"_ustr, sLang);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u""_ustr, sCurrentDate);
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
SwNodeOffset(9), pFieldmark->GetMarkStart().GetNodeIndex());
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
sal_Int32(82), pFieldmark->GetMarkStart().GetContentIndex());
@@ -2084,26 +2084,26 @@ void Test::testDateFormField()
{
uno::Reference<beans::XPropertySet>
xTextPortion(xTextPortions->nextElement(), uno::UNO_QUERY);
OUString aPortionType;
- xTextPortion->getPropertyValue("TextPortionType") >>=
aPortionType;
+ xTextPortion->getPropertyValue(u"TextPortionType"_ustr) >>=
aPortionType;
if (aPortionType != "ContentControl")
{
continue;
}
uno::Reference<text::XTextContent> xContentControl;
- xTextPortion->getPropertyValue("ContentControl") >>=
xContentControl;
+ xTextPortion->getPropertyValue(u"ContentControl"_ustr) >>=
xContentControl;
uno::Reference<beans::XPropertySet>
xContentControlProps(xContentControl, uno::UNO_QUERY);
bool bDate{};
- xContentControlProps->getPropertyValue("Date") >>= bDate;
+ xContentControlProps->getPropertyValue(u"Date"_ustr) >>= bDate;
CPPUNIT_ASSERT(bDate);
// Check date form field's parameters.
OUString sDateFormat;
- xContentControlProps->getPropertyValue("DateFormat") >>=
sDateFormat;
+ xContentControlProps->getPropertyValue(u"DateFormat"_ustr) >>=
sDateFormat;
OUString sLang;
- xContentControlProps->getPropertyValue("DateLanguage") >>=
sLang;
+ xContentControlProps->getPropertyValue(u"DateLanguage"_ustr)
>>= sLang;
uno::Reference<container::XEnumerationAccess>
xContentControlEnumAccess(xContentControl,
uno::UNO_QUERY);
@@ -2115,34 +2115,34 @@ void Test::testDateFormField()
// The first one has the default field content
if(nIndex == 0)
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("MM/DD/YY"), sDateFormat);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("en-US"), sLang);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"MM/DD/YY"_ustr, sDateFormat);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"en-US"_ustr, sLang);
sal_Unicode vEnSpaces[ODF_FORMFIELD_DEFAULT_LENGTH] =
{8194, 8194, 8194, 8194, 8194};
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString(vEnSpaces, 5), sCurrentDate);
}
else if (nIndex == 1) // The second has the default format
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("MM/DD/YY"), sDateFormat);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("en-US"), sLang);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("06/12/19"), sCurrentDate);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"MM/DD/YY"_ustr, sDateFormat);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"en-US"_ustr, sLang);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"06/12/19"_ustr, sCurrentDate);
}
else if (nIndex == 2) // The third one has special format
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("[NatNum12 MMMM=abbreviation]YYYY\". \"MMMM D."), sDateFormat);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("hu-HU"), sLang);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("2019. febr. 12."), sCurrentDate);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"[NatNum12 MMMM=abbreviation]YYYY\". \"MMMM D."_ustr, sDateFormat);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"hu-HU"_ustr, sLang);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"2019. febr. 12."_ustr, sCurrentDate);
}
else if (nIndex == 3) // The fourth one has placeholder text
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("D, MMM YY"), sDateFormat);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("bm-ML"), sLang);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("[select date]"), sCurrentDate);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), u"D,
MMM YY"_ustr, sDateFormat);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"bm-ML"_ustr, sLang);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"[select date]"_ustr, sCurrentDate);
}
else // The last one is really empty
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("MM/DD/YY"), sDateFormat);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString("en-US"), sLang);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
OUString(""), sCurrentDate);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"MM/DD/YY"_ustr, sDateFormat);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u"en-US"_ustr, sLang);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
u""_ustr, sCurrentDate);
}
++nIndex;
}
@@ -2154,8 +2154,8 @@ void Test::testDateFormField()
void Test::testDateFormFieldCharacterFormatting()
{
const OUString aFilterNames[] = {
- "writer8",
- "Office Open XML Text",
+ u"writer8"_ustr,
+ u"Office Open XML Text"_ustr,
};
for (const OUString& rFilterName : aFilterNames)
@@ -2184,23 +2184,23 @@ void Test::testDateFormFieldCharacterFormatting()
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
sal_Int32(11), pFieldmark->GetMarkEnd().GetContentIndex());
// We have one date field, first half of the field has bold
character weight and second part has red character color
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
awt::FontWeight::BOLD, getProperty<float>(getRun(getParagraph(1), 3),
"CharWeight"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), COL_AUTO,
getProperty<Color>(getRun(getParagraph(1), 3), "CharColor"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
awt::FontWeight::NORMAL, getProperty<float>(getRun(getParagraph(1), 4),
"CharWeight"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_LIGHTRED, getProperty<Color>(getRun(getParagraph(1), 4), "CharColor"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
awt::FontWeight::BOLD, getProperty<float>(getRun(getParagraph(1), 3),
u"CharWeight"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), COL_AUTO,
getProperty<Color>(getRun(getParagraph(1), 3), u"CharColor"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
awt::FontWeight::NORMAL, getProperty<float>(getRun(getParagraph(1), 4),
u"CharWeight"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_LIGHTRED, getProperty<Color>(getRun(getParagraph(1), 4),
u"CharColor"_ustr));
}
else
{
uno::Reference<beans::XPropertySet>
xTextPortion(getRun(getParagraph(1), 1), uno::UNO_QUERY);
OUString aPortionType;
- xTextPortion->getPropertyValue("TextPortionType") >>= aPortionType;
- CPPUNIT_ASSERT_EQUAL(OUString("ContentControl"), aPortionType);
+ xTextPortion->getPropertyValue(u"TextPortionType"_ustr) >>=
aPortionType;
+ CPPUNIT_ASSERT_EQUAL(u"ContentControl"_ustr, aPortionType);
uno::Reference<text::XTextContent> xContentControl;
- xTextPortion->getPropertyValue("ContentControl") >>=
xContentControl;
+ xTextPortion->getPropertyValue(u"ContentControl"_ustr) >>=
xContentControl;
uno::Reference<beans::XPropertySet>
xContentControlProps(xContentControl, uno::UNO_QUERY);
bool bDate{};
- xContentControlProps->getPropertyValue("Date") >>= bDate;
+ xContentControlProps->getPropertyValue(u"Date"_ustr) >>= bDate;
CPPUNIT_ASSERT(bDate);
uno::Reference<container::XEnumerationAccess>
xContentControlEnumAccess(xContentControl,
@@ -2208,11 +2208,11 @@ void Test::testDateFormFieldCharacterFormatting()
uno::Reference<container::XEnumeration> xContentControlEnum
= xContentControlEnumAccess->createEnumeration();
xTextPortion.set(xContentControlEnum->nextElement(),
uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
awt::FontWeight::BOLD, getProperty<float>(xTextPortion, "CharWeight"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), COL_AUTO,
getProperty<Color>(xTextPortion, "CharColor"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
awt::FontWeight::BOLD, getProperty<float>(xTextPortion, u"CharWeight"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), COL_AUTO,
getProperty<Color>(xTextPortion, u"CharColor"_ustr));
xTextPortion.set(xContentControlEnum->nextElement(),
uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
awt::FontWeight::NORMAL, getProperty<float>(xTextPortion, "CharWeight"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_LIGHTRED, getProperty<Color>(xTextPortion, "CharColor"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
awt::FontWeight::NORMAL, getProperty<float>(xTextPortion, u"CharWeight"_ustr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
COL_LIGHTRED, getProperty<Color>(xTextPortion, u"CharColor"_ustr));
}
}
}
@@ -2220,8 +2220,8 @@ void Test::testDateFormFieldCharacterFormatting()
void Test::testSvgImageSupport()
{
OUString aFilterNames[] = {
- "writer8",
- "Office Open XML Text",
+ u"writer8"_ustr,
+ u"Office Open XML Text"_ustr,
};
for (OUString const & rFilterName : aFilterNames)
@@ -2246,7 +2246,7 @@ void Test::testSvgImageSupport()
// Convert to a XGraphic
uno::Reference<graphic::XGraphic> xGraphic;
- xPropertySet->getPropertyValue("Graphic") >>= xGraphic;
+ xPropertySet->getPropertyValue(u"Graphic"_ustr) >>= xGraphic;
CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xGraphic.is());
// Access the Graphic
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index b3297ad815fe..02f0fd654620 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -191,7 +191,7 @@ class HtmlExportTest : public SwModelTestBase, public
HtmlTestTools
{
public:
HtmlExportTest()
- : SwModelTestBase("/sw/qa/extras/htmlexport/data/", "HTML
(StarWriter)")
+ : SwModelTestBase(u"/sw/qa/extras/htmlexport/data/"_ustr, u"HTML
(StarWriter)"_ustr)
{
}
@@ -211,7 +211,7 @@ class SwHtmlDomExportTest : public SwModelTestBase, public
HtmlTestTools
{
public:
SwHtmlDomExportTest()
- : SwModelTestBase("/sw/qa/extras/htmlexport/data/")
+ : SwModelTestBase(u"/sw/qa/extras/htmlexport/data/"_ustr)
{
}
@@ -255,15 +255,15 @@ void SwHtmlDomExportTest::ParseOle1FromRtfUrl(const
OUString& rRtfUrl, SvMemoryS
void SwHtmlDomExportTest::ExportToReqif()
{
- setFilterOptions("xhtmlns=reqif-xhtml");
- save("HTML (StarWriter)");
+ setFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
+ save(u"HTML (StarWriter)"_ustr);
}
void SwHtmlDomExportTest::ExportToHTML()
{
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aStoreProperties = {
- comphelper::makePropertyValue("FilterName", OUString("HTML
(StarWriter)")),
+ comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML
(StarWriter)"_ustr),
};
xStorable->storeToURL(maTempFile.GetURL(), aStoreProperties);
}
@@ -271,24 +271,29 @@ void SwHtmlDomExportTest::ExportToHTML()
void SwHtmlDomExportTest::ImportFromReqif(const OUString& rUrl)
{
uno::Sequence<beans::PropertyValue> aLoadProperties = {
- comphelper::makePropertyValue("FilterName", OUString("HTML
(StarWriter)")),
- comphelper::makePropertyValue("FilterOptions",
OUString("xhtmlns=reqif-xhtml")),
+ comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML
(StarWriter)"_ustr),
+ comphelper::makePropertyValue(u"FilterOptions"_ustr,
u"xhtmlns=reqif-xhtml"_ustr),
};
- mxComponent = loadFromDesktop(rUrl, "com.sun.star.text.TextDocument",
aLoadProperties);
+ mxComponent = loadFromDesktop(rUrl,
u"com.sun.star.text.TextDocument"_ustr, aLoadProperties);
}
CPPUNIT_TEST_FIXTURE(HtmlExportTest, testFdo81276)
{
auto verify = [this]() {
- uno::Reference<container::XNameAccess>
xPageStyles(getStyles("PageStyles"));
- uno::Reference<beans::XPropertySet>
xStyle(xPageStyles->getByName("HTML"), uno::UNO_QUERY);
+ uno::Reference<container::XNameAccess>
xPageStyles(getStyles(u"PageStyles"_ustr));
+ uno::Reference<beans::XPropertySet>
xStyle(xPageStyles->getByName(u"HTML"_ustr),
+ uno::UNO_QUERY);
// some rounding going on here?
- CPPUNIT_ASSERT(abs(sal_Int32(29700) - getProperty<sal_Int32>(xStyle,
"Width")) < 10);
- CPPUNIT_ASSERT(abs(sal_Int32(21006) - getProperty<sal_Int32>(xStyle,
"Height")) < 10);
- CPPUNIT_ASSERT(abs(sal_Int32(500) - getProperty<sal_Int32>(xStyle,
"LeftMargin")) < 10);
- CPPUNIT_ASSERT(abs(sal_Int32(500) - getProperty<sal_Int32>(xStyle,
"RightMargin")) < 10);
- CPPUNIT_ASSERT(abs(sal_Int32(2000) - getProperty<sal_Int32>(xStyle,
"TopMargin")) < 10);
- CPPUNIT_ASSERT(abs(sal_Int32(500) - getProperty<sal_Int32>(xStyle,
"BottomMargin")) < 10);
+ CPPUNIT_ASSERT(abs(sal_Int32(29700) - getProperty<sal_Int32>(xStyle,
u"Width"_ustr)) < 10);
+ CPPUNIT_ASSERT(abs(sal_Int32(21006) - getProperty<sal_Int32>(xStyle,
u"Height"_ustr)) < 10);
+ CPPUNIT_ASSERT(abs(sal_Int32(500) - getProperty<sal_Int32>(xStyle,
u"LeftMargin"_ustr))
+ < 10);
+ CPPUNIT_ASSERT(abs(sal_Int32(500) - getProperty<sal_Int32>(xStyle,
u"RightMargin"_ustr))
+ < 10);
+ CPPUNIT_ASSERT(abs(sal_Int32(2000) - getProperty<sal_Int32>(xStyle,
u"TopMargin"_ustr))
+ < 10);
+ CPPUNIT_ASSERT(abs(sal_Int32(500) - getProperty<sal_Int32>(xStyle,
u"BottomMargin"_ustr))
+ < 10);
};
setImportFilterName(mpFilter);
createSwDoc("fdo81276.html");
@@ -309,17 +314,18 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testFdo86857)
{
auto verify = [this]() {
// problem was that background color on page style was not exported
- uno::Reference<container::XNameAccess>
xPageStyles(getStyles("PageStyles"));
- uno::Reference<beans::XPropertySet>
xStyle(xPageStyles->getByName("HTML"), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, getProperty<Color>(xStyle,
"BackColor"));
+ uno::Reference<container::XNameAccess>
xPageStyles(getStyles(u"PageStyles"_ustr));
+ uno::Reference<beans::XPropertySet>
xStyle(xPageStyles->getByName(u"HTML"_ustr),
+ uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, getProperty<Color>(xStyle,
u"BackColor"_ustr));
// check that table background color works, which still uses
RES_BACKGROUND
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xTables(xTablesSupplier->getTextTables(),
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
uno::Reference<text::XTextTable> xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
- uno::Reference<text::XTextRange> xCell(xTable->getCellByName("A1"),
uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(Color(0x66ffff), getProperty<Color>(xCell,
"BackColor"));
+ uno::Reference<text::XTextRange>
xCell(xTable->getCellByName(u"A1"_ustr), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(Color(0x66ffff), getProperty<Color>(xCell,
u"BackColor"_ustr));
};
setImportFilterName(mpFilter);
@@ -344,26 +350,30 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testCharacterBorder)
uno::Reference<beans::XPropertySet> xRun(getRun(getParagraph(1), 1),
uno::UNO_QUERY);
// Different Border
{
- CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x6666FF, 12, 12,
12, 3, 37),
- getProperty<table::BorderLine2>(xRun,
"CharTopBorder"));
- CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0xFF9900, 0, 99, 0,
2, 99),
- getProperty<table::BorderLine2>(xRun,
"CharLeftBorder"));
- CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0xFF0000, 0, 169,
0, 1, 169),
- getProperty<table::BorderLine2>(xRun,
"CharBottomBorder"));
- CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x0000FF, 0, 169,
0, 0, 169),
- getProperty<table::BorderLine2>(xRun,
"CharRightBorder"));
+ CPPUNIT_ASSERT_BORDER_EQUAL(
+ table::BorderLine2(0x6666FF, 12, 12, 12, 3, 37),
+ getProperty<table::BorderLine2>(xRun, u"CharTopBorder"_ustr));
+ CPPUNIT_ASSERT_BORDER_EQUAL(
+ table::BorderLine2(0xFF9900, 0, 99, 0, 2, 99),
+ getProperty<table::BorderLine2>(xRun, u"CharLeftBorder"_ustr));
+ CPPUNIT_ASSERT_BORDER_EQUAL(
+ table::BorderLine2(0xFF0000, 0, 169, 0, 1, 169),
+ getProperty<table::BorderLine2>(xRun,
u"CharBottomBorder"_ustr));
+ CPPUNIT_ASSERT_BORDER_EQUAL(
+ table::BorderLine2(0x0000FF, 0, 169, 0, 0, 169),
+ getProperty<table::BorderLine2>(xRun,
u"CharRightBorder"_ustr));
}
// Different Padding
{
CPPUNIT_ASSERT_EQUAL(sal_Int32(450),
- getProperty<sal_Int32>(xRun,
"CharTopBorderDistance"));
+ getProperty<sal_Int32>(xRun,
u"CharTopBorderDistance"_ustr));
CPPUNIT_ASSERT_EQUAL(sal_Int32(550),
- getProperty<sal_Int32>(xRun,
"CharLeftBorderDistance"));
+ getProperty<sal_Int32>(xRun,
u"CharLeftBorderDistance"_ustr));
CPPUNIT_ASSERT_EQUAL(sal_Int32(150),
- getProperty<sal_Int32>(xRun,
"CharBottomBorderDistance"));
+ getProperty<sal_Int32>(xRun,
u"CharBottomBorderDistance"_ustr));
CPPUNIT_ASSERT_EQUAL(sal_Int32(250),
- getProperty<sal_Int32>(xRun,
"CharRightBorderDistance"));
+ getProperty<sal_Int32>(xRun,
u"CharRightBorderDistance"_ustr));
}
// No shadow
@@ -388,7 +398,7 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testExportOfImages)
CPPUNIT_TEST_FIXTURE(HtmlExportTest, testExportOfImagesWithSkipImagesEnabled)
{
createSwDoc("textAndImage.docx");
- setFilterOptions("SkipImages");
+ setFilterOptions(u"SkipImages"_ustr);
save(mpFilter);
htmlDocUniquePtr pDoc = parseHtml(maTempFile);
@@ -401,7 +411,7 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest,
testExportOfImagesWithSkipImagesEnabled)
CPPUNIT_TEST_FIXTURE(HtmlExportTest, testSkipImagesEmbedded)
{
createSwDoc("skipimage-embedded.doc");
- setFilterOptions("SkipImages");
+ setFilterOptions(u"SkipImages"_ustr);
save(mpFilter);
// Embedded spreadsheet was exported as image, so content was lost. Make
@@ -420,7 +430,7 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testSkipImagesEmbedded)
CPPUNIT_TEST_FIXTURE(HtmlExportTest, testSkipImagesEmbeddedDocument)
{
createSwDoc("skipimage-embedded-document.docx");
- setFilterOptions("SkipImages");
+ setFilterOptions(u"SkipImages"_ustr);
save(mpFilter);
// Similar to testSkipImagesEmbedded, but with an embedded Writer object,
@@ -431,7 +441,7 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest,
testSkipImagesEmbeddedDocument)
// This was 2, the HTML header was in the document two times.
assertXPath(pDoc, "//meta[@name='generator']"_ostr, 1);
// Text of embedded document was missing.
- assertXPathContent(pDoc, "/html/body/p/span/p/span"_ostr, "Inner.");
+ assertXPathContent(pDoc, "/html/body/p/span/p/span"_ostr, u"Inner."_ustr);
}
CPPUNIT_TEST_FIXTURE(HtmlExportTest, testExportImageProperties)
@@ -443,21 +453,21 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest,
testExportImageProperties)
assertXPath(pDoc, "/html/body"_ostr, 1);
- assertXPath(pDoc, "/html/body/p/map/area"_ostr, "shape"_ostr, "poly");
- assertXPath(pDoc, "/html/body/p/map/area"_ostr, "href"_ostr,
"http://www.microsoft.com/";);
- assertXPath(pDoc, "/html/body/p/map/area"_ostr, "target"_ostr, "_self");
- assertXPath(pDoc, "/html/body/p/map/area"_ostr, "alt"_ostr, "microsoft");
+ assertXPath(pDoc, "/html/body/p/map/area"_ostr, "shape"_ostr,
u"poly"_ustr);
+ assertXPath(pDoc, "/html/body/p/map/area"_ostr, "href"_ostr,
u"http://www.microsoft.com/"_ustr);
+ assertXPath(pDoc, "/html/body/p/map/area"_ostr, "target"_ostr,
u"_self"_ustr);
+ assertXPath(pDoc, "/html/body/p/map/area"_ostr, "alt"_ostr,
u"microsoft"_ustr);
assertXPath(pDoc, "/html/body/p/a"_ostr, 1);
- assertXPath(pDoc, "/html/body/p/a"_ostr, "href"_ostr,
"http://www.google.com/";);
+ assertXPath(pDoc, "/html/body/p/a"_ostr, "href"_ostr,
u"http://www.google.com/"_ustr);
assertXPath(pDoc, "/html/body/p/a/font"_ostr, 1);
- assertXPath(pDoc, "/html/body/p/a/font"_ostr, "color"_ostr, "#ff0000");
+ assertXPath(pDoc, "/html/body/p/a/font"_ostr, "color"_ostr,
u"#ff0000"_ustr);
assertXPath(pDoc, "/html/body/p/a/font/img"_ostr, 1);
- assertXPath(pDoc, "/html/body/p/a/font/img"_ostr, "name"_ostr, "Text");
- assertXPath(pDoc, "/html/body/p/a/font/img"_ostr, "alt"_ostr, "Four
colors");
- assertXPath(pDoc, "/html/body/p/a/font/img"_ostr, "align"_ostr, "middle");
+ assertXPath(pDoc, "/html/body/p/a/font/img"_ostr, "name"_ostr,
u"Text"_ustr);
+ assertXPath(pDoc, "/html/body/p/a/font/img"_ostr, "alt"_ostr, u"Four
colors"_ustr);
+ assertXPath(pDoc, "/html/body/p/a/font/img"_ostr, "align"_ostr,
u"middle"_ustr);
// Probably the DPI in OSX is different and Twip -> Pixel conversion
produces
// different results - so disable OSX for now.
@@ -473,7 +483,7 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest,
testExportImageProperties)
assertXPath(pDoc, "/html/body/p/a/font/img", "border", "3");
#endif
- assertXPath(pDoc, "/html/body/p/a/font/img"_ostr, "usemap"_ostr, "#map1");
+ assertXPath(pDoc, "/html/body/p/a/font/img"_ostr, "usemap"_ostr,
u"#map1"_ustr);
}
CPPUNIT_TEST_FIXTURE(HtmlExportTest, testExportCheckboxRadioButtonState)
@@ -484,17 +494,17 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest,
testExportCheckboxRadioButtonState)
CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc, "/html/body"_ostr, 1);
- assertXPath(pDoc, "/html/body/p[1]/input"_ostr, "type"_ostr, "checkbox");
- assertXPath(pDoc, "/html/body/p[1]/input"_ostr, "checked"_ostr, "checked");
- assertXPath(pDoc, "/html/body/p[2]/input"_ostr, "type"_ostr, "checkbox");
+ assertXPath(pDoc, "/html/body/p[1]/input"_ostr, "type"_ostr,
u"checkbox"_ustr);
+ assertXPath(pDoc, "/html/body/p[1]/input"_ostr, "checked"_ostr,
u"checked"_ustr);
+ assertXPath(pDoc, "/html/body/p[2]/input"_ostr, "type"_ostr,
u"checkbox"_ustr);
assertXPathNoAttribute(pDoc, "/html/body/p[2]/input"_ostr, "checked"_ostr);
- assertXPath(pDoc, "/html/body/form/p[1]/input"_ostr, "type"_ostr,
"checkbox");
- assertXPath(pDoc, "/html/body/form/p[1]/input"_ostr, "checked"_ostr,
"checked");
- assertXPath(pDoc, "/html/body/form/p[2]/input"_ostr, "type"_ostr,
"checkbox");
+ assertXPath(pDoc, "/html/body/form/p[1]/input"_ostr, "type"_ostr,
u"checkbox"_ustr);
+ assertXPath(pDoc, "/html/body/form/p[1]/input"_ostr, "checked"_ostr,
u"checked"_ustr);
+ assertXPath(pDoc, "/html/body/form/p[2]/input"_ostr, "type"_ostr,
u"checkbox"_ustr);
assertXPathNoAttribute(pDoc, "/html/body/form/p[2]/input"_ostr,
"checked"_ostr);
- assertXPath(pDoc, "/html/body/form/p[3]/input"_ostr, "type"_ostr, "radio");
- assertXPath(pDoc, "/html/body/form/p[3]/input"_ostr, "checked"_ostr,
"checked");
- assertXPath(pDoc, "/html/body/form/p[4]/input"_ostr, "type"_ostr, "radio");
+ assertXPath(pDoc, "/html/body/form/p[3]/input"_ostr, "type"_ostr,
u"radio"_ustr);
+ assertXPath(pDoc, "/html/body/form/p[3]/input"_ostr, "checked"_ostr,
u"checked"_ustr);
+ assertXPath(pDoc, "/html/body/form/p[4]/input"_ostr, "type"_ostr,
u"radio"_ustr);
assertXPathNoAttribute(pDoc, "/html/body/form/p[4]/input"_ostr,
"checked"_ostr);
}
@@ -507,7 +517,7 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testExportUrlEncoding)
// Test URI encoded hyperlink with Chinese characters
assertXPath(pDoc, "/html/body/p/a"_ostr, "href"_ostr,
-
"http://www.youtube.com/results?search_query=%E7%B2%B5%E8%AA%9Emv&sm=12";);
+
u"http://www.youtube.com/results?search_query=%E7%B2%B5%E8%AA%9Emv&sm=12"_ustr);
}
CPPUNIT_TEST_FIXTURE(HtmlExportTest, testExportInternalUrl)
@@ -518,8 +528,8 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testExportInternalUrl)
CPPUNIT_ASSERT(pDoc);
// Internal url should be valid
- assertXPath(pDoc, "/html/body/p[1]/a"_ostr, "href"_ostr,
"#0.0.1.Text|outline");
- assertXPath(pDoc, "/html/body/p[2]/a"_ostr, "href"_ostr, "#bookmark");
+ assertXPath(pDoc, "/html/body/p[1]/a"_ostr, "href"_ostr,
u"#0.0.1.Text|outline"_ustr);
+ assertXPath(pDoc, "/html/body/p[2]/a"_ostr, "href"_ostr,
u"#bookmark"_ustr);
}
CPPUNIT_TEST_FIXTURE(HtmlExportTest, testExportImageBulletList)
@@ -533,7 +543,7 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest,
testExportImageBulletList)
assertXPath(pDoc, "/html/body/ul"_ostr, 1);
assertXPath(
pDoc, "/html/body/ul"_ostr, "style"_ostr,
- "list-style-image: url(data:image/svg+xml;base64,"
+ u"list-style-image: url(data:image/svg+xml;base64,"
"PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3"
"RyYXRvciAxMi4wLjEsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDUxNDQ4KSAg"
"LS0+DQo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm"
@@ -559,7 +569,7 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest,
testExportImageBulletList)
"eD0iMy4xOTkiIHk9IjAuMzM5IiBvcGFjaXR5PSIwLjciIGZpbGw9InVybCgjWE1MSURfNl8pIiB3aWR0aD0iNy44ND"
"YiIGhlaWdodD0iNC42MDEiLz4NCgkJPC9nPg0KCTwvbWFzaz4NCgk8ZWxsaXBzZSBtYXNrPSJ1cmwoI1hNTElEXzVf"
"KSIgZmlsbD0iI0ZGRkZGRiIgY3g9IjYuOTc1IiBjeT0iMi42NCIgcng9IjMuNDk0IiByeT0iMS45NDYiLz4NCjwvZz"
- "4NCjwvc3ZnPg0K);");
+ "4NCjwvc3ZnPg0K);"_ustr);
}
CPPUNIT_TEST_FIXTURE(HtmlExportTest, testTdf83890)
@@ -569,7 +579,7 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testTdf83890)
htmlDocUniquePtr pDoc = parseHtml(maTempFile);
CPPUNIT_ASSERT(pDoc);
- assertXPath(pDoc, "/html/body/ol[2]/ol"_ostr, "start"_ostr, "2");
+ assertXPath(pDoc, "/html/body/ol[2]/ol"_ostr, "start"_ostr, u"2"_ustr);
}
CPPUNIT_TEST_FIXTURE(HtmlExportTest, testExtbChars)
@@ -603,7 +613,7 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testNormalImageExport)
CPPUNIT_TEST_FIXTURE(HtmlExportTest, testEmbedImagesEnabled)
{
createSwDoc("textAndImage.docx");
- setFilterOptions("EmbedImages");
+ setFilterOptions(u"EmbedImages"_ustr);
save(mpFilter);
htmlDocUniquePtr pDoc = parseHtml(maTempFile);
@@ -622,7 +632,7 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testEmbedImagesEnabled)
CPPUNIT_TEST_FIXTURE(HtmlExportTest, testXHTML)
{
createSwWebDoc("hello.html");
- setFilterOptions("XHTML");
+ setFilterOptions(u"XHTML"_ustr);
save(mpFilter);
OString aExpected("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML"_ostr);
@@ -635,15 +645,15 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testXHTML)
htmlDocUniquePtr pDoc = parseHtml(maTempFile);
CPPUNIT_ASSERT(pDoc);
// This was lang, not xml:lang.
- assertXPath(pDoc, "/html/body"_ostr, "xml:lang"_ostr, "en-US");
+ assertXPath(pDoc, "/html/body"_ostr, "xml:lang"_ostr, u"en-US"_ustr);
}
CPPUNIT_TEST_FIXTURE(HtmlExportTest, testReqIfParagraph)
{
- setImportFilterOptions("xhtmlns=reqif-xhtml");
- setImportFilterName("HTML (StarWriter)");
+ setImportFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
+ setImportFilterName(u"HTML (StarWriter)"_ustr);
createSwDoc("reqif-p.xhtml");
- setFilterOptions("xhtmlns=reqif-xhtml");
+ setFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
save(mpFilter);
SvStream* pStream = maTempFile.GetStream(StreamMode::READ);
@@ -691,11 +701,11 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testReqIfOleData)
// Then this was 0 on export, as data of OLE nodes was ignored.
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), xObjects->getCount());
};
- setImportFilterOptions("xhtmlns=reqif-xhtml");
- setImportFilterName("HTML (StarWriter)");
+ setImportFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
+ setImportFilterName(u"HTML (StarWriter)"_ustr);
createSwDoc("reqif-ole-data.xhtml");
verify();
- setFilterOptions("xhtmlns=reqif-xhtml");
+ setFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
saveAndReload(mpFilter);
verify();
}
@@ -728,18 +738,18 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testReqIfOleImg)
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(aLogic.getWidth()),
aSize.Width);
// Check mime/media types.
- CPPUNIT_ASSERT_EQUAL(OUString("image/png"),
getProperty<OUString>(xGraphic, "MimeType"));
+ CPPUNIT_ASSERT_EQUAL(u"image/png"_ustr,
getProperty<OUString>(xGraphic, u"MimeType"_ustr));
uno::Reference<beans::XPropertySet> xObjectProps(xObject,
uno::UNO_QUERY);
uno::Reference<io::XActiveDataStreamer> xStreamProvider(
- xObjectProps->getPropertyValue("EmbeddedObject"), uno::UNO_QUERY);
+ xObjectProps->getPropertyValue(u"EmbeddedObject"_ustr),
uno::UNO_QUERY);
uno::Reference<io::XSeekable> xStream(xStreamProvider->getStream(),
uno::UNO_QUERY);
// This was empty when either import or export handling was missing.
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int64>(37888),
xStream->getLength());
// Check alternate text (it was empty, for export the 'alt' attribute
was used).
- CPPUNIT_ASSERT_EQUAL(OUString("OLE Object"),
- getProperty<OUString>(xObject, "Title").trim());
+ CPPUNIT_ASSERT_EQUAL(u"OLE Object"_ustr,
+ getProperty<OUString>(xObject,
u"Title"_ustr).trim());
if (!isExported())
return;
@@ -751,11 +761,11 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testReqIfOleImg)
OString aStream(read_uInt8s_ToOString(*pStream, nLength));
CPPUNIT_ASSERT(aStream.indexOf("type=\"image/png\"") != -1);
};
- setImportFilterOptions("xhtmlns=reqif-xhtml");
- setImportFilterName("HTML (StarWriter)");
+ setImportFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
+ setImportFilterName(u"HTML (StarWriter)"_ustr);
createSwDoc("reqif-ole-img.xhtml");
verify();
- setFilterOptions("xhtmlns=reqif-xhtml");
+ setFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
saveAndReload(mpFilter);
verify();
}
@@ -769,12 +779,12 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIfPngImg)
if (!bExported)
{
// Imported PNG image is not an object.
- CPPUNIT_ASSERT_EQUAL(OUString("Image1"), xShape->getName());
+ CPPUNIT_ASSERT_EQUAL(u"Image1"_ustr, xShape->getName());
return;
}
// All images are exported as objects in ReqIF mode.
- CPPUNIT_ASSERT_EQUAL(OUString("Object1"), xShape->getName());
+ CPPUNIT_ASSERT_EQUAL(u"Object1"_ustr, xShape->getName());
// This was <img>, not <object>, which is not valid in the reqif-xhtml
// subset.
@@ -795,9 +805,9 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIfPngImg)
verify(/*bExported=*/false);
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aStoreProperties = {
- comphelper::makePropertyValue("FilterName", OUString("HTML
(StarWriter)")),
- comphelper::makePropertyValue("FilterOptions",
OUString("xhtmlns=reqif-xhtml")),
- comphelper::makePropertyValue("ExportImagesAsOLE", true),
+ comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML
(StarWriter)"_ustr),
+ comphelper::makePropertyValue(u"FilterOptions"_ustr,
u"xhtmlns=reqif-xhtml"_ustr),
+ comphelper::makePropertyValue(u"ExportImagesAsOLE"_ustr, true),
};
xStorable->storeToURL(maTempFile.GetURL(), aStoreProperties);
mxComponent->dispose();
@@ -807,10 +817,10 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqIfPngImg)
CPPUNIT_TEST_FIXTURE(HtmlExportTest, testReqIfJpgImg)
{
- setImportFilterOptions("xhtmlns=reqif-xhtml");
- setImportFilterName("HTML (StarWriter)");
+ setImportFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
+ setImportFilterName(u"HTML (StarWriter)"_ustr);
createSwDoc("reqif-jpg-img.xhtml");
- setFilterOptions("xhtmlns=reqif-xhtml");
+ setFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
save(mpFilter);
SvStream* pStream = maTempFile.GetStream(StreamMode::READ);
@@ -823,10 +833,10 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testReqIfJpgImg)
CPPUNIT_TEST_FIXTURE(HtmlExportTest, testReqIfTable)
{
- setImportFilterOptions("xhtmlns=reqif-xhtml");
- setImportFilterName("HTML (StarWriter)");
+ setImportFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
+ setImportFilterName(u"HTML (StarWriter)"_ustr);
createSwDoc("reqif-table.xhtml");
- setFilterOptions("xhtmlns=reqif-xhtml");
+ setFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
save(mpFilter);
xmlDocUniquePtr pDoc = WrapReqifFromTempFile();
@@ -852,7 +862,7 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testReqIfTable)
CPPUNIT_TEST_FIXTURE(HtmlExportTest, testReqIfTable2)
{
createSwDoc("reqif-table2.odt");
- setFilterOptions("xhtmlns=reqif-xhtml");
+ setFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
save(mpFilter);
-e
... etc. - the rest is truncated
