sw/qa/filter/html/html.cxx | 54 +-
sw/qa/filter/ww8/ww8.cxx | 100 ++-
sw/qa/filter/xml/xml.cxx | 4
sw/qa/inc/bordertest.hxx | 158 +++---
sw/qa/uibase/dialog/dialog.cxx | 10
sw/qa/uibase/dochdl/dochdl.cxx | 4
sw/qa/uibase/docvw/docvw.cxx | 12
sw/qa/uibase/fldui/fldui.cxx | 55 +-
sw/qa/uibase/frmdlg/frmdlg.cxx | 21
sw/qa/uibase/shells/shells.cxx | 348 ++++++-------
sw/qa/uibase/shells/textfld.cxx | 26 -
sw/qa/uibase/shells/textsh.cxx | 12
sw/qa/uibase/uiview/uiview.cxx | 41 -
sw/qa/uibase/uno/uno.cxx | 135 ++---
sw/qa/uibase/wrtsh/wrtsh.cxx | 77 +-
sw/qa/unit/swmodeltestbase.cxx | 33 -
sw/qa/writerfilter/dmapper/CellColorHandler.cxx | 2
sw/qa/writerfilter/dmapper/DomainMapper.cxx | 22
sw/qa/writerfilter/dmapper/DomainMapperTableHandler.cxx | 16
sw/qa/writerfilter/dmapper/DomainMapperTableManager.cxx | 2
sw/qa/writerfilter/dmapper/DomainMapper_Impl.cxx | 89 +--
sw/qa/writerfilter/dmapper/GraphicImport.cxx | 46 -
sw/qa/writerfilter/dmapper/PropertyMap.cxx | 58 +-
sw/qa/writerfilter/dmapper/SdtHelper.cxx | 86 +--
sw/qa/writerfilter/dmapper/SettingsTable.cxx | 10
sw/qa/writerfilter/dmapper/TextEffectsHandler.cxx | 4
sw/qa/writerfilter/filter/WriterFilter.cxx | 2
sw/qa/writerfilter/filters-test/filters-test.cxx | 4
sw/qa/writerfilter/misc/misc.cxx | 74 +-
sw/qa/writerfilter/ooxml/ooxml.cxx | 4
sw/qa/writerfilter/rtftok/rtfdispatchflag.cxx | 20
sw/qa/writerfilter/rtftok/rtfdispatchsymbol.cxx | 4
sw/qa/writerfilter/rtftok/rtfdispatchvalue.cxx | 21
sw/qa/writerfilter/rtftok/rtfdocumentimpl.cxx | 8
sw/qa/writerfilter/rtftok/rtfsdrimport.cxx | 4
sw/qa/writerfilter/rtftok/rtfsprm.cxx | 8
sw/source/core/attr/swatrset.cxx | 2
sw/source/core/bastyp/SwSmartTagMgr.cxx | 2
sw/source/core/crsr/DateFormFieldButton.cxx | 6
sw/source/core/crsr/DropDownFormFieldButton.cxx | 6
sw/source/core/crsr/datecontentcontrolbutton.cxx | 8
sw/source/core/crsr/dropdowncontentcontrolbutton.cxx | 8
sw/source/core/crsr/viscrs.cxx | 4
sw/source/core/doc/DocumentContentOperationsManager.cxx | 4
sw/source/core/doc/DocumentFieldsManager.cxx | 2
sw/source/core/doc/DocumentStylePoolManager.cxx | 16
sw/source/core/doc/SwStyleNameMapper.cxx | 414 ++++++++--------
sw/source/core/doc/dbgoutsw.cxx | 28 -
sw/source/core/doc/doc.cxx | 2
sw/source/core/doc/docbm.cxx | 2
sw/source/core/doc/docnew.cxx | 6
sw/source/core/doc/docredln.cxx | 6
sw/source/core/doc/docxforms.cxx | 6
sw/source/core/doc/list.cxx | 2
sw/source/core/doc/notxtfrm.cxx | 2
sw/source/core/doc/number.cxx | 10
sw/source/core/doc/textboxhelper.cxx | 4
sw/source/core/docnode/finalthreadmanager.cxx | 4
sw/source/core/docnode/ndtbl.cxx | 2
sw/source/core/docnode/retrieveinputstream.cxx | 4
sw/source/core/draw/dcontact.cxx | 2
sw/source/core/draw/drawdoc.cxx | 2
sw/source/core/edit/autofmt.cxx | 6
sw/source/core/edit/edfcol.cxx | 52 +-
sw/source/core/edit/edtab.cxx | 2
sw/source/core/edit/edtox.cxx | 2
sw/source/core/fields/expfld.cxx | 4
sw/source/core/frmedt/fefly1.cxx | 6
sw/source/core/graphic/ndgrf.cxx | 2
sw/source/core/inc/wrong.hxx | 8
sw/source/core/layout/dbg_lay.cxx | 6
sw/source/core/layout/dumpfilter.cxx | 4
sw/source/core/layout/newfrm.cxx | 2
sw/source/core/layout/paintfrm.cxx | 2
sw/source/core/ole/ndole.cxx | 8
sw/source/core/swg/SwXMLBlockExport.cxx | 4
sw/source/core/swg/SwXMLBlockImport.cxx | 4
sw/source/core/swg/SwXMLSectionList.cxx | 2
sw/source/core/swg/SwXMLTextBlocks.cxx | 4
sw/source/core/swg/SwXMLTextBlocks1.cxx | 32 -
sw/source/core/table/swnewtable.cxx | 2
sw/source/core/text/EnhancedPDFExportHelper.cxx | 14
sw/source/core/text/frmcrsr.cxx | 2
sw/source/core/text/inftxt.cxx | 4
sw/source/core/text/porfld.cxx | 2
sw/source/core/text/porfld.hxx | 2
sw/source/core/text/porrst.cxx | 4
sw/source/core/text/portxt.cxx | 2
sw/source/core/text/txtfld.cxx | 4
sw/source/core/text/txtftn.cxx | 6
sw/source/core/tox/tox.cxx | 20
sw/source/core/txtnode/atrref.cxx | 2
sw/source/core/txtnode/attrcontentcontrol.cxx | 8
sw/source/core/txtnode/fntcap.cxx | 2
sw/source/core/txtnode/modeltoviewhelper.cxx | 2
sw/source/core/txtnode/ndtxt.cxx | 4
sw/source/core/txtnode/swfont.cxx | 4
sw/source/core/undo/SwRewriter.cxx | 8
sw/source/core/undo/docundo.cxx | 2
sw/source/core/undo/undobj.cxx | 2
sw/source/core/undo/undobj1.cxx | 2
sw/source/core/undo/unins.cxx | 2
sw/source/core/view/printdata.cxx | 100 +--
sw/source/core/view/viewimp.cxx | 2
sw/source/core/view/vprint.cxx | 8
105 files changed, 1255 insertions(+), 1233 deletions(-)
New commits:
commit 902541d805c7de0c2f10b1c9ed5520a1e6ce5d12
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Jun 13 15:08:00 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jun 13 19:56:40 2024 +0200
loplugin:ostr in sw/qa
Change-Id: Ib67997a3f491afaec380ef65bc60588362d9cc3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168812
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/qa/filter/html/html.cxx b/sw/qa/filter/html/html.cxx
index 4923cd605468..377505da9b14 100644
--- a/sw/qa/filter/html/html.cxx
+++ b/sw/qa/filter/html/html.cxx
@@ -35,7 +35,7 @@ class Test : public SwModelTestBase, public HtmlTestTools
{
public:
Test()
- : SwModelTestBase("/sw/qa/filter/html/data/", "HTML (StarWriter)")
+ : SwModelTestBase(u"/sw/qa/filter/html/data/"_ustr, u"HTML
(StarWriter)"_ustr)
{
}
};
@@ -43,12 +43,12 @@ public:
CPPUNIT_TEST_FIXTURE(Test, testEmptyParagraph)
{
// Given a document with 2 paragraphs, the second is empty:
- setImportFilterOptions("xhtmlns=reqif-xhtml");
- setImportFilterName("HTML (StarWriter)");
+ setImportFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
+ setImportFilterName(u"HTML (StarWriter)"_ustr);
createSwDoc("empty-paragraph.xhtml");
// Then make sure that the resulting document has a 2nd empty paragraph:
- getParagraph(1, "a");
+ getParagraph(1, u"a"_ustr);
// Without the accompanying fix in place, this test would have failed with:
// An uncaught exception of type
com.sun.star.container.NoSuchElementException
// i.e. the 2nd paragraph was lost.
@@ -58,8 +58,8 @@ CPPUNIT_TEST_FIXTURE(Test, testEmptyParagraph)
CPPUNIT_TEST_FIXTURE(Test, testRelativeKeepAspect)
{
// Given a document with an OLE object, width set to 100%, height is not
set:
- setImportFilterOptions("xhtmlns=reqif-xhtml");
- setImportFilterName("HTML (StarWriter)");
+ setImportFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
+ setImportFilterName(u"HTML (StarWriter)"_ustr);
createSwDoc("relative-keep-aspect.xhtml");
// Then make sure that the aspect ratio of the image is kept:
@@ -79,8 +79,8 @@ CPPUNIT_TEST_FIXTURE(Test, testRelativeKeepAspect)
CPPUNIT_TEST_FIXTURE(Test, testRelativeKeepAspectImage)
{
// Given a document with an image, width set to 100%, height is not set:
- setImportFilterOptions("xhtmlns=reqif-xhtml");
- setImportFilterName("HTML (StarWriter)");
+ setImportFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
+ setImportFilterName(u"HTML (StarWriter)"_ustr);
createSwDoc("relative-keep-aspect-image.xhtml");
// Then make sure that the aspect ratio of the image is kept:
@@ -103,12 +103,12 @@ CPPUNIT_TEST_FIXTURE(Test, testSvmImageExport)
createSwDoc();
uno::Reference<lang::XMultiServiceFactory> xFactory(mxComponent,
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xTextGraphic(
- xFactory->createInstance("com.sun.star.text.TextGraphicObject"),
uno::UNO_QUERY);
- xTextGraphic->setPropertyValue("AnchorType",
+ xFactory->createInstance(u"com.sun.star.text.TextGraphicObject"_ustr),
uno::UNO_QUERY);
+ xTextGraphic->setPropertyValue(u"AnchorType"_ustr,
uno::Any(text::TextContentAnchorType_AS_CHARACTER));
GDIMetaFile aMetafile;
Graphic aGraphic(aMetafile);
- xTextGraphic->setPropertyValue("Graphic",
uno::Any(aGraphic.GetXGraphic()));
+ xTextGraphic->setPropertyValue(u"Graphic"_ustr,
uno::Any(aGraphic.GetXGraphic()));
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XText> xBodyText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor(xBodyText->createTextCursor());
@@ -116,8 +116,8 @@ CPPUNIT_TEST_FIXTURE(Test, testSvmImageExport)
xBodyText->insertTextContent(xCursor, xTextContent, false);
// When exporting to reqif:
- setFilterOptions("xhtmlns=reqif-xhtml");
- save("HTML (StarWriter)");
+ setFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
+ save(u"HTML (StarWriter)"_ustr);
// Then make sure we only export PNG:
xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile();
@@ -126,7 +126,7 @@ CPPUNIT_TEST_FIXTURE(Test, testSvmImageExport)
// - Actual : 2
// - XPath '//reqif-xhtml:object' number of nodes is incorrect
// i.e. we wrote both GIF and PNG, not just PNG for SVM images.
- assertXPath(pXmlDoc, "//reqif-xhtml:object"_ostr, "type"_ostr,
"image/png");
+ assertXPath(pXmlDoc, "//reqif-xhtml:object"_ostr, "type"_ostr,
u"image/png"_ustr);
}
CPPUNIT_TEST_FIXTURE(Test, testTableCellFloatValueType)
@@ -140,7 +140,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTableCellFloatValueType)
pWrtShell->MoveTable(GotoPrevTable, fnTableStart);
SwTableNode* pTableNode =
pWrtShell->GetCursor()->GetPointNode().FindTableNode();
SwTable& rTable = pTableNode->GetTable();
- auto pBox = const_cast<SwTableBox*>(rTable.GetTableBox("A1"));
+ auto pBox = const_cast<SwTableBox*>(rTable.GetTableBox(u"A1"_ustr));
SwFrameFormat* pBoxFormat = pBox->ClaimFrameFormat();
SwAttrSet aSet(pBoxFormat->GetAttrSet());
SwTableBoxValue aBoxValue(42.0);
@@ -148,8 +148,8 @@ CPPUNIT_TEST_FIXTURE(Test, testTableCellFloatValueType)
pBoxFormat->GetDoc()->SetAttr(aSet, *pBoxFormat);
// When exporting to XHTML:
- setFilterOptions("xhtmlns=reqif-xhtml");
- save("HTML (StarWriter)");
+ setFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
+ save(u"HTML (StarWriter)"_ustr);
// Then make sure that the sdval attribute is omitted, which is not in the
XHTML spec:
xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile();
@@ -171,17 +171,17 @@ CPPUNIT_TEST_FIXTURE(Test, testTableRowSpanInAllCells)
pWrtShell->MoveTable(GotoPrevTable, fnTableStart);
SwTableNode* pTableNode =
pWrtShell->GetCursor()->GetPointNode().FindTableNode();
SwTable& rTable = pTableNode->GetTable();
- auto pBox = const_cast<SwTableBox*>(rTable.GetTableBox("A1"));
+ auto pBox = const_cast<SwTableBox*>(rTable.GetTableBox(u"A1"_ustr));
pBox->setRowSpan(2);
- pBox = const_cast<SwTableBox*>(rTable.GetTableBox("B1"));
+ pBox = const_cast<SwTableBox*>(rTable.GetTableBox(u"B1"_ustr));
pBox->setRowSpan(2);
- pBox = const_cast<SwTableBox*>(rTable.GetTableBox("A2"));
+ pBox = const_cast<SwTableBox*>(rTable.GetTableBox(u"A2"_ustr));
pBox->setRowSpan(-1);
- pBox = const_cast<SwTableBox*>(rTable.GetTableBox("B2"));
+ pBox = const_cast<SwTableBox*>(rTable.GetTableBox(u"B2"_ustr));
pBox->setRowSpan(-1);
// When exporting to HTML:
- save("HTML (StarWriter)");
+ save(u"HTML (StarWriter)"_ustr);
// Then make sure that the output is simplified to valid HTML, by omitting
the rowspan attribute
// & the empty <tr> element:
@@ -208,8 +208,8 @@ CPPUNIT_TEST_FIXTURE(Test, testCenteredTableCSSExport)
pWrtShell->SetTableAttr(aSet);
// When exporting to XHTML:
- setFilterOptions("xhtmlns=reqif-xhtml");
- save("HTML (StarWriter)");
+ setFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
+ save(u"HTML (StarWriter)"_ustr);
// Then make sure that CSS is used to horizontally position the table:
xmlDocUniquePtr pXmlDoc = WrapReqifFromTempFile();
@@ -219,14 +219,14 @@ CPPUNIT_TEST_FIXTURE(Test, testCenteredTableCSSExport)
// i.e <center> was used to position the table, not CSS.
assertXPath(pXmlDoc, "//reqif-xhtml:center"_ostr, 0);
assertXPath(pXmlDoc, "//reqif-xhtml:table"_ostr, "style"_ostr,
- "margin-left: auto; margin-right: auto");
+ u"margin-left: auto; margin-right: auto"_ustr);
}
CPPUNIT_TEST_FIXTURE(Test, testCenteredTableCSSImport)
{
// Given an XHTML file with a centered (with inline CSS) table, when
importing that document:
- setImportFilterOptions("xhtmlns=reqif-xhtml");
- setImportFilterName("HTML (StarWriter)");
+ setImportFilterOptions(u"xhtmlns=reqif-xhtml"_ustr);
+ setImportFilterName(u"HTML (StarWriter)"_ustr);
createSwDoc("centered-table.xhtml");
// Then make sure that the table is centered:
diff --git a/sw/qa/filter/ww8/ww8.cxx b/sw/qa/filter/ww8/ww8.cxx
index 070565345a2d..603d7c198b1a 100644
--- a/sw/qa/filter/ww8/ww8.cxx
+++ b/sw/qa/filter/ww8/ww8.cxx
@@ -49,7 +49,7 @@ class Test : public SwModelTestBase
{
public:
Test()
- : SwModelTestBase("/sw/qa/filter/ww8/data/")
+ : SwModelTestBase(u"/sw/qa/filter/ww8/data/"_ustr)
{
}
};
@@ -62,18 +62,19 @@ CPPUNIT_TEST_FIXTURE(Test, testNegativePageBorderDocImport)
// Then make sure we map that to a negative border distance (move border
from the edge of body
// frame towards the center of the page, not towards the edge of the page):
- uno::Reference<container::XNameAccess> xStyleFamily =
getStyles("PageStyles");
- uno::Reference<beans::XPropertySet>
xStyle(xStyleFamily->getByName("Standard"), uno::UNO_QUERY);
- auto nTopMargin = xStyle->getPropertyValue("TopMargin").get<sal_Int32>();
+ uno::Reference<container::XNameAccess> xStyleFamily =
getStyles(u"PageStyles"_ustr);
+ uno::Reference<beans::XPropertySet>
xStyle(xStyleFamily->getByName(u"Standard"_ustr),
+ uno::UNO_QUERY);
+ auto nTopMargin =
xStyle->getPropertyValue(u"TopMargin"_ustr).get<sal_Int32>();
// Without the accompanying fix in place, this test would have failed with:
// - Expected: 501
// - Actual : 342
// i.e. the border properties influenced the margin, which was 284 twips
in the sprmSDyaTop
// SPRM.
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(501), nTopMargin);
- auto aTopBorder =
xStyle->getPropertyValue("TopBorder").get<table::BorderLine2>();
+ auto aTopBorder =
xStyle->getPropertyValue(u"TopBorder"_ustr).get<table::BorderLine2>();
CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(159), aTopBorder.LineWidth);
- auto nTopBorderDistance =
xStyle->getPropertyValue("TopBorderDistance").get<sal_Int32>();
+ auto nTopBorderDistance =
xStyle->getPropertyValue(u"TopBorderDistance"_ustr).get<sal_Int32>();
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(-646), nTopBorderDistance);
}
@@ -85,20 +86,20 @@ CPPUNIT_TEST_FIXTURE(Test,
testPlainTextContentControlExport)
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
- xText->insertString(xCursor, "test", /*bAbsorb=*/false);
+ xText->insertString(xCursor, u"test"_ustr, /*bAbsorb=*/false);
xCursor->gotoStart(/*bExpand=*/false);
xCursor->gotoEnd(/*bExpand=*/true);
uno::Reference<text::XTextContent> xContentControl(
- xMSF->createInstance("com.sun.star.text.ContentControl"),
uno::UNO_QUERY);
+ xMSF->createInstance(u"com.sun.star.text.ContentControl"_ustr),
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xContentControlProps(xContentControl,
uno::UNO_QUERY);
- xContentControlProps->setPropertyValue("PlainText", uno::Any(true));
+ xContentControlProps->setPropertyValue(u"PlainText"_ustr, uno::Any(true));
xText->insertTextContent(xCursor, xContentControl, /*bAbsorb=*/true);
// When exporting to DOCX:
- save("Office Open XML Text");
+ save(u"Office Open XML Text"_ustr);
// Then make sure the expected markup is used:
- xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+ xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr);
// Without the accompanying fix in place, this test would have failed with:
// - Expected: 1
// - Actual : 0
@@ -116,10 +117,10 @@ CPPUNIT_TEST_FIXTURE(Test,
testDocxComboBoxContentControlExport)
pWrtShell->InsertContentControl(SwContentControlType::COMBO_BOX);
// When exporting to DOCX:
- save("Office Open XML Text");
+ save(u"Office Open XML Text"_ustr);
// Then make sure the expected markup is used:
- xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+ xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr);
// Without the accompanying fix in place, this test would have failed with:
// - Expected: 1
// - Actual : 0
@@ -136,26 +137,27 @@ CPPUNIT_TEST_FIXTURE(Test, testDocxHyperlinkShape)
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
- xText->insertString(xCursor, "beforeafter", /*bAbsorb=*/false);
+ xText->insertString(xCursor, u"beforeafter"_ustr, /*bAbsorb=*/false);
xCursor->gotoStart(/*bExpand=*/false);
xCursor->goRight(/*nCount=*/6, /*bExpand=*/true);
uno::Reference<beans::XPropertySet> xCursorProps(xCursor, uno::UNO_QUERY);
- xCursorProps->setPropertyValue("HyperLinkURL",
uno::Any(OUString("http://www.example.com/";)));
+ xCursorProps->setPropertyValue(u"HyperLinkURL"_ustr,
uno::Any(u"http://www.example.com/"_ustr));
xCursor->gotoStart(/*bExpand=*/false);
xCursor->goRight(/*nCount=*/6, /*bExpand=*/false);
uno::Reference<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);
xShape->setSize(awt::Size(5000, 5000));
uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY);
- xShapeProps->setPropertyValue("AnchorType",
uno::Any(text::TextContentAnchorType_AT_CHARACTER));
+ xShapeProps->setPropertyValue(u"AnchorType"_ustr,
+
uno::Any(text::TextContentAnchorType_AT_CHARACTER));
uno::Reference<text::XTextContent> xShapeContent(xShape, uno::UNO_QUERY);
xText->insertTextContent(xCursor, xShapeContent, /*bAbsorb=*/false);
- xShapeProps->setPropertyValue("TextBox", uno::Any(true));
+ xShapeProps->setPropertyValue(u"TextBox"_ustr, uno::Any(true));
// When saving this document to DOCX, then make sure we don't crash on
export (due to an
// assertion failure for not-well-formed XML output):
- save("Office Open XML Text");
+ save(u"Office Open XML Text"_ustr);
}
CPPUNIT_TEST_FIXTURE(Test, testDocxContentControlDropdownEmptyDisplayText)
@@ -168,10 +170,10 @@ CPPUNIT_TEST_FIXTURE(Test,
testDocxContentControlDropdownEmptyDisplayText)
pWrtShell->InsertContentControl(SwContentControlType::DROP_DOWN_LIST);
// When saving to DOCX:
- save("Office Open XML Text");
+ save(u"Office Open XML Text"_ustr);
// Then make sure that no display text attribute is written:
- xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+ xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr);
// Without the accompanying fix in place, this test would have failed with:
// - XPath '//w:sdt/w:sdtPr/w:dropDownList/w:listItem' unexpected
'displayText' attribute
// i.e. we wrote an empty attribute instead of omitting it.
@@ -182,7 +184,7 @@ CPPUNIT_TEST_FIXTURE(Test,
testDocxContentControlDropdownEmptyDisplayText)
CPPUNIT_TEST_FIXTURE(Test, testDocxSymbolFontExport)
{
// Create document with symbol character and font Wingdings
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
@@ -191,20 +193,20 @@ CPPUNIT_TEST_FIXTURE(Test, testDocxSymbolFontExport)
uno::Reference<text::XTextRange> xRange = xCursor;
uno::Reference<beans::XPropertySet> xTextProps(xRange, uno::UNO_QUERY);
- xTextProps->setPropertyValue("CharFontName",
uno::Any(OUString("Wingdings")));
- xTextProps->setPropertyValue("CharFontNameAsian",
uno::Any(OUString("Wingdings")));
- xTextProps->setPropertyValue("CharFontNameComplex",
uno::Any(OUString("Wingdings")));
- xTextProps->setPropertyValue("CharFontCharSet",
uno::Any(awt::CharSet::SYMBOL));
+ xTextProps->setPropertyValue(u"CharFontName"_ustr,
uno::Any(u"Wingdings"_ustr));
+ xTextProps->setPropertyValue(u"CharFontNameAsian"_ustr,
uno::Any(u"Wingdings"_ustr));
+ xTextProps->setPropertyValue(u"CharFontNameComplex"_ustr,
uno::Any(u"Wingdings"_ustr));
+ xTextProps->setPropertyValue(u"CharFontCharSet"_ustr,
uno::Any(awt::CharSet::SYMBOL));
// When exporting to DOCX:
- save("Office Open XML Text");
+ save(u"Office Open XML Text"_ustr);
// Then make sure the expected markup is used:
- xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+ xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr);
assertXPath(pXmlDoc, "//w:p/w:r/w:sym"_ostr, 1);
- assertXPath(pXmlDoc, "//w:p/w:r/w:sym[1]"_ostr, "font"_ostr, "Wingdings");
- assertXPath(pXmlDoc, "//w:p/w:r/w:sym[1]"_ostr, "char"_ostr, "f0e0");
+ assertXPath(pXmlDoc, "//w:p/w:r/w:sym[1]"_ostr, "font"_ostr,
u"Wingdings"_ustr);
+ assertXPath(pXmlDoc, "//w:p/w:r/w:sym[1]"_ostr, "char"_ostr, u"f0e0"_ustr);
}
CPPUNIT_TEST_FIXTURE(Test, testDocxFloatingTableExport)
@@ -232,10 +234,10 @@ CPPUNIT_TEST_FIXTURE(Test, testDocxFloatingTableExport)
pWrtShell->EndAllAction();
// When saving to docx:
- save("Office Open XML Text");
+ save(u"Office Open XML Text"_ustr);
// Then make sure we write a floating table, not a textframe containing a
table:
- xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+ xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr);
// Without the accompanying fix in place, this test would have failed with:
// - XPath '//w:tbl/w:tblPr/w:tblpPr' number of nodes is incorrect
// i.e. no floating table was exported.
@@ -267,26 +269,28 @@ CPPUNIT_TEST_FIXTURE(Test, testWrapThroughLayoutInCell)
createSwDoc();
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);
xShape->setSize(awt::Size(10000, 10000));
uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY);
- xShapeProps->setPropertyValue("AnchorType",
uno::Any(text::TextContentAnchorType_AT_CHARACTER));
- xShapeProps->setPropertyValue("Surround",
uno::Any(text::WrapTextMode_THROUGH));
- xShapeProps->setPropertyValue("HoriOrientRelation",
uno::Any(text::RelOrientation::FRAME));
+ xShapeProps->setPropertyValue(u"AnchorType"_ustr,
+
uno::Any(text::TextContentAnchorType_AT_CHARACTER));
+ xShapeProps->setPropertyValue(u"Surround"_ustr,
uno::Any(text::WrapTextMode_THROUGH));
+ xShapeProps->setPropertyValue(u"HoriOrientRelation"_ustr,
+ uno::Any(text::RelOrientation::FRAME));
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
xDrawPageSupplier->getDrawPage()->add(xShape);
// When saving to docx:
- save("Office Open XML Text");
+ save(u"Office Open XML Text"_ustr);
// Then make sure that layoutInCell is undoing the effect of the
import-time tweak:
- xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+ xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr);
// Without the accompanying fix in place, this test would have failed with:
// - Expected: 1
// - Actual : 0
// - attribute 'layoutInCell' of '//wp:anchor' incorrect value.
// i.e. layoutInCell was disabled, leading to bad layout in Word.
- assertXPath(pXmlDoc, "//wp:anchor"_ostr, "layoutInCell"_ostr, "1");
+ assertXPath(pXmlDoc, "//wp:anchor"_ostr, "layoutInCell"_ostr, u"1"_ustr);
}
CPPUNIT_TEST_FIXTURE(Test, test3Endnotes)
@@ -327,10 +331,10 @@ CPPUNIT_TEST_FIXTURE(Test, testDoNotBreakWrappedTables)
rIDSA.set(DocumentSettingId::DO_NOT_BREAK_WRAPPED_TABLES, true);
// When saving to docx:
- save("Office Open XML Text");
+ save(u"Office Open XML Text"_ustr);
// Then make sure the compat flag is serialized:
- xmlDocUniquePtr pXmlDoc = parseExport("word/settings.xml");
+ xmlDocUniquePtr pXmlDoc = parseExport(u"word/settings.xml"_ustr);
// Without the accompanying fix in place, this test would have failed with:
// - Expected: 1
// - Actual : 0
@@ -348,10 +352,10 @@ CPPUNIT_TEST_FIXTURE(Test,
testAllowTextAfterFloatingTableBreak)
rIDSA.set(DocumentSettingId::ALLOW_TEXT_AFTER_FLOATING_TABLE_BREAK, true);
// When saving to docx:
- save("Office Open XML Text");
+ save(u"Office Open XML Text"_ustr);
// Then make sure the compat flag is serialized:
- xmlDocUniquePtr pXmlDoc = parseExport("word/settings.xml");
+ xmlDocUniquePtr pXmlDoc = parseExport(u"word/settings.xml"_ustr);
// Without the accompanying fix in place, this test would have failed with:
// - Expected: 1
// - Actual : 0
@@ -360,7 +364,7 @@ CPPUNIT_TEST_FIXTURE(Test,
testAllowTextAfterFloatingTableBreak)
assertXPath(
pXmlDoc,
"/w:settings/w:compat/w:compatSetting[@w:name='allowTextAfterFloatingTableBreak']"_ostr,
- "val"_ostr, "1");
+ "val"_ostr, u"1"_ustr);
}
CPPUNIT_TEST_FIXTURE(Test, testDOCfDontBreakWrappedTables)
@@ -451,7 +455,7 @@ CPPUNIT_TEST_FIXTURE(Test,
testFloattableOverlapNeverDOCXExport)
createSwDoc();
SwDoc* pDoc = getSwDoc();
SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
- pWrtShell->Insert2("before table");
+ pWrtShell->Insert2(u"before table"_ustr);
// Insert a table:
SwInsertTableOptions aTableOptions(SwInsertTableFlags::DefaultBorder, 0);
pWrtShell->InsertTable(aTableOptions, /*nRows=*/1, /*nCols=*/1);
@@ -477,16 +481,16 @@ CPPUNIT_TEST_FIXTURE(Test,
testFloattableOverlapNeverDOCXExport)
pWrtShell->EndAllAction();
// When saving to DOCX:
- save("Office Open XML Text");
+ save(u"Office Open XML Text"_ustr);
// Then make sure that the overlap=never markup is written:
- xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+ xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr);
// Without the accompanying fix in place, this test would have failed with:
// - Expected: 1
// - Actual : 0
// - XPath '//w:tblPr/w:tblOverlap' number of nodes is incorrect
// i.e. <w:tblOverlap> was not written.
- assertXPath(pXmlDoc, "//w:tblPr/w:tblOverlap"_ostr, "val"_ostr, "never");
+ assertXPath(pXmlDoc, "//w:tblPr/w:tblOverlap"_ostr, "val"_ostr,
u"never"_ustr);
}
CPPUNIT_TEST_FIXTURE(Test, testFloattableOverlapNeverDOCImport)
diff --git a/sw/qa/filter/xml/xml.cxx b/sw/qa/filter/xml/xml.cxx
index a0a21f5f4335..39a651183947 100644
--- a/sw/qa/filter/xml/xml.cxx
+++ b/sw/qa/filter/xml/xml.cxx
@@ -28,7 +28,7 @@ class Test : public SwModelTestBase
{
public:
Test()
- : SwModelTestBase("/sw/qa/filter/xml/data/", "writer8")
+ : SwModelTestBase(u"/sw/qa/filter/xml/data/"_ustr, u"writer8"_ustr)
{
}
};
@@ -42,7 +42,7 @@ CPPUNIT_TEST_FIXTURE(Test, testCoveredCellBackground)
SwDoc* pDoc = getSwDoc();
const SwTableFormat* pTableFormat = (*pDoc->GetTableFrameFormats())[0];
SwTable* pTable = SwTable::FindTable(pTableFormat);
- SwTableBox* pBox = const_cast<SwTableBox*>(pTable->GetTableBox("A5"));
+ SwTableBox* pBox =
const_cast<SwTableBox*>(pTable->GetTableBox(u"A5"_ustr));
SwFrameFormat* pCellFormat = pBox->GetFrameFormat();
const SvxBrushItem& rBackground =
pCellFormat->GetAttrSet().GetBackground();
diff --git a/sw/qa/inc/bordertest.hxx b/sw/qa/inc/bordertest.hxx
index 3137c85c9766..6a538169c741 100644
--- a/sw/qa/inc/bordertest.hxx
+++ b/sw/qa/inc/bordertest.hxx
@@ -43,105 +43,105 @@ public:
// maps containing TopBorder widths for every cell
// one map for each tables - there are 8 of them, counting from 0
BorderLineMap map0;
- map0.insert(StringBorderPair(OUString("A1"), table::BorderLine(0, 53, 26,
26)));
- map0.insert(StringBorderPair(OUString("B1"), table::BorderLine(0, 79, 26,
26)));
- map0.insert(StringBorderPair(OUString("C1"), table::BorderLine(0, 106, 26,
26)));
- map0.insert(StringBorderPair(OUString("D1"), table::BorderLine(0, 159, 26,
26)));
- map0.insert(StringBorderPair(OUString("E1"), table::BorderLine(0, 212, 26,
26)));
+ map0.insert(StringBorderPair(u"A1"_ustr, table::BorderLine(0, 53, 26,
26)));
+ map0.insert(StringBorderPair(u"B1"_ustr, table::BorderLine(0, 79, 26,
26)));
+ map0.insert(StringBorderPair(u"C1"_ustr, table::BorderLine(0, 106, 26,
26)));
+ map0.insert(StringBorderPair(u"D1"_ustr, table::BorderLine(0, 159, 26,
26)));
+ map0.insert(StringBorderPair(u"E1"_ustr, table::BorderLine(0, 212, 26,
26)));
BorderLineMap map1;
- map1.insert(StringBorderPair(OUString("A1"), table::BorderLine(0, 9, 9,
9)));
- map1.insert(StringBorderPair(OUString("B1"), table::BorderLine(0, 18, 18,
18)));
- map1.insert(StringBorderPair(OUString("C1"), table::BorderLine(0, 26, 26,
26)));
- map1.insert(StringBorderPair(OUString("D1"), table::BorderLine(0, 53, 53,
53)));
- map1.insert(StringBorderPair(OUString("E1"), table::BorderLine(0, 79, 79,
79)));
- map1.insert(StringBorderPair(OUString("F1"), table::BorderLine(0, 106,
106, 106)));
+ map1.insert(StringBorderPair(u"A1"_ustr, table::BorderLine(0, 9, 9, 9)));
+ map1.insert(StringBorderPair(u"B1"_ustr, table::BorderLine(0, 18, 18,
18)));
+ map1.insert(StringBorderPair(u"C1"_ustr, table::BorderLine(0, 26, 26,
26)));
+ map1.insert(StringBorderPair(u"D1"_ustr, table::BorderLine(0, 53, 53,
53)));
+ map1.insert(StringBorderPair(u"E1"_ustr, table::BorderLine(0, 79, 79,
79)));
+ map1.insert(StringBorderPair(u"F1"_ustr, table::BorderLine(0, 106, 106,
106)));
BorderLineMap map2;
- map2.insert(StringBorderPair(OUString("A1"), table::BorderLine(0, 9, 5,
5)));
- map2.insert(StringBorderPair(OUString("B1"), table::BorderLine(0, 18, 9,
9)));
- map2.insert(StringBorderPair(OUString("C1"), table::BorderLine(0, 26, 14,
14)));
- map2.insert(StringBorderPair(OUString("D1"), table::BorderLine(0, 35, 18,
18)));
- map2.insert(StringBorderPair(OUString("E1"), table::BorderLine(0, 53, 26,
26)));
- map2.insert(StringBorderPair(OUString("F1"), table::BorderLine(0, 79, 41,
41)));
- map2.insert(StringBorderPair(OUString("G1"), table::BorderLine(0, 106, 53,
53)));
- map2.insert(StringBorderPair(OUString("H1"), table::BorderLine(0, 159, 79,
79)));
- map2.insert(StringBorderPair(OUString("I1"), table::BorderLine(0, 212,
106, 106)));
+ map2.insert(StringBorderPair(u"A1"_ustr, table::BorderLine(0, 9, 5, 5)));
+ map2.insert(StringBorderPair(u"B1"_ustr, table::BorderLine(0, 18, 9, 9)));
+ map2.insert(StringBorderPair(u"C1"_ustr, table::BorderLine(0, 26, 14,
14)));
+ map2.insert(StringBorderPair(u"D1"_ustr, table::BorderLine(0, 35, 18,
18)));
+ map2.insert(StringBorderPair(u"E1"_ustr, table::BorderLine(0, 53, 26,
26)));
+ map2.insert(StringBorderPair(u"F1"_ustr, table::BorderLine(0, 79, 41,
41)));
+ map2.insert(StringBorderPair(u"G1"_ustr, table::BorderLine(0, 106, 53,
53)));
+ map2.insert(StringBorderPair(u"H1"_ustr, table::BorderLine(0, 159, 79,
79)));
+ map2.insert(StringBorderPair(u"I1"_ustr, table::BorderLine(0, 212, 106,
106)));
BorderLineMap map3;
- map3.insert(StringBorderPair(OUString("A1"), table::BorderLine(0, 53, 26,
9)));
- map3.insert(StringBorderPair(OUString("B1"), table::BorderLine(0, 53, 26,
18)));
- map3.insert(StringBorderPair(OUString("C1"), table::BorderLine(0, 53, 26,
26)));
- map3.insert(StringBorderPair(OUString("D1"), table::BorderLine(0, 53, 26,
35)));
- map3.insert(StringBorderPair(OUString("E1"), table::BorderLine(0, 53, 26,
53)));
- map3.insert(StringBorderPair(OUString("F1"), table::BorderLine(0, 53, 26,
79)));
- map3.insert(StringBorderPair(OUString("G1"), table::BorderLine(0, 53, 26,
106)));
- map3.insert(StringBorderPair(OUString("H1"), table::BorderLine(0, 53, 26,
159)));
- map3.insert(StringBorderPair(OUString("I1"), table::BorderLine(0, 53, 26,
212)));
- map3.insert(StringBorderPair(OUString("A1"), table::BorderLine(0, 53, 26,
9)));
+ map3.insert(StringBorderPair(u"A1"_ustr, table::BorderLine(0, 53, 26, 9)));
+ map3.insert(StringBorderPair(u"B1"_ustr, table::BorderLine(0, 53, 26,
18)));
+ map3.insert(StringBorderPair(u"C1"_ustr, table::BorderLine(0, 53, 26,
26)));
+ map3.insert(StringBorderPair(u"D1"_ustr, table::BorderLine(0, 53, 26,
35)));
+ map3.insert(StringBorderPair(u"E1"_ustr, table::BorderLine(0, 53, 26,
53)));
+ map3.insert(StringBorderPair(u"F1"_ustr, table::BorderLine(0, 53, 26,
79)));
+ map3.insert(StringBorderPair(u"G1"_ustr, table::BorderLine(0, 53, 26,
106)));
+ map3.insert(StringBorderPair(u"H1"_ustr, table::BorderLine(0, 53, 26,
159)));
+ map3.insert(StringBorderPair(u"I1"_ustr, table::BorderLine(0, 53, 26,
212)));
+ map3.insert(StringBorderPair(u"A1"_ustr, table::BorderLine(0, 53, 26, 9)));
// Binary-DOC importer changes 'inset' and 'outset' border styles to other
styles
// during import, so for now - leaving binary-doc results as they were.
BorderLineMap map4;
if (isBinaryDoc)
{
- map4.insert(StringBorderPair(OUString("B1"), table::BorderLine(0, 53,
26, 18)));
- map4.insert(StringBorderPair(OUString("C1"), table::BorderLine(0, 53,
26, 26)));
- map4.insert(StringBorderPair(OUString("D1"), table::BorderLine(0, 53,
26, 35)));
- map4.insert(StringBorderPair(OUString("E1"), table::BorderLine(0, 53,
26, 35)));
- map4.insert(StringBorderPair(OUString("F1"), table::BorderLine(0, 53,
26, 79)));
- map4.insert(StringBorderPair(OUString("G1"), table::BorderLine(0, 53,
26, 106)));
- map4.insert(StringBorderPair(OUString("H1"), table::BorderLine(0, 53,
26, 159)));
- map4.insert(StringBorderPair(OUString("I1"), table::BorderLine(0, 53,
26, 212)));
+ map4.insert(StringBorderPair(u"B1"_ustr, table::BorderLine(0, 53, 26,
18)));
+ map4.insert(StringBorderPair(u"C1"_ustr, table::BorderLine(0, 53, 26,
26)));
+ map4.insert(StringBorderPair(u"D1"_ustr, table::BorderLine(0, 53, 26,
35)));
+ map4.insert(StringBorderPair(u"E1"_ustr, table::BorderLine(0, 53, 26,
35)));
+ map4.insert(StringBorderPair(u"F1"_ustr, table::BorderLine(0, 53, 26,
79)));
+ map4.insert(StringBorderPair(u"G1"_ustr, table::BorderLine(0, 53, 26,
106)));
+ map4.insert(StringBorderPair(u"H1"_ustr, table::BorderLine(0, 53, 26,
159)));
+ map4.insert(StringBorderPair(u"I1"_ustr, table::BorderLine(0, 53, 26,
212)));
}
else
{
- map4.insert(StringBorderPair(OUString("A1"), table::BorderLine(0, 0,
26, 4)));
- map4.insert(StringBorderPair(OUString("B1"), table::BorderLine(0, 5,
26, 5)));
- map4.insert(StringBorderPair(OUString("C1"), table::BorderLine(0, 14,
26, 14)));
- map4.insert(StringBorderPair(OUString("D1"), table::BorderLine(0, 23,
26, 23)));
- map4.insert(StringBorderPair(OUString("E1"), table::BorderLine(0, 41,
26, 41)));
- map4.insert(StringBorderPair(OUString("F1"), table::BorderLine(0, 67,
26, 67)));
- map4.insert(StringBorderPair(OUString("G1"), table::BorderLine(0, 93,
26, 93)));
- map4.insert(StringBorderPair(OUString("H1"), table::BorderLine(0, 146,
26, 146)));
- map4.insert(StringBorderPair(OUString("I1"), table::BorderLine(0, 199,
26, 199)));
+ map4.insert(StringBorderPair(u"A1"_ustr, table::BorderLine(0, 0, 26,
4)));
+ map4.insert(StringBorderPair(u"B1"_ustr, table::BorderLine(0, 5, 26,
5)));
+ map4.insert(StringBorderPair(u"C1"_ustr, table::BorderLine(0, 14, 26,
14)));
+ map4.insert(StringBorderPair(u"D1"_ustr, table::BorderLine(0, 23, 26,
23)));
+ map4.insert(StringBorderPair(u"E1"_ustr, table::BorderLine(0, 41, 26,
41)));
+ map4.insert(StringBorderPair(u"F1"_ustr, table::BorderLine(0, 67, 26,
67)));
+ map4.insert(StringBorderPair(u"G1"_ustr, table::BorderLine(0, 93, 26,
93)));
+ map4.insert(StringBorderPair(u"H1"_ustr, table::BorderLine(0, 146, 26,
146)));
+ map4.insert(StringBorderPair(u"I1"_ustr, table::BorderLine(0, 199, 26,
199)));
}
BorderLineMap map5;
if (isBinaryDoc)
{
- map5.insert(StringBorderPair(OUString("A1"), table::BorderLine(0, 26,
53, 9)));
- map5.insert(StringBorderPair(OUString("B1"), table::BorderLine(0, 26,
53, 18)));
- map5.insert(StringBorderPair(OUString("C1"), table::BorderLine(0, 26,
53, 26)));
- map5.insert(StringBorderPair(OUString("D1"), table::BorderLine(0, 26,
53, 35)));
- map5.insert(StringBorderPair(OUString("E1"), table::BorderLine(0, 26,
53, 53)));
- map5.insert(StringBorderPair(OUString("F1"), table::BorderLine(0, 26,
53, 79)));
- map5.insert(StringBorderPair(OUString("G1"), table::BorderLine(0, 26,
53, 106)));
- map5.insert(StringBorderPair(OUString("H1"), table::BorderLine(0, 26,
53, 159)));
- map5.insert(StringBorderPair(OUString("I1"), table::BorderLine(0, 26,
53, 212)));
+ map5.insert(StringBorderPair(u"A1"_ustr, table::BorderLine(0, 26, 53,
9)));
+ map5.insert(StringBorderPair(u"B1"_ustr, table::BorderLine(0, 26, 53,
18)));
+ map5.insert(StringBorderPair(u"C1"_ustr, table::BorderLine(0, 26, 53,
26)));
+ map5.insert(StringBorderPair(u"D1"_ustr, table::BorderLine(0, 26, 53,
35)));
+ map5.insert(StringBorderPair(u"E1"_ustr, table::BorderLine(0, 26, 53,
53)));
+ map5.insert(StringBorderPair(u"F1"_ustr, table::BorderLine(0, 26, 53,
79)));
+ map5.insert(StringBorderPair(u"G1"_ustr, table::BorderLine(0, 26, 53,
106)));
+ map5.insert(StringBorderPair(u"H1"_ustr, table::BorderLine(0, 26, 53,
159)));
+ map5.insert(StringBorderPair(u"I1"_ustr, table::BorderLine(0, 26, 53,
212)));
}
else
{
- map5.insert(StringBorderPair(OUString("A1"), table::BorderLine(0, 26,
2, 4)));
- map5.insert(StringBorderPair(OUString("B1"), table::BorderLine(0, 26,
5, 5)));
- map5.insert(StringBorderPair(OUString("C1"), table::BorderLine(0, 26,
14, 14)));
- map5.insert(StringBorderPair(OUString("D1"), table::BorderLine(0, 26,
23, 23)));
- map5.insert(StringBorderPair(OUString("E1"), table::BorderLine(0, 26,
41, 41)));
- map5.insert(StringBorderPair(OUString("F1"), table::BorderLine(0, 26,
67, 67)));
- map5.insert(StringBorderPair(OUString("G1"), table::BorderLine(0, 26,
93, 93)));
- map5.insert(StringBorderPair(OUString("H1"), table::BorderLine(0, 26,
146, 146)));
- map5.insert(StringBorderPair(OUString("I1"), table::BorderLine(0, 26,
199, 199)));
+ map5.insert(StringBorderPair(u"A1"_ustr, table::BorderLine(0, 26, 2,
4)));
+ map5.insert(StringBorderPair(u"B1"_ustr, table::BorderLine(0, 26, 5,
5)));
+ map5.insert(StringBorderPair(u"C1"_ustr, table::BorderLine(0, 26, 14,
14)));
+ map5.insert(StringBorderPair(u"D1"_ustr, table::BorderLine(0, 26, 23,
23)));
+ map5.insert(StringBorderPair(u"E1"_ustr, table::BorderLine(0, 26, 41,
41)));
+ map5.insert(StringBorderPair(u"F1"_ustr, table::BorderLine(0, 26, 67,
67)));
+ map5.insert(StringBorderPair(u"G1"_ustr, table::BorderLine(0, 26, 93,
93)));
+ map5.insert(StringBorderPair(u"H1"_ustr, table::BorderLine(0, 26, 146,
146)));
+ map5.insert(StringBorderPair(u"I1"_ustr, table::BorderLine(0, 26, 199,
199)));
}
BorderLineMap map6;
- map6.insert(StringBorderPair(OUString("A1"), table::BorderLine(0, 14, 14,
26)));
- map6.insert(StringBorderPair(OUString("B1"), table::BorderLine(0, 26, 26,
53)));
- map6.insert(StringBorderPair(OUString("C1"), table::BorderLine(0, 41, 41,
79)));
- map6.insert(StringBorderPair(OUString("D1"), table::BorderLine(0, 53, 53,
106)));
- map6.insert(StringBorderPair(OUString("E1"), table::BorderLine(0, 79, 79,
159)));
- map6.insert(StringBorderPair(OUString("F1"), table::BorderLine(0, 106,
106, 212)));
+ map6.insert(StringBorderPair(u"A1"_ustr, table::BorderLine(0, 14, 14,
26)));
+ map6.insert(StringBorderPair(u"B1"_ustr, table::BorderLine(0, 26, 26,
53)));
+ map6.insert(StringBorderPair(u"C1"_ustr, table::BorderLine(0, 41, 41,
79)));
+ map6.insert(StringBorderPair(u"D1"_ustr, table::BorderLine(0, 53, 53,
106)));
+ map6.insert(StringBorderPair(u"E1"_ustr, table::BorderLine(0, 79, 79,
159)));
+ map6.insert(StringBorderPair(u"F1"_ustr, table::BorderLine(0, 106, 106,
212)));
BorderLineMap map7;
- map7.insert(StringBorderPair(OUString("A1"), table::BorderLine(0, 14, 14,
26)));
- map7.insert(StringBorderPair(OUString("B1"), table::BorderLine(0, 26, 26,
53)));
- map7.insert(StringBorderPair(OUString("C1"), table::BorderLine(0, 41, 41,
79)));
- map7.insert(StringBorderPair(OUString("D1"), table::BorderLine(0, 53, 53,
106)));
- map7.insert(StringBorderPair(OUString("E1"), table::BorderLine(0, 79, 79,
159)));
- map7.insert(StringBorderPair(OUString("F1"), table::BorderLine(0, 106,
106, 212)));
+ map7.insert(StringBorderPair(u"A1"_ustr, table::BorderLine(0, 14, 14,
26)));
+ map7.insert(StringBorderPair(u"B1"_ustr, table::BorderLine(0, 26, 26,
53)));
+ map7.insert(StringBorderPair(u"C1"_ustr, table::BorderLine(0, 41, 41,
79)));
+ map7.insert(StringBorderPair(u"D1"_ustr, table::BorderLine(0, 53, 53,
106)));
+ map7.insert(StringBorderPair(u"E1"_ustr, table::BorderLine(0, 79, 79,
159)));
+ map7.insert(StringBorderPair(u"F1"_ustr, table::BorderLine(0, 106, 106,
212)));
sal_Int32 currentTable = 0; //to know which map should we check with the
current table
BorderLineMap* tempMap;
@@ -151,7 +151,7 @@ public:
uno::Reference<lang::XServiceInfo> xServiceInfo;
if (xParaEnum->nextElement() >>= xServiceInfo)
{
- if (xServiceInfo->supportsService("com.sun.star.text.TextTable"))
+ if
(xServiceInfo->supportsService(u"com.sun.star.text.TextTable"_ustr))
{
uno::Reference<text::XTextTable> const
xTextTable(xServiceInfo, uno::UNO_QUERY_THROW);
uno::Sequence<OUString> const cells =
xTextTable->getCellNames();
@@ -177,7 +177,7 @@ public:
{
uno::Reference<table::XCell> xCell =
xTextTable->getCellByName(rCell);
uno::Reference< beans::XPropertySet > xPropSet(xCell,
uno::UNO_QUERY_THROW);
- uno::Any aAny = xPropSet->getPropertyValue("TopBorder");
+ uno::Any aAny =
xPropSet->getPropertyValue(u"TopBorder"_ustr);
table::BorderLine aBorderLine;
it = tempMap->find(rCell);
if ((aAny >>= aBorderLine) && (it!=tempMap->end()))
diff --git a/sw/qa/uibase/dialog/dialog.cxx b/sw/qa/uibase/dialog/dialog.cxx
index b7c1f766c3f0..888f44614c4e 100644
--- a/sw/qa/uibase/dialog/dialog.cxx
+++ b/sw/qa/uibase/dialog/dialog.cxx
@@ -21,7 +21,7 @@ class Test : public SwModelTestBase
{
public:
Test()
- : SwModelTestBase("/sw/qa/uibase/dialog/data/")
+ : SwModelTestBase(u"/sw/qa/uibase/dialog/data/"_ustr)
{
}
};
@@ -36,10 +36,10 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertSection)
// When inserting a section with text:
uno::Sequence<css::beans::PropertyValue> aArgs = {
comphelper::makePropertyValue(
- "RegionName", uno::Any(OUString("ZOTERO_BIBL {} CSL_BIBLIOGRAPHY
RNDRfiit6mXBc"))),
- comphelper::makePropertyValue("Content",
uno::Any(OUString("<p>aaa</p><p>bbb</p>"))),
+ u"RegionName"_ustr, uno::Any(u"ZOTERO_BIBL {} CSL_BIBLIOGRAPHY
RNDRfiit6mXBc"_ustr)),
+ comphelper::makePropertyValue(u"Content"_ustr,
uno::Any(u"<p>aaa</p><p>bbb</p>"_ustr)),
};
- dispatchCommand(mxComponent, ".uno:InsertSection", aArgs);
+ dispatchCommand(mxComponent, u".uno:InsertSection"_ustr, aArgs);
// Then make sure that we created a section that covers that text:
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
@@ -51,7 +51,7 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertSection)
// - Expected: aaa
bbb
// - Actual :
// i.e. the value of the Content parameter was ignored.
- CPPUNIT_ASSERT_EQUAL(OUString("aaa
bbb"), aActualResult);
+ CPPUNIT_ASSERT_EQUAL(u"aaa
bbb"_ustr, aActualResult);
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/uibase/dochdl/dochdl.cxx b/sw/qa/uibase/dochdl/dochdl.cxx
index 2c209a65d3d9..fa62ff01a95d 100644
--- a/sw/qa/uibase/dochdl/dochdl.cxx
+++ b/sw/qa/uibase/dochdl/dochdl.cxx
@@ -32,7 +32,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseDochdlTest,
testSelectPasteFormat)
SwDoc* pDoc = getSwDoc();
SwDocShell* pDocShell = pDoc->GetDocShell();
SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
- pWrtShell->Insert2("x");
+ pWrtShell->Insert2(u"x"_ustr);
pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/true, 1,
/*bBasicCall=*/false);
rtl::Reference<SwTransferable> pTransfer = new SwTransferable(*pWrtShell);
pTransfer->Cut();
@@ -59,7 +59,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseDochdlTest, testComplexSelection)
SwDoc* pDoc = getSwDoc();
SwDocShell* pDocShell = pDoc->GetDocShell();
SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
- pWrtShell->Insert2("abc");
+ pWrtShell->Insert2(u"abc"_ustr);
pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/false, 1,
/*bBasicCall=*/false);
pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/true, 1,
/*bBasicCall=*/false);
SfxItemSet aSet(pWrtShell->GetView().GetPool(),
diff --git a/sw/qa/uibase/docvw/docvw.cxx b/sw/qa/uibase/docvw/docvw.cxx
index 280a0459109e..ddd2d064b6ea 100644
--- a/sw/qa/uibase/docvw/docvw.cxx
+++ b/sw/qa/uibase/docvw/docvw.cxx
@@ -39,10 +39,10 @@ CPPUNIT_TEST_FIXTURE(Test, testShiftClickOnImage)
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
uno::Reference<beans::XPropertySet> xTextGraphic(
- xMSF->createInstance("com.sun.star.text.TextGraphicObject"),
uno::UNO_QUERY);
- xTextGraphic->setPropertyValue("AnchorType",
+ xMSF->createInstance(u"com.sun.star.text.TextGraphicObject"_ustr),
uno::UNO_QUERY);
+ xTextGraphic->setPropertyValue(u"AnchorType"_ustr,
uno::Any(text::TextContentAnchorType_AS_CHARACTER));
- xTextGraphic->setPropertyValue("Size", uno::Any(awt::Size(5000, 5000)));
+ xTextGraphic->setPropertyValue(u"Size"_ustr, uno::Any(awt::Size(5000,
5000)));
uno::Reference<text::XTextContent> xTextContent(xTextGraphic,
uno::UNO_QUERY);
xText->insertTextContent(xCursor, xTextContent, false);
pWrtShell->SttEndDoc(/*bStt=*/false);
@@ -149,10 +149,10 @@ CPPUNIT_TEST_FIXTURE(Test, testShiftDoubleClickOnImage)
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
uno::Reference<beans::XPropertySet> xTextGraphic(
- xMSF->createInstance("com.sun.star.text.TextGraphicObject"),
uno::UNO_QUERY);
- xTextGraphic->setPropertyValue("AnchorType",
+ xMSF->createInstance(u"com.sun.star.text.TextGraphicObject"_ustr),
uno::UNO_QUERY);
+ xTextGraphic->setPropertyValue(u"AnchorType"_ustr,
uno::Any(text::TextContentAnchorType_AS_CHARACTER));
- xTextGraphic->setPropertyValue("Size", uno::Any(awt::Size(5000, 5000)));
+ xTextGraphic->setPropertyValue(u"Size"_ustr, uno::Any(awt::Size(5000,
5000)));
uno::Reference<text::XTextContent> xTextContent(xTextGraphic,
uno::UNO_QUERY);
xText->insertTextContent(xCursor, xTextContent, false);
pWrtShell->SttEndDoc(/*bStt=*/false);
diff --git a/sw/qa/uibase/fldui/fldui.cxx b/sw/qa/uibase/fldui/fldui.cxx
index 0bf6bfa33fb6..230c77735b7a 100644
--- a/sw/qa/uibase/fldui/fldui.cxx
+++ b/sw/qa/uibase/fldui/fldui.cxx
@@ -37,30 +37,30 @@ CPPUNIT_TEST_FIXTURE(Test, testBiblioPageNumberUpdate)
SwDoc* pDoc = getSwDoc();
uno::Reference<lang::XMultiServiceFactory> xFactory(mxComponent,
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xField(
- xFactory->createInstance("com.sun.star.text.TextField.Bibliography"),
uno::UNO_QUERY);
+
xFactory->createInstance(u"com.sun.star.text.TextField.Bibliography"_ustr),
uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aFields = {
- comphelper::makePropertyValue("BibiliographicType",
text::BibliographyDataType::WWW),
- comphelper::makePropertyValue("Identifier", OUString("AT")),
- comphelper::makePropertyValue("Author", OUString("Author")),
- comphelper::makePropertyValue("Title", OUString("Title")),
- comphelper::makePropertyValue("URL",
OUString("http://www.example.com/test.pdf#page=1";)),
+ comphelper::makePropertyValue(u"BibiliographicType"_ustr,
text::BibliographyDataType::WWW),
+ comphelper::makePropertyValue(u"Identifier"_ustr, u"AT"_ustr),
+ comphelper::makePropertyValue(u"Author"_ustr, u"Author"_ustr),
+ comphelper::makePropertyValue(u"Title"_ustr, u"Title"_ustr),
+ comphelper::makePropertyValue(u"URL"_ustr,
u"http://www.example.com/test.pdf#page=1"_ustr),
};
- xField->setPropertyValue("Fields", uno::Any(aFields));
+ xField->setPropertyValue(u"Fields"_ustr, uno::Any(aFields));
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
uno::Reference<text::XTextContent> xContent(xField, uno::UNO_QUERY);
xText->insertTextContent(xCursor, xContent, /*bAbsorb=*/false);
-
xField.set(xFactory->createInstance("com.sun.star.text.TextField.Bibliography"),
+
xField.set(xFactory->createInstance(u"com.sun.star.text.TextField.Bibliography"_ustr),
uno::UNO_QUERY);
aFields = {
- comphelper::makePropertyValue("BibiliographicType",
text::BibliographyDataType::WWW),
- comphelper::makePropertyValue("Identifier", OUString("AT")),
- comphelper::makePropertyValue("Author", OUString("Author")),
- comphelper::makePropertyValue("Title", OUString("Title")),
- comphelper::makePropertyValue("URL",
OUString("http://www.example.com/test.pdf#page=2";)),
+ comphelper::makePropertyValue(u"BibiliographicType"_ustr,
text::BibliographyDataType::WWW),
+ comphelper::makePropertyValue(u"Identifier"_ustr, u"AT"_ustr),
+ comphelper::makePropertyValue(u"Author"_ustr, u"Author"_ustr),
+ comphelper::makePropertyValue(u"Title"_ustr, u"Title"_ustr),
+ comphelper::makePropertyValue(u"URL"_ustr,
u"http://www.example.com/test.pdf#page=2"_ustr),
};
- xField->setPropertyValue("Fields", uno::Any(aFields));
+ xField->setPropertyValue(u"Fields"_ustr, uno::Any(aFields));
xContent.set(xField, uno::UNO_QUERY);
xText->insertTextContent(xCursor, xContent, /*bAbsorb=*/false);
@@ -74,7 +74,7 @@ CPPUNIT_TEST_FIXTURE(Test, testBiblioPageNumberUpdate)
aCoreFields[AUTH_FIELD_IDENTIFIER] = "AT";
aCoreFields[AUTH_FIELD_AUTHOR] = "Author";
aCoreFields[AUTH_FIELD_TITLE] = "Title";
- OUString aNewUrl = "http://www.example.com/test.pdf#page=42";;
+ OUString aNewUrl = u"http://www.example.com/test.pdf#page=42"_ustr;
aCoreFields[AUTH_FIELD_URL] = aNewUrl;
OUStringBuffer aFieldBuffer;
for (const auto& rField : aCoreFields)
@@ -102,12 +102,12 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertRefmark)
// When inserting a refmark with text:
uno::Sequence<css::beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("TypeName",
uno::Any(OUString("SetRef"))),
- comphelper::makePropertyValue(
- "Name", uno::Any(OUString("ZOTERO_ITEM CSL_CITATION {}
RNDpyJknp173F"))),
- comphelper::makePropertyValue("Content",
uno::Any(OUString("aaa<b>bbb</b>ccc"))),
+ comphelper::makePropertyValue(u"TypeName"_ustr,
uno::Any(u"SetRef"_ustr)),
+ comphelper::makePropertyValue(u"Name"_ustr,
+ uno::Any(u"ZOTERO_ITEM CSL_CITATION {}
RNDpyJknp173F"_ustr)),
+ comphelper::makePropertyValue(u"Content"_ustr,
uno::Any(u"aaa<b>bbb</b>ccc"_ustr)),
};
- dispatchCommand(mxComponent, ".uno:InsertField", aArgs);
+ dispatchCommand(mxComponent, u".uno:InsertField"_ustr, aArgs);
// Then make sure that we create a refmark that covers that text:
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
@@ -118,7 +118,7 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertRefmark)
// - Actual : 0
// i.e. no refmark was created, only the hard to read Type=12 created a
refmark.
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), aAttrs.size());
- CPPUNIT_ASSERT_EQUAL(OUString("aaabbbccc"), pTextNode->GetText());
+ CPPUNIT_ASSERT_EQUAL(u"aaabbbccc"_ustr, pTextNode->GetText());
}
CPPUNIT_TEST_FIXTURE(Test, testTdf68364InsertConditionalFieldWithTwoDots)
@@ -130,15 +130,15 @@ CPPUNIT_TEST_FIXTURE(Test,
testTdf68364InsertConditionalFieldWithTwoDots)
// Insert a conditional field containing exactly two dots for its condition
SwFieldMgr aFieldMgr(pWrtShell);
- SwInsertField_Data aFieldData(SwFieldTypesEnum::ConditionalText, 0,
"true", "19.12.2023", 0);
+ SwInsertField_Data aFieldData(SwFieldTypesEnum::ConditionalText, 0,
u"true"_ustr,
+ u"19.12.2023"_ustr, 0);
CPPUNIT_ASSERT(aFieldMgr.InsertField(aFieldData));
pWrtShell->SttEndDoc(true);
// Without the accompanying fix in place, this test would have failed with:
// - Expected: 19.12.2023
// - Actual :
- CPPUNIT_ASSERT_EQUAL(OUString("19.12.2023"),
- pWrtShell->GetCurField()->ExpandField(true, nullptr));
+ CPPUNIT_ASSERT_EQUAL(u"19.12.2023"_ustr,
pWrtShell->GetCurField()->ExpandField(true, nullptr));
}
CPPUNIT_TEST_FIXTURE(Test, testInsertRefmarkSelection)
@@ -147,12 +147,13 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertRefmarkSelection)
createSwDoc();
SwDoc* pDoc = getSwDoc();
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- pWrtShell->Insert2("myword");
+ pWrtShell->Insert2(u"myword"_ustr);
pWrtShell->SelAll();
// When inserting a refmark:
SwFieldMgr aMgr(pWrtShell);
- SwInsertField_Data aData(SwFieldTypesEnum::SetRef, /*nSubType=*/0,
"myname", "myword",
+ SwInsertField_Data aData(SwFieldTypesEnum::SetRef, /*nSubType=*/0,
u"myname"_ustr,
+ u"myword"_ustr,
/*nFormatId=*/0);
aMgr.InsertField(aData);
@@ -162,7 +163,7 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertRefmarkSelection)
// - Expected: myword
// - Actual : mywordmyword
// i.e. the content of the selection was duplicated.
- CPPUNIT_ASSERT_EQUAL(OUString("myword"), pTextNode->GetText());
+ CPPUNIT_ASSERT_EQUAL(u"myword"_ustr, pTextNode->GetText());
}
}
diff --git a/sw/qa/uibase/frmdlg/frmdlg.cxx b/sw/qa/uibase/frmdlg/frmdlg.cxx
index 81a7746170c1..9642310d7182 100644
--- a/sw/qa/uibase/frmdlg/frmdlg.cxx
+++ b/sw/qa/uibase/frmdlg/frmdlg.cxx
@@ -23,7 +23,7 @@ class SwUibaseFrmdlgTest : public SwModelTestBase
{
public:
SwUibaseFrmdlgTest()
- : SwModelTestBase("/sw/qa/uibase/frmdlg/data/")
+ : SwModelTestBase(u"/sw/qa/uibase/frmdlg/data/"_ustr)
{
}
};
@@ -39,25 +39,26 @@ CPPUNIT_TEST_FIXTURE(SwUibaseFrmdlgTest,
testWrappedMathObject)
// - Actual : 1 (AS_CHARACTER)
// i.e. the object lost its wrapping, leading to an incorrect position.
CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,
- getProperty<text::TextContentAnchorType>(getShape(1),
"AnchorType"));
+ getProperty<text::TextContentAnchorType>(getShape(1),
u"AnchorType"_ustr));
}
CPPUNIT_TEST_FIXTURE(SwUibaseFrmdlgTest, testAnchorTypeFromStyle)
{
// Given a document with aGraphics style with anchor type set to
as-character:
createSwDoc();
- uno::Reference<beans::XPropertySet>
xGraphics(getStyles("FrameStyles")->getByName("Graphics"),
- uno::UNO_QUERY);
- xGraphics->setPropertyValue("AnchorType",
uno::Any(text::TextContentAnchorType_AS_CHARACTER));
+ uno::Reference<beans::XPropertySet> xGraphics(
+ getStyles(u"FrameStyles"_ustr)->getByName(u"Graphics"_ustr),
uno::UNO_QUERY);
+ xGraphics->setPropertyValue(u"AnchorType"_ustr,
+
uno::Any(text::TextContentAnchorType_AS_CHARACTER));
// When inserting an image:
uno::Sequence<beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("FileName", createFileURL(u"image.png")),
+ comphelper::makePropertyValue(u"FileName"_ustr,
createFileURL(u"image.png")),
};
- dispatchCommand(mxComponent, ".uno:InsertGraphic", aArgs);
+ dispatchCommand(mxComponent, u".uno:InsertGraphic"_ustr, aArgs);
// Then make sure the image's anchor type is as-char:
- auto eActual = getProperty<text::TextContentAnchorType>(getShape(1),
"AnchorType");
+ auto eActual = getProperty<text::TextContentAnchorType>(getShape(1),
u"AnchorType"_ustr);
// Without the accompanying fix in place, this test would have failed with:
// - Expected: 1 (AS_CHARACTER)
// - Actual : 4 (AT_CHARACTER)
@@ -82,11 +83,11 @@ CPPUNIT_TEST_FIXTURE(SwUibaseFrmdlgTest,
testInsertFrameWidth)
pWrtShell->SetTableAttr(aSet);
}
pWrtShell->GoPrevCell();
- pWrtShell->Insert("A1");
+ pWrtShell->Insert(u"A1"_ustr);
SwFormatFrameSize aRowSize(SwFrameSize::Minimum);
pWrtShell->SetRowHeight(aRowSize);
pWrtShell->GoNextCell();
- pWrtShell->Insert("A2");
+ pWrtShell->Insert(u"A2"_ustr);
pWrtShell->SetRowHeight(aRowSize);
// Select cell:
pWrtShell->SelAll();
diff --git a/sw/qa/uibase/shells/shells.cxx b/sw/qa/uibase/shells/shells.cxx
index 9b27c79addb4..90c30f88038c 100644
--- a/sw/qa/uibase/shells/shells.cxx
+++ b/sw/qa/uibase/shells/shells.cxx
@@ -47,7 +47,7 @@ class SwUibaseShellsTest : public SwModelTestBase
{
public:
SwUibaseShellsTest()
- : SwModelTestBase("/sw/qa/uibase/shells/data/")
+ : SwModelTestBase(u"/sw/qa/uibase/shells/data/"_ustr)
{
}
};
@@ -129,7 +129,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testOleSavePreviewUpdate)
createSwDoc("ole-save-preview-update.odt");
// Explicitly update OLE previews, etc.
- dispatchCommand(mxComponent, ".uno:UpdateAll", {});
+ dispatchCommand(mxComponent, u".uno:UpdateAll"_ustr, {});
// Save the document and see if we get the previews.
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
@@ -140,8 +140,8 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testOleSavePreviewUpdate)
// Without the accompanying fix in place, this test would have failed,
because the object
// replacements were not generated, even after UpdateAll.
- CPPUNIT_ASSERT(xNameAccess->hasByName("ObjectReplacements/Object 1"));
- CPPUNIT_ASSERT(xNameAccess->hasByName("ObjectReplacements/Object 2"));
+ CPPUNIT_ASSERT(xNameAccess->hasByName(u"ObjectReplacements/Object
1"_ustr));
+ CPPUNIT_ASSERT(xNameAccess->hasByName(u"ObjectReplacements/Object
2"_ustr));
}
CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testOlePreviewUpdate)
@@ -150,7 +150,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testOlePreviewUpdate)
createSwDoc("ole-preview-update.odt");
// When updating "all" (including OLE previews):
- dispatchCommand(mxComponent, ".uno:UpdateAll", {});
+ dispatchCommand(mxComponent, u".uno:UpdateAll"_ustr, {});
// Then make sure the preview is no longer a 0-sized stream:
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
@@ -159,7 +159,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testOlePreviewUpdate)
=
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory),
maTempFile.GetURL());
uno::Reference<io::XInputStream> xInputStream(
- xNameAccess->getByName("ObjectReplacements/Object 1"), uno::UNO_QUERY);
+ xNameAccess->getByName(u"ObjectReplacements/Object 1"_ustr),
uno::UNO_QUERY);
std::unique_ptr<SvStream>
pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
// Without the accompanying fix in place, this test would have failed, the
stream was still
// empty.
@@ -173,15 +173,15 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testBibliographyUrlContextMenu)
SwDoc* pDoc = getSwDoc();
uno::Reference<lang::XMultiServiceFactory> xFactory(mxComponent,
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xField(
- xFactory->createInstance("com.sun.star.text.TextField.Bibliography"),
uno::UNO_QUERY);
+
xFactory->createInstance(u"com.sun.star.text.TextField.Bibliography"_ustr),
uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aFields = {
- comphelper::makePropertyValue("BibiliographicType",
text::BibliographyDataType::WWW),
- comphelper::makePropertyValue("Identifier", OUString("AT")),
- comphelper::makePropertyValue("Author", OUString("Author")),
- comphelper::makePropertyValue("Title", OUString("Title")),
- comphelper::makePropertyValue("URL",
OUString("http://www.example.com/test.pdf#page=1";)),
+ comphelper::makePropertyValue(u"BibiliographicType"_ustr,
text::BibliographyDataType::WWW),
+ comphelper::makePropertyValue(u"Identifier"_ustr, u"AT"_ustr),
+ comphelper::makePropertyValue(u"Author"_ustr, u"Author"_ustr),
+ comphelper::makePropertyValue(u"Title"_ustr, u"Title"_ustr),
+ comphelper::makePropertyValue(u"URL"_ustr,
u"http://www.example.com/test.pdf#page=1"_ustr),
};
- xField->setPropertyValue("Fields", uno::Any(aFields));
+ xField->setPropertyValue(u"Fields"_ustr, uno::Any(aFields));
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
@@ -221,39 +221,39 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testProtectedFieldsCopyHyperlinkLocatio
createSwDoc("protectedLinkCopy.fodt");
// Copy generic hyperlink
- dispatchCommand(mxComponent, ".uno:CopyHyperlinkLocation", {});
- dispatchCommand(mxComponent, ".uno:GoDown", {});
- dispatchCommand(mxComponent, ".uno:Paste", {});
+ dispatchCommand(mxComponent, u".uno:CopyHyperlinkLocation"_ustr, {});
+ dispatchCommand(mxComponent, u".uno:GoDown"_ustr, {});
+ dispatchCommand(mxComponent, u".uno:Paste"_ustr, {});
// Assert generic hyperlink was correctly copied and pasted
- CPPUNIT_ASSERT_EQUAL(OUString("http://reset.url/1";),
getParagraph(2)->getString());
+ CPPUNIT_ASSERT_EQUAL(u"http://reset.url/1"_ustr,
getParagraph(2)->getString());
- dispatchCommand(mxComponent, ".uno:GoDown", {});
- dispatchCommand(mxComponent, ".uno:GoLeft", {});
+ dispatchCommand(mxComponent, u".uno:GoDown"_ustr, {});
+ dispatchCommand(mxComponent, u".uno:GoLeft"_ustr, {});
// Copy bibliography mark hyperlink
- dispatchCommand(mxComponent, ".uno:CopyHyperlinkLocation", {});
- dispatchCommand(mxComponent, ".uno:GoDown", {});
- dispatchCommand(mxComponent, ".uno:Paste", {});
+ dispatchCommand(mxComponent, u".uno:CopyHyperlinkLocation"_ustr, {});
+ dispatchCommand(mxComponent, u".uno:GoDown"_ustr, {});
+ dispatchCommand(mxComponent, u".uno:Paste"_ustr, {});
// Assert bibliography mark hyperlink was correctly copied and pasted
- CPPUNIT_ASSERT_EQUAL(OUString("https://test.url/1";),
getParagraph(4)->getString());
+ CPPUNIT_ASSERT_EQUAL(u"https://test.url/1"_ustr,
getParagraph(4)->getString());
- dispatchCommand(mxComponent, ".uno:GoDown", {});
- dispatchCommand(mxComponent, ".uno:GoLeft", {});
+ dispatchCommand(mxComponent, u".uno:GoDown"_ustr, {});
+ dispatchCommand(mxComponent, u".uno:GoLeft"_ustr, {});
// Copy generic hyperlink
- dispatchCommand(mxComponent, ".uno:CopyHyperlinkLocation", {});
- dispatchCommand(mxComponent, ".uno:GoDown", {});
- dispatchCommand(mxComponent, ".uno:Paste", {});
+ dispatchCommand(mxComponent, u".uno:CopyHyperlinkLocation"_ustr, {});
+ dispatchCommand(mxComponent, u".uno:GoDown"_ustr, {});
+ dispatchCommand(mxComponent, u".uno:Paste"_ustr, {});
// Assert generic hyperlink was correctly copied and pasted
- CPPUNIT_ASSERT_EQUAL(OUString("http://reset.url/2";),
getParagraph(6)->getString());
+ CPPUNIT_ASSERT_EQUAL(u"http://reset.url/2"_ustr,
getParagraph(6)->getString());
- dispatchCommand(mxComponent, ".uno:GoDown", {});
- dispatchCommand(mxComponent, ".uno:GoDown", {});
- dispatchCommand(mxComponent, ".uno:GoLeft", {});
+ dispatchCommand(mxComponent, u".uno:GoDown"_ustr, {});
+ dispatchCommand(mxComponent, u".uno:GoDown"_ustr, {});
+ dispatchCommand(mxComponent, u".uno:GoLeft"_ustr, {});
// Copy bibliography table hyperlink
- dispatchCommand(mxComponent, ".uno:CopyHyperlinkLocation", {});
- dispatchCommand(mxComponent, ".uno:GoDown", {});
- dispatchCommand(mxComponent, ".uno:Paste", {});
+ dispatchCommand(mxComponent, u".uno:CopyHyperlinkLocation"_ustr, {});
+ dispatchCommand(mxComponent, u".uno:GoDown"_ustr, {});
+ dispatchCommand(mxComponent, u".uno:Paste"_ustr, {});
// Assert bibliography table entry hyperlink was correctly copied and
pasted
- CPPUNIT_ASSERT_EQUAL(OUString("https://test.url/1";),
getParagraph(9)->getString());
+ CPPUNIT_ASSERT_EQUAL(u"https://test.url/1"_ustr,
getParagraph(9)->getString());
}
CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testBibliographyLocalCopyContextMenu)
@@ -263,16 +263,16 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testBibliographyLocalCopyContextMenu)
SwDoc* pDoc = getSwDoc();
uno::Reference<lang::XMultiServiceFactory> xFactory(mxComponent,
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xField(
- xFactory->createInstance("com.sun.star.text.TextField.Bibliography"),
uno::UNO_QUERY);
+
xFactory->createInstance(u"com.sun.star.text.TextField.Bibliography"_ustr),
uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aFields = {
- comphelper::makePropertyValue("BibiliographicType",
text::BibliographyDataType::WWW),
- comphelper::makePropertyValue("Identifier", OUString("AT")),
- comphelper::makePropertyValue("Author", OUString("Author")),
- comphelper::makePropertyValue("Title", OUString("Title")),
- comphelper::makePropertyValue("URL",
OUString("http://www.example.com/test.pdf#page=1";)),
- comphelper::makePropertyValue("LocalURL",
OUString("file:///home/me/test.pdf")),
+ comphelper::makePropertyValue(u"BibiliographicType"_ustr,
text::BibliographyDataType::WWW),
+ comphelper::makePropertyValue(u"Identifier"_ustr, u"AT"_ustr),
+ comphelper::makePropertyValue(u"Author"_ustr, u"Author"_ustr),
+ comphelper::makePropertyValue(u"Title"_ustr, u"Title"_ustr),
+ comphelper::makePropertyValue(u"URL"_ustr,
u"http://www.example.com/test.pdf#page=1"_ustr),
+ comphelper::makePropertyValue(u"LocalURL"_ustr,
u"file:///home/me/test.pdf"_ustr),
};
- xField->setPropertyValue("Fields", uno::Any(aFields));
+ xField->setPropertyValue(u"Fields"_ustr, uno::Any(aFields));
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
@@ -304,18 +304,18 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testContentControlPageBreak)
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
- xText->insertString(xCursor, "test", /*bAbsorb=*/false);
+ xText->insertString(xCursor, u"test"_ustr, /*bAbsorb=*/false);
xCursor->gotoStart(/*bExpand=*/false);
xCursor->gotoEnd(/*bExpand=*/true);
uno::Reference<text::XTextContent> xContentControl(
- xMSF->createInstance("com.sun.star.text.ContentControl"),
uno::UNO_QUERY);
+ xMSF->createInstance(u"com.sun.star.text.ContentControl"_ustr),
uno::UNO_QUERY);
xText->insertTextContent(xCursor, xContentControl, /*bAbsorb=*/true);
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
pWrtShell->SttEndDoc(/*bStt=*/true);
pWrtShell->Right(SwCursorSkipMode::Chars, /*bSelect=*/false, 1,
/*bBasicCall=*/false);
// When trying to insert a page break:
- dispatchCommand(mxComponent, ".uno:InsertPagebreak", {});
+ dispatchCommand(mxComponent, u".uno:InsertPagebreak"_ustr, {});
// Then make sure that the document still has a single page:
// Without the accompanying fix in place, this test would have failed with:
@@ -333,13 +333,13 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testInsertTextFormField)
SwDoc* pDoc = getSwDoc();
// When inserting an ODF_UNHANDLED fieldmark:
- OUString aExpectedCommand("ADDIN ZOTERO_BIBL foo bar");
+ OUString aExpectedCommand(u"ADDIN ZOTERO_BIBL foo bar"_ustr);
uno::Sequence<css::beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("FieldType", uno::Any(ODF_UNHANDLED)),
- comphelper::makePropertyValue("FieldCommand",
uno::Any(aExpectedCommand)),
- comphelper::makePropertyValue("FieldResult",
uno::Any(OUString("<p>aaa</p><p>bbb</p>"))),
+ comphelper::makePropertyValue(u"FieldType"_ustr,
uno::Any(ODF_UNHANDLED)),
+ comphelper::makePropertyValue(u"FieldCommand"_ustr,
uno::Any(aExpectedCommand)),
+ comphelper::makePropertyValue(u"FieldResult"_ustr,
uno::Any(u"<p>aaa</p><p>bbb</p>"_ustr)),
};
- dispatchCommand(mxComponent, ".uno:TextFormField", aArgs);
+ dispatchCommand(mxComponent, u".uno:TextFormField"_ustr, aArgs);
// Then make sure that it's type/name is correct:
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
@@ -367,7 +367,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testInsertTextFormField)
aPam.GetPoint()->SetContent(aPam.GetPoint()->GetContentIndex() - 1);
CPPUNIT_ASSERT(aPam.HasMark());
OUString aActualResult = aPam.GetText();
- CPPUNIT_ASSERT_EQUAL(OUString("aaa
bbb"), aActualResult);
+ CPPUNIT_ASSERT_EQUAL(u"aaa
bbb"_ustr, aActualResult);
}
CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testUpdateFieldmarks)
@@ -376,44 +376,44 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testUpdateFieldmarks)
createSwDoc();
{
uno::Sequence<css::beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("FieldType",
uno::Any(ODF_UNHANDLED)),
- comphelper::makePropertyValue("FieldCommand",
- uno::Any(OUString("ADDIN ZOTERO_ITEM
old command 1"))),
- comphelper::makePropertyValue("FieldResult",
uno::Any(OUString("old result 1"))),
+ comphelper::makePropertyValue(u"FieldType"_ustr,
uno::Any(ODF_UNHANDLED)),
+ comphelper::makePropertyValue(u"FieldCommand"_ustr,
+ uno::Any(u"ADDIN ZOTERO_ITEM old
command 1"_ustr)),
+ comphelper::makePropertyValue(u"FieldResult"_ustr, uno::Any(u"old
result 1"_ustr)),
};
- dispatchCommand(mxComponent, ".uno:TextFormField", aArgs);
+ dispatchCommand(mxComponent, u".uno:TextFormField"_ustr, aArgs);
}
{
uno::Sequence<css::beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("FieldType",
uno::Any(ODF_UNHANDLED)),
- comphelper::makePropertyValue("FieldCommand",
- uno::Any(OUString("ADDIN ZOTERO_ITEM
old command 2"))),
- comphelper::makePropertyValue("FieldResult",
uno::Any(OUString("old result 2"))),
+ comphelper::makePropertyValue(u"FieldType"_ustr,
uno::Any(ODF_UNHANDLED)),
+ comphelper::makePropertyValue(u"FieldCommand"_ustr,
+ uno::Any(u"ADDIN ZOTERO_ITEM old
command 2"_ustr)),
+ comphelper::makePropertyValue(u"FieldResult"_ustr, uno::Any(u"old
result 2"_ustr)),
};
- dispatchCommand(mxComponent, ".uno:TextFormField", aArgs);
+ dispatchCommand(mxComponent, u".uno:TextFormField"_ustr, aArgs);
}
// When updating those fieldmarks:
uno::Sequence<css::beans::PropertyValue> aField1{
- comphelper::makePropertyValue("FieldType", uno::Any(ODF_UNHANDLED)),
- comphelper::makePropertyValue("FieldCommand",
- uno::Any(OUString("ADDIN ZOTERO_ITEM new
command 1"))),
- comphelper::makePropertyValue("FieldResult", uno::Any(OUString("new
result 1"))),
+ comphelper::makePropertyValue(u"FieldType"_ustr,
uno::Any(ODF_UNHANDLED)),
+ comphelper::makePropertyValue(u"FieldCommand"_ustr,
+ uno::Any(u"ADDIN ZOTERO_ITEM new command
1"_ustr)),
+ comphelper::makePropertyValue(u"FieldResult"_ustr, uno::Any(u"new
result 1"_ustr)),
};
uno::Sequence<css::beans::PropertyValue> aField2{
- comphelper::makePropertyValue("FieldType", uno::Any(ODF_UNHANDLED)),
- comphelper::makePropertyValue("FieldCommand",
- uno::Any(OUString("ADDIN ZOTERO_ITEM new
command 2"))),
- comphelper::makePropertyValue("FieldResult", uno::Any(OUString("new
result 2"))),
+ comphelper::makePropertyValue(u"FieldType"_ustr,
uno::Any(ODF_UNHANDLED)),
+ comphelper::makePropertyValue(u"FieldCommand"_ustr,
+ uno::Any(u"ADDIN ZOTERO_ITEM new command
2"_ustr)),
+ comphelper::makePropertyValue(u"FieldResult"_ustr, uno::Any(u"new
result 2"_ustr)),
};
uno::Sequence<uno::Sequence<css::beans::PropertyValue>> aFields = {
aField1, aField2 };
uno::Sequence<css::beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("FieldType", uno::Any(ODF_UNHANDLED)),
- comphelper::makePropertyValue("FieldCommandPrefix",
- uno::Any(OUString("ADDIN ZOTERO_ITEM"))),
- comphelper::makePropertyValue("Fields", uno::Any(aFields)),
+ comphelper::makePropertyValue(u"FieldType"_ustr,
uno::Any(ODF_UNHANDLED)),
+ comphelper::makePropertyValue(u"FieldCommandPrefix"_ustr,
+ uno::Any(u"ADDIN ZOTERO_ITEM"_ustr)),
+ comphelper::makePropertyValue(u"Fields"_ustr, uno::Any(aFields)),
};
- dispatchCommand(mxComponent, ".uno:TextFormFields", aArgs);
+ dispatchCommand(mxComponent, u".uno:TextFormFields"_ustr, aArgs);
// Then make sure that the document text contains the new field results:
SwDoc* pDoc = getSwDoc();
@@ -428,7 +428,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testUpdateFieldmarks)
// - Expected: new result 1new result 2
// - Actual : old result 1old result 2
// i.e. the fieldmarks were not updated.
- CPPUNIT_ASSERT_EQUAL(OUString("new result 1new result 2"), aActual);
+ CPPUNIT_ASSERT_EQUAL(u"new result 1new result 2"_ustr, aActual);
}
CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testInsertBookmark)
@@ -438,12 +438,12 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testInsertBookmark)
SwDoc* pDoc = getSwDoc();
// When inserting a bookmark with text:
- OUString aExpectedBookmarkName("ZOTERO_BREF_GiQ7DAWQYWLy");
+ OUString aExpectedBookmarkName(u"ZOTERO_BREF_GiQ7DAWQYWLy"_ustr);
uno::Sequence<css::beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("Bookmark",
uno::Any(aExpectedBookmarkName)),
- comphelper::makePropertyValue("BookmarkText",
uno::Any(OUString("<p>aaa</p><p>bbb</p>"))),
+ comphelper::makePropertyValue(u"Bookmark"_ustr,
uno::Any(aExpectedBookmarkName)),
+ comphelper::makePropertyValue(u"BookmarkText"_ustr,
uno::Any(u"<p>aaa</p><p>bbb</p>"_ustr)),
};
- dispatchCommand(mxComponent, ".uno:InsertBookmark", aArgs);
+ dispatchCommand(mxComponent, u".uno:InsertBookmark"_ustr, aArgs);
// Then make sure that we create a bookmark that covers that text:
IDocumentMarkAccess& rIDMA = *pDoc->getIDocumentMarkAccess();
@@ -458,7 +458,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testInsertBookmark)
// - Expected: aaa
bbb
// - Actual :
// i.e. no text was inserted, the bookmark was collapsed.
- CPPUNIT_ASSERT_EQUAL(OUString("aaa
bbb"), aActualResult);
+ CPPUNIT_ASSERT_EQUAL(u"aaa
bbb"_ustr, aActualResult);
}
}
@@ -470,15 +470,15 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testGotoMark)
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
pWrtShell->SplitNode();
pWrtShell->SttEndDoc(/*bStt=*/false);
- pWrtShell->SetBookmark(vcl::KeyCode(), "mybookmark");
+ pWrtShell->SetBookmark(vcl::KeyCode(), u"mybookmark"_ustr);
SwNodeOffset nExpected = pWrtShell->GetCursor()->GetPointNode().GetIndex();
// When jumping to that mark from the doc start:
pWrtShell->SttEndDoc(/*bStt=*/true);
uno::Sequence<css::beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("GotoMark",
uno::Any(OUString("mybookmark"))),
+ comphelper::makePropertyValue(u"GotoMark"_ustr,
uno::Any(u"mybookmark"_ustr)),
};
- dispatchCommand(mxComponent, ".uno:GotoMark", aArgs);
+ dispatchCommand(mxComponent, u".uno:GotoMark"_ustr, aArgs);
// Then make sure that the final cursor position is at the bookmark:
SwNodeOffset nActual = pWrtShell->GetCursor()->GetPointNode().GetIndex();
@@ -495,14 +495,14 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testUpdateBookmarks)
createSwDoc();
SwDoc* pDoc = getSwDoc();
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- pWrtShell->Insert("ABCDE");
+ pWrtShell->Insert(u"ABCDE"_ustr);
pWrtShell->SttEndDoc(/*bStt=*/true);
pWrtShell->Right(SwCursorSkipMode::Chars, /*bSelect=*/false, 1,
/*bBasicCall=*/false);
pWrtShell->Right(SwCursorSkipMode::Chars, /*bSelect=*/true, 1,
/*bBasicCall=*/false);
- pWrtShell->SetBookmark(vcl::KeyCode(), "ZOTERO_BREF_GiQ7DAWQYWLy");
+ pWrtShell->SetBookmark(vcl::KeyCode(), u"ZOTERO_BREF_GiQ7DAWQYWLy"_ustr);
pWrtShell->Right(SwCursorSkipMode::Chars, /*bSelect=*/false, 1,
/*bBasicCall=*/false);
pWrtShell->Right(SwCursorSkipMode::Chars, /*bSelect=*/true, 1,
/*bBasicCall=*/false);
- pWrtShell->SetBookmark(vcl::KeyCode(), "ZOTERO_BREF_PRxDGUb4SWXF");
+ pWrtShell->SetBookmark(vcl::KeyCode(), u"ZOTERO_BREF_PRxDGUb4SWXF"_ustr);
// When updating the content of bookmarks:
pWrtShell->SttEndDoc(/*bStt=*/true);
@@ -540,7 +540,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testUpdateBookmarks)
}
)json"_ostr);
uno::Sequence<beans::PropertyValue> aArgs =
comphelper::containerToSequence(aArgsVec);
- dispatchCommand(mxComponent, ".uno:UpdateBookmarks", aArgs);
+ dispatchCommand(mxComponent, u".uno:UpdateBookmarks"_ustr, aArgs);
// Then make sure that the only paragraph is updated correctly:
SwCursor* pCursor = pWrtShell->GetCursor();
@@ -549,11 +549,11 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testUpdateBookmarks)
// - Expected: Anew result 1Cnew result 2E
// - Actual : ABCDE
// i.e. the content was not updated.
- CPPUNIT_ASSERT_EQUAL(OUString("Anew result 1Cnew result 2E"), aActual);
+ CPPUNIT_ASSERT_EQUAL(u"Anew result 1Cnew result 2E"_ustr, aActual);
// Without the accompanying fix in place, this test would have failed,
ZOTERO_BREF_GiQ7DAWQYWLy
// was not renamed to ZOTERO_BREF_new1.
- auto it = pDoc->getIDocumentMarkAccess()->findMark("ZOTERO_BREF_new1");
+ auto it =
pDoc->getIDocumentMarkAccess()->findMark(u"ZOTERO_BREF_new1"_ustr);
CPPUNIT_ASSERT(it != pDoc->getIDocumentMarkAccess()->getAllMarksEnd());
}
@@ -562,11 +562,11 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testInsertFieldmarkReadonly)
// Given a document with a fieldmark, the cursor inside the fieldmark:
createSwDoc();
uno::Sequence<css::beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("FieldType", uno::Any(ODF_UNHANDLED)),
- comphelper::makePropertyValue("FieldCommand", uno::Any(OUString("my
command"))),
- comphelper::makePropertyValue("FieldResult", uno::Any(OUString("my
result"))),
+ comphelper::makePropertyValue(u"FieldType"_ustr,
uno::Any(ODF_UNHANDLED)),
+ comphelper::makePropertyValue(u"FieldCommand"_ustr, uno::Any(u"my
command"_ustr)),
+ comphelper::makePropertyValue(u"FieldResult"_ustr, uno::Any(u"my
result"_ustr)),
};
- dispatchCommand(mxComponent, ".uno:TextFormField", aArgs);
+ dispatchCommand(mxComponent, u".uno:TextFormField"_ustr, aArgs);
SwDoc* pDoc = getSwDoc();
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
SwCursor* pCursor = pWrtShell->GetCursor();
@@ -575,7 +575,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testInsertFieldmarkReadonly)
// When trying to insert an inner fieldmark:
// Without the accompanying fix in place, this test would have crashed.
- dispatchCommand(mxComponent, ".uno:TextFormField", aArgs);
+ dispatchCommand(mxComponent, u".uno:TextFormField"_ustr, aArgs);
// Then make sure the read-only content refuses to accept that inner
fieldmark, so we still have
// just one:
@@ -594,22 +594,22 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testUpdateRefmarks)
createSwDoc();
SwDoc* pDoc = getSwDoc();
uno::Sequence<css::beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("TypeName",
uno::Any(OUString("SetRef"))),
- comphelper::makePropertyValue("Name", uno::Any(OUString("some other
old refmark"))),
- comphelper::makePropertyValue("Content", uno::Any(OUString("some other
old content"))),
+ comphelper::makePropertyValue(u"TypeName"_ustr,
uno::Any(u"SetRef"_ustr)),
+ comphelper::makePropertyValue(u"Name"_ustr, uno::Any(u"some other old
refmark"_ustr)),
+ comphelper::makePropertyValue(u"Content"_ustr, uno::Any(u"some other
old content"_ustr)),
};
- dispatchCommand(mxComponent, ".uno:InsertField", aArgs);
+ dispatchCommand(mxComponent, u".uno:InsertField"_ustr, aArgs);
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
pWrtShell->SttEndDoc(/*bStt=*/false);
pWrtShell->SplitNode();
pWrtShell->SttEndDoc(/*bStt=*/false);
aArgs = {
- comphelper::makePropertyValue("TypeName",
uno::Any(OUString("SetRef"))),
- comphelper::makePropertyValue(
- "Name", uno::Any(OUString("ZOTERO_ITEM CSL_CITATION {} old
refmark"))),
- comphelper::makePropertyValue("Content", uno::Any(OUString("old
content"))),
+ comphelper::makePropertyValue(u"TypeName"_ustr,
uno::Any(u"SetRef"_ustr)),
+ comphelper::makePropertyValue(u"Name"_ustr,
+ uno::Any(u"ZOTERO_ITEM CSL_CITATION {}
old refmark"_ustr)),
+ comphelper::makePropertyValue(u"Content"_ustr, uno::Any(u"old
content"_ustr)),
};
- dispatchCommand(mxComponent, ".uno:InsertField", aArgs);
+ dispatchCommand(mxComponent, u".uno:InsertField"_ustr, aArgs);
// When updating that refmark:
std::vector<beans::PropertyValue> aArgsVec =
comphelper::JsonToPropertyValues(R"json(
@@ -640,7 +640,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testUpdateRefmarks)
}
)json"_ostr);
aArgs = comphelper::containerToSequence(aArgsVec);
- dispatchCommand(mxComponent, ".uno:UpdateFields", aArgs);
+ dispatchCommand(mxComponent, u".uno:UpdateFields"_ustr, aArgs);
// Then make sure that the document text features the new content:
SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
@@ -648,7 +648,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testUpdateRefmarks)
// - Expected: new content
// - Actual : old content
// i.e. the doc content was not updated.
- CPPUNIT_ASSERT_EQUAL(OUString("new content"), pTextNode->GetText());
+ CPPUNIT_ASSERT_EQUAL(u"new content"_ustr, pTextNode->GetText());
}
CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testUpdateFieldmark)
@@ -656,12 +656,12 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testUpdateFieldmark)
// Given a document with a fieldmark:
createSwDoc();
uno::Sequence<css::beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("FieldType", uno::Any(ODF_UNHANDLED)),
- comphelper::makePropertyValue("FieldCommand",
- uno::Any(OUString("ADDIN ZOTERO_ITEM old
command 1"))),
- comphelper::makePropertyValue("FieldResult", uno::Any(OUString("old
result 1"))),
+ comphelper::makePropertyValue(u"FieldType"_ustr,
uno::Any(ODF_UNHANDLED)),
+ comphelper::makePropertyValue(u"FieldCommand"_ustr,
+ uno::Any(u"ADDIN ZOTERO_ITEM old command
1"_ustr)),
+ comphelper::makePropertyValue(u"FieldResult"_ustr, uno::Any(u"old
result 1"_ustr)),
};
- dispatchCommand(mxComponent, ".uno:TextFormField", aArgs);
+ dispatchCommand(mxComponent, u".uno:TextFormField"_ustr, aArgs);
// When updating that fieldmark to have new field command & result:
SwDoc* pDoc = getSwDoc();
@@ -698,7 +698,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testUpdateFieldmark)
}
)json"_ostr);
aArgs = comphelper::containerToSequence(aArgsVec);
- dispatchCommand(mxComponent, ".uno:UpdateTextFormField", aArgs);
+ dispatchCommand(mxComponent, u".uno:UpdateTextFormField"_ustr, aArgs);
// Then make sure that the document text is updated accordingly:
SwCursor* pCursor = pWrtShell->GetCursor();
@@ -710,7 +710,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testUpdateFieldmark)
// - Expected: new result 1
// - Actual : old result 1
// i.e. the document text was not updated.
- CPPUNIT_ASSERT_EQUAL(OUString("new result 1"), aActual);
+ CPPUNIT_ASSERT_EQUAL(u"new result 1"_ustr, aActual);
}
CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testUpdateSections)
@@ -718,11 +718,11 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testUpdateSections)
// Given a document with a section:
createSwDoc();
uno::Sequence<css::beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("RegionName",
- uno::Any(OUString("ZOTERO_BIBL {}
CSL_BIBLIOGRAPHY RNDold"))),
- comphelper::makePropertyValue("Content", uno::Any(OUString("old
content"))),
+ comphelper::makePropertyValue(u"RegionName"_ustr,
+ uno::Any(u"ZOTERO_BIBL {}
CSL_BIBLIOGRAPHY RNDold"_ustr)),
+ comphelper::makePropertyValue(u"Content"_ustr, uno::Any(u"old
content"_ustr)),
};
- dispatchCommand(mxComponent, ".uno:InsertSection", aArgs);
+ dispatchCommand(mxComponent, u".uno:InsertSection"_ustr, aArgs);
// When updating that section:
std::vector<beans::PropertyValue> aArgsVec =
comphelper::JsonToPropertyValues(R"json(
@@ -749,7 +749,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testUpdateSections)
}
)json"_ostr);
aArgs = comphelper::containerToSequence(aArgsVec);
- dispatchCommand(mxComponent, ".uno:UpdateSections", aArgs);
+ dispatchCommand(mxComponent, u".uno:UpdateSections"_ustr, aArgs);
// Then make sure that the section is updated:
SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
@@ -761,7 +761,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testUpdateSections)
// - Expected: new content
// - Actual : old content
// i.e. the content wasn't updated.
- CPPUNIT_ASSERT_EQUAL(OUString("new content"), aActualResult);
+ CPPUNIT_ASSERT_EQUAL(u"new content"_ustr, aActualResult);
}
CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testDeleteFieldmarks)
@@ -770,29 +770,29 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testDeleteFieldmarks)
createSwDoc();
{
uno::Sequence<css::beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("FieldType",
uno::Any(ODF_UNHANDLED)),
- comphelper::makePropertyValue("FieldCommand",
- uno::Any(OUString("ADDIN ZOTERO_ITEM
old command 1"))),
- comphelper::makePropertyValue("FieldResult",
uno::Any(OUString("result 1"))),
+ comphelper::makePropertyValue(u"FieldType"_ustr,
uno::Any(ODF_UNHANDLED)),
+ comphelper::makePropertyValue(u"FieldCommand"_ustr,
+ uno::Any(u"ADDIN ZOTERO_ITEM old
command 1"_ustr)),
+ comphelper::makePropertyValue(u"FieldResult"_ustr,
uno::Any(u"result 1"_ustr)),
};
- dispatchCommand(mxComponent, ".uno:TextFormField", aArgs);
+ dispatchCommand(mxComponent, u".uno:TextFormField"_ustr, aArgs);
}
{
uno::Sequence<css::beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("FieldType",
uno::Any(ODF_UNHANDLED)),
- comphelper::makePropertyValue("FieldCommand",
- uno::Any(OUString("ADDIN ZOTERO_ITEM
old command 2"))),
- comphelper::makePropertyValue("FieldResult",
uno::Any(OUString("result 2"))),
+ comphelper::makePropertyValue(u"FieldType"_ustr,
uno::Any(ODF_UNHANDLED)),
+ comphelper::makePropertyValue(u"FieldCommand"_ustr,
+ uno::Any(u"ADDIN ZOTERO_ITEM old
command 2"_ustr)),
+ comphelper::makePropertyValue(u"FieldResult"_ustr,
uno::Any(u"result 2"_ustr)),
};
- dispatchCommand(mxComponent, ".uno:TextFormField", aArgs);
+ dispatchCommand(mxComponent, u".uno:TextFormField"_ustr, aArgs);
}
// When deleting those fieldmarks:
uno::Sequence<css::beans::PropertyValue> aArgs
- = { comphelper::makePropertyValue("FieldType",
uno::Any(ODF_UNHANDLED)),
- comphelper::makePropertyValue("FieldCommandPrefix",
- uno::Any(OUString("ADDIN
ZOTERO_ITEM"))) };
- dispatchCommand(mxComponent, ".uno:DeleteTextFormFields", aArgs);
+ = { comphelper::makePropertyValue(u"FieldType"_ustr,
uno::Any(ODF_UNHANDLED)),
+ comphelper::makePropertyValue(u"FieldCommandPrefix"_ustr,
+ uno::Any(u"ADDIN ZOTERO_ITEM"_ustr))
};
+ dispatchCommand(mxComponent, u".uno:DeleteTextFormFields"_ustr, aArgs);
// Then make sure that the document doesn't contain fields anymore:
SwDoc* pDoc = getSwDoc();
@@ -806,7 +806,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testDeleteFieldmarks)
pWrtShell->SttEndDoc(/*bStt=*/true);
SwCursor* pCursor = pWrtShell->GetCursor();
OUString aActual = pCursor->Start()->GetNode().GetTextNode()->GetText();
- CPPUNIT_ASSERT_EQUAL(OUString("result 1result 2"), aActual);
+ CPPUNIT_ASSERT_EQUAL(u"result 1result 2"_ustr, aActual);
}
CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testUpdateBookmark)
@@ -815,11 +815,11 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testUpdateBookmark)
createSwDoc();
SwDoc* pDoc = getSwDoc();
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- pWrtShell->Insert("ABCD");
+ pWrtShell->Insert(u"ABCD"_ustr);
pWrtShell->SttEndDoc(/*bStt=*/true);
pWrtShell->Right(SwCursorSkipMode::Chars, /*bSelect=*/false, 1,
/*bBasicCall=*/false);
pWrtShell->Right(SwCursorSkipMode::Chars, /*bSelect=*/true, 2,
/*bBasicCall=*/false);
- pWrtShell->SetBookmark(vcl::KeyCode(), "ZOTERO_BREF_old");
+ pWrtShell->SetBookmark(vcl::KeyCode(), u"ZOTERO_BREF_old"_ustr);
// When updating the content of the bookmark under the cursor:
pWrtShell->SttEndDoc(/*bStt=*/true);
@@ -846,7 +846,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testUpdateBookmark)
}
)json"_ostr);
uno::Sequence<beans::PropertyValue> aArgs =
comphelper::containerToSequence(aArgsVec);
- dispatchCommand(mxComponent, ".uno:UpdateBookmark", aArgs);
+ dispatchCommand(mxComponent, u".uno:UpdateBookmark"_ustr, aArgs);
// Then make sure that the only paragraph is updated correctly:
SwCursor* pCursor = pWrtShell->GetCursor();
@@ -855,8 +855,8 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testUpdateBookmark)
// - Expected: Anew resultD
// - Actual : ABCD
// i.e. it was not possible to update just the bookmark under cursor.
- CPPUNIT_ASSERT_EQUAL(OUString("Anew resultD"), aActual);
- auto it = pDoc->getIDocumentMarkAccess()->findMark("ZOTERO_BREF_new");
+ CPPUNIT_ASSERT_EQUAL(u"Anew resultD"_ustr, aActual);
+ auto it =
pDoc->getIDocumentMarkAccess()->findMark(u"ZOTERO_BREF_new"_ustr);
CPPUNIT_ASSERT(it != pDoc->getIDocumentMarkAccess()->getAllMarksEnd());
}
@@ -866,12 +866,12 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testUpdateRefmark)
createSwDoc();
SwDoc* pDoc = getSwDoc();
uno::Sequence<css::beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("TypeName",
uno::Any(OUString("SetRef"))),
- comphelper::makePropertyValue(
- "Name", uno::Any(OUString("ZOTERO_ITEM CSL_CITATION {} old
refmark"))),
- comphelper::makePropertyValue("Content", uno::Any(OUString("old
content"))),
+ comphelper::makePropertyValue(u"TypeName"_ustr,
uno::Any(u"SetRef"_ustr)),
+ comphelper::makePropertyValue(u"Name"_ustr,
+ uno::Any(u"ZOTERO_ITEM CSL_CITATION {}
old refmark"_ustr)),
+ comphelper::makePropertyValue(u"Content"_ustr, uno::Any(u"old
content"_ustr)),
};
- dispatchCommand(mxComponent, ".uno:InsertField", aArgs);
+ dispatchCommand(mxComponent, u".uno:InsertField"_ustr, aArgs);
// When updating that refmark:
std::vector<beans::PropertyValue> aArgsVec =
comphelper::JsonToPropertyValues(R"json(
@@ -900,7 +900,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testUpdateRefmark)
}
)json"_ostr);
aArgs = comphelper::containerToSequence(aArgsVec);
- dispatchCommand(mxComponent, ".uno:UpdateField", aArgs);
+ dispatchCommand(mxComponent, u".uno:UpdateField"_ustr, aArgs);
// Then make sure that the document text features the new content:
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
@@ -909,7 +909,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testUpdateRefmark)
// - Expected: new content
// - Actual : old content
// i.e. the content was not updated.
- CPPUNIT_ASSERT_EQUAL(OUString("new content"), pTextNode->GetText());
+ CPPUNIT_ASSERT_EQUAL(u"new content"_ustr, pTextNode->GetText());
}
CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testDeleteBookmarks)
@@ -918,14 +918,14 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testDeleteBookmarks)
createSwDoc();
SwDoc* pDoc = getSwDoc();
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- pWrtShell->Insert("ABCDE");
+ pWrtShell->Insert(u"ABCDE"_ustr);
pWrtShell->SttEndDoc(/*bStt=*/true);
pWrtShell->Right(SwCursorSkipMode::Chars, /*bSelect=*/false, 1,
/*bBasicCall=*/false);
pWrtShell->Right(SwCursorSkipMode::Chars, /*bSelect=*/true, 1,
/*bBasicCall=*/false);
- pWrtShell->SetBookmark(vcl::KeyCode(), "ZOTERO_BREF_GiQ7DAWQYWLy");
+ pWrtShell->SetBookmark(vcl::KeyCode(), u"ZOTERO_BREF_GiQ7DAWQYWLy"_ustr);
pWrtShell->Right(SwCursorSkipMode::Chars, /*bSelect=*/false, 1,
/*bBasicCall=*/false);
pWrtShell->Right(SwCursorSkipMode::Chars, /*bSelect=*/true, 1,
/*bBasicCall=*/false);
- pWrtShell->SetBookmark(vcl::KeyCode(), "other");
+ pWrtShell->SetBookmark(vcl::KeyCode(), u"other"_ustr);
// When deleting 1 matching bookmark:
pWrtShell->SttEndDoc(/*bStt=*/true);
@@ -938,14 +938,14 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testDeleteBookmarks)
}
)json"_ostr);
uno::Sequence<beans::PropertyValue> aArgs =
comphelper::containerToSequence(aArgsVec);
- dispatchCommand(mxComponent, ".uno:DeleteBookmarks", aArgs);
+ dispatchCommand(mxComponent, u".uno:DeleteBookmarks"_ustr, aArgs);
// Then make sure that only the other bookmark is kept:
- auto it =
pDoc->getIDocumentMarkAccess()->findMark("ZOTERO_BREF_GiQ7DAWQYWLy");
+ auto it =
pDoc->getIDocumentMarkAccess()->findMark(u"ZOTERO_BREF_GiQ7DAWQYWLy"_ustr);
// Without the accompanying fix in place, this test would have failed, the
matching bookmark was
// not removed.
CPPUNIT_ASSERT(bool(it ==
pDoc->getIDocumentMarkAccess()->getAllMarksEnd()));
- it = pDoc->getIDocumentMarkAccess()->findMark("other");
+ it = pDoc->getIDocumentMarkAccess()->findMark(u"other"_ustr);
CPPUNIT_ASSERT(it != pDoc->getIDocumentMarkAccess()->getAllMarksEnd());
}
@@ -954,12 +954,12 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testDeleteFields)
// Given a document with a refmark:
createSwDoc();
uno::Sequence<css::beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("TypeName",
uno::Any(OUString("SetRef"))),
- comphelper::makePropertyValue(
- "Name", uno::Any(OUString("ZOTERO_ITEM CSL_CITATION {}
RNDpyJknp173F"))),
- comphelper::makePropertyValue("Content",
uno::Any(OUString("aaa<b>bbb</b>ccc"))),
+ comphelper::makePropertyValue(u"TypeName"_ustr,
uno::Any(u"SetRef"_ustr)),
+ comphelper::makePropertyValue(u"Name"_ustr,
+ uno::Any(u"ZOTERO_ITEM CSL_CITATION {}
RNDpyJknp173F"_ustr)),
+ comphelper::makePropertyValue(u"Content"_ustr,
uno::Any(u"aaa<b>bbb</b>ccc"_ustr)),
};
- dispatchCommand(mxComponent, ".uno:InsertField", aArgs);
+ dispatchCommand(mxComponent, u".uno:InsertField"_ustr, aArgs);
// When deleting the refmarks:
std::vector<beans::PropertyValue> aArgsVec =
comphelper::JsonToPropertyValues(R"json(
@@ -975,7 +975,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testDeleteFields)
}
)json"_ostr);
aArgs = comphelper::containerToSequence(aArgsVec);
- dispatchCommand(mxComponent, ".uno:DeleteFields", aArgs);
+ dispatchCommand(mxComponent, u".uno:DeleteFields"_ustr, aArgs);
// Then make sure that no refmark is kept:
SwDoc* pDoc = getSwDoc();
@@ -994,13 +994,13 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testInsertTextFormFieldFootnote)
// When inserting an ODF_UNHANDLED fieldmark inside a footnote:
uno::Sequence<css::beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("FieldType", uno::Any(ODF_UNHANDLED)),
- comphelper::makePropertyValue("FieldCommand",
- uno::Any(OUString("ADDIN ZOTERO_BIBL foo
bar"))),
- comphelper::makePropertyValue("FieldResult",
uno::Any(OUString("result"))),
- comphelper::makePropertyValue("Wrapper",
uno::Any(OUString("Footnote"))),
+ comphelper::makePropertyValue(u"FieldType"_ustr,
uno::Any(ODF_UNHANDLED)),
+ comphelper::makePropertyValue(u"FieldCommand"_ustr,
+ uno::Any(u"ADDIN ZOTERO_BIBL foo
bar"_ustr)),
+ comphelper::makePropertyValue(u"FieldResult"_ustr,
uno::Any(u"result"_ustr)),
+ comphelper::makePropertyValue(u"Wrapper"_ustr,
uno::Any(u"Footnote"_ustr)),
};
- dispatchCommand(mxComponent, ".uno:TextFormField", aArgs);
+ dispatchCommand(mxComponent, u".uno:TextFormField"_ustr, aArgs);
// Then make sure that the footnote is created:
SwFootnoteIdxs& rFootnotes = pDoc->GetFootnoteIdxs();
@@ -1019,13 +1019,13 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testInsertTextFormFieldEndnote)
// When inserting an ODF_UNHANDLED fieldmark inside an endnote:
uno::Sequence<css::beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("FieldType", uno::Any(ODF_UNHANDLED)),
- comphelper::makePropertyValue("FieldCommand",
- uno::Any(OUString("ADDIN ZOTERO_BIBL foo
bar"))),
- comphelper::makePropertyValue("FieldResult",
uno::Any(OUString("result"))),
- comphelper::makePropertyValue("Wrapper",
uno::Any(OUString("Endnote"))),
+ comphelper::makePropertyValue(u"FieldType"_ustr,
uno::Any(ODF_UNHANDLED)),
+ comphelper::makePropertyValue(u"FieldCommand"_ustr,
+ uno::Any(u"ADDIN ZOTERO_BIBL foo
bar"_ustr)),
+ comphelper::makePropertyValue(u"FieldResult"_ustr,
uno::Any(u"result"_ustr)),
+ comphelper::makePropertyValue(u"Wrapper"_ustr,
uno::Any(u"Endnote"_ustr)),
};
- dispatchCommand(mxComponent, ".uno:TextFormField", aArgs);
+ dispatchCommand(mxComponent, u".uno:TextFormField"_ustr, aArgs);
// Then make sure that the endnote is created:
SwFootnoteIdxs& rFootnotes = pDoc->GetFootnoteIdxs();
@@ -1048,7 +1048,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testInsertTextFormFieldEndnote)
= { CH_TXT_ATR_FIELDSTART, CH_TXT_ATR_FIELDSEP, CH_TXT_ATR_FIELDEND, 0
};
aActual = comphelper::string::removeAny(aActual, aForbidden);
// Then this was empty: the fieldmark was inserted before the note anchor,
not in the note body.
- CPPUNIT_ASSERT_EQUAL(OUString("result"), aActual);
+ CPPUNIT_ASSERT_EQUAL(u"result"_ustr, aActual);
}
CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testUpdateSelectedField)
@@ -1062,7 +1062,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testUpdateSelectedField)
SwPaM* pCursor = pShell->GetCursor();
// Insert a time field and select it:
- dispatchCommand(mxComponent, ".uno:InsertTimeFieldVar", {});
+ dispatchCommand(mxComponent, u".uno:InsertTimeFieldVar"_ustr, {});
pCursor->SetMark();
pCursor->Move(fnMoveBackward);
@@ -1074,7 +1074,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testUpdateSelectedField)
osl::Thread::wait(std::chrono::seconds(1));
// Update the field at cursor:
- dispatchCommand(mxComponent, ".uno:UpdateSelectedField", {});
+ dispatchCommand(mxComponent, u".uno:UpdateSelectedField"_ustr, {});
pWrtShell->GetSelectedText(aTimeFieldAfter);
// Check that the selected field has changed:
diff --git a/sw/qa/uibase/shells/textfld.cxx b/sw/qa/uibase/shells/textfld.cxx
index 6f9fa0c1c2f6..81cb631cc9b3 100644
--- a/sw/qa/uibase/shells/textfld.cxx
+++ b/sw/qa/uibase/shells/textfld.cxx
@@ -23,7 +23,7 @@ class Test : public SwModelTestBase
{
public:
Test()
- : SwModelTestBase("/sw/qa/uibase/shells/data/")
+ : SwModelTestBase(u"/sw/qa/uibase/shells/data/"_ustr)
{
}
};
@@ -36,12 +36,12 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertRefmarkFootnote)
// When inserting a refmark inside a footnote:
uno::Sequence<css::beans::PropertyValue> aArgs = {
- comphelper::makePropertyValue("TypeName",
uno::Any(OUString("SetRef"))),
- comphelper::makePropertyValue("Name", uno::Any(OUString("myref"))),
- comphelper::makePropertyValue("Content",
uno::Any(OUString("content"))),
-e
... etc. - the rest is truncated
