sw/qa/api/SwXAutoTextContainer.cxx | 4 ++--
sw/qa/api/SwXBodyText.cxx | 3 ++-
sw/qa/api/SwXBookmark.cxx | 12 ++++++------
sw/qa/api/SwXBookmarks.cxx | 10 +++++-----
sw/qa/api/SwXChapterNumbering.cxx | 4 ++--
sw/qa/api/SwXDocumentIndex.cxx | 10 +++++-----
sw/qa/api/SwXDocumentIndexMark.cxx | 6 +++---
sw/qa/api/SwXDocumentIndexes.cxx | 8 ++++----
sw/qa/api/SwXDocumentSettings.cxx | 8 +++++---
sw/qa/api/SwXFieldEnumeration.cxx | 16 +++++++++-------
sw/qa/api/SwXFootnote.cxx | 6 +++---
sw/qa/api/SwXFootnoteProperties.cxx | 5 +++--
sw/qa/api/SwXFootnoteText.cxx | 9 +++++----
sw/qa/api/SwXFootnotes.cxx | 8 ++++----
sw/qa/api/SwXFrames.cxx | 10 +++++-----
sw/qa/api/SwXHeadFootText.cxx | 13 +++++++------
sw/qa/api/SwXNumberingRules.cxx | 11 ++++++-----
sw/qa/api/SwXParagraphEnumeration.cxx | 10 ++++++----
sw/qa/api/SwXReferenceMark.cxx | 13 +++++++------
sw/qa/api/SwXReferenceMarks.cxx | 16 +++++++++-------
sw/qa/api/SwXStyleFamilies.cxx | 6 +++---
sw/qa/api/SwXTableCellText.cxx | 14 +++++++-------
sw/qa/api/SwXTextEmbeddedObjects.cxx | 13 +++++++------
sw/qa/api/SwXTextField.cxx | 16 ++++++++--------
sw/qa/api/SwXTextFieldMasters.cxx | 6 +++---
sw/qa/api/SwXTextFieldTypes.cxx | 7 ++++---
sw/qa/api/SwXTextFrame.cxx | 8 ++++----
sw/qa/api/SwXTextSections.cxx | 10 +++++-----
sw/qa/api/SwXTextTable.cxx | 5 +++--
sw/qa/api/SwXTextTables.cxx | 14 +++++++-------
sw/qa/api/terminate.cxx | 4 ++--
31 files changed, 151 insertions(+), 134 deletions(-)
New commits:
commit 6725ae0d7d6f2d677fbf62bc58bfd83c4418f485
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue May 21 12:00:20 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue May 21 15:39:35 2024 +0200
loplugin:ostr in sw/qa/api
Change-Id: Ib8ad745095eceb588e502c44644136d943e79013
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167894
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/sw/qa/api/SwXAutoTextContainer.cxx
b/sw/qa/api/SwXAutoTextContainer.cxx
index 1f1fc3df1d49..5812e1ec0c44 100644
--- a/sw/qa/api/SwXAutoTextContainer.cxx
+++ b/sw/qa/api/SwXAutoTextContainer.cxx
@@ -35,10 +35,10 @@ class SwXAutoTextContainer final : public UnoApiTest,
{
public:
SwXAutoTextContainer()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
, XElementAccess(cppu::UnoType<text::XAutoTextGroup>::get())
, XIndexAccess(3)
- , XNameAccess("crdbus50")
+ , XNameAccess(u"crdbus50"_ustr)
{
}
diff --git a/sw/qa/api/SwXBodyText.cxx b/sw/qa/api/SwXBodyText.cxx
index 69fb22a959b2..3db54633e441 100644
--- a/sw/qa/api/SwXBodyText.cxx
+++ b/sw/qa/api/SwXBodyText.cxx
@@ -89,7 +89,8 @@ void SwXBodyText::tearDown()
Reference<XInterface> SwXBodyText::init()
{
- component_ = loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument");
+ component_
+ = loadFromDesktop(u"private:factory/swriter"_ustr,
u"com.sun.star.text.TextDocument"_ustr);
Reference<text::XTextDocument> xTextDocument(component_, UNO_QUERY_THROW);
Reference<lang::XMultiServiceFactory> xMSF(component_, UNO_QUERY_THROW);
diff --git a/sw/qa/api/SwXBookmark.cxx b/sw/qa/api/SwXBookmark.cxx
index ca6c02d81f8b..3e6bf37eacbb 100644
--- a/sw/qa/api/SwXBookmark.cxx
+++ b/sw/qa/api/SwXBookmark.cxx
@@ -34,8 +34,8 @@ class SwXBookmark final : public UnoApiTest,
{
public:
SwXBookmark()
- : UnoApiTest("")
- , XNamed("Bookmark")
+ : UnoApiTest(u""_ustr)
+ , XNamed(u"Bookmark"_ustr)
{
}
@@ -43,7 +43,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
@@ -55,13 +55,13 @@ public:
Reference<text::XText> xText = xTextDocument->getText();
Reference<text::XTextCursor> xCursor = xText->createTextCursor();
- Reference<text::XTextContent>
xBookmark(xMSF->createInstance("com.sun.star.text.Bookmark"),
- UNO_QUERY_THROW);
+ Reference<text::XTextContent> xBookmark(
+ xMSF->createInstance(u"com.sun.star.text.Bookmark"_ustr),
UNO_QUERY_THROW);
xText->insertTextContent(xCursor, xBookmark, false);
mxTextRange = Reference<text::XTextRange>(xCursor, UNO_QUERY_THROW);
mxTextContent = Reference<text::XTextContent>(
- xMSF->createInstance("com.sun.star.text.Bookmark"),
UNO_QUERY_THROW);
+ xMSF->createInstance(u"com.sun.star.text.Bookmark"_ustr),
UNO_QUERY_THROW);
return Reference<XInterface>(xBookmark, UNO_QUERY_THROW);
}
diff --git a/sw/qa/api/SwXBookmarks.cxx b/sw/qa/api/SwXBookmarks.cxx
index 34babbbd3ce8..a3162f0053b6 100644
--- a/sw/qa/api/SwXBookmarks.cxx
+++ b/sw/qa/api/SwXBookmarks.cxx
@@ -35,10 +35,10 @@ class SwXBookmarks final : public UnoApiTest,
{
public:
SwXBookmarks()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
, XElementAccess(cppu::UnoType<text::XTextContent>::get())
, XIndexAccess(1)
- , XNameAccess("Bookmark")
+ , XNameAccess(u"Bookmark"_ustr)
{
}
@@ -46,7 +46,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
@@ -58,8 +58,8 @@ public:
Reference<text::XText> xText = xTextDocument->getText();
Reference<text::XTextCursor> xCursor = xText->createTextCursor();
- Reference<text::XTextContent>
xBookmark(xMSF->createInstance("com.sun.star.text.Bookmark"),
- UNO_QUERY_THROW);
+ Reference<text::XTextContent> xBookmark(
+ xMSF->createInstance(u"com.sun.star.text.Bookmark"_ustr),
UNO_QUERY_THROW);
xText->insertTextContent(xCursor, xBookmark, false);
Reference<text::XBookmarksSupplier> xSupplier(xTextDocument,
UNO_QUERY_THROW);
diff --git a/sw/qa/api/SwXChapterNumbering.cxx
b/sw/qa/api/SwXChapterNumbering.cxx
index 5a676da9c042..7b090134109b 100644
--- a/sw/qa/api/SwXChapterNumbering.cxx
+++ b/sw/qa/api/SwXChapterNumbering.cxx
@@ -35,7 +35,7 @@ class SwXChapterNumbering final : public UnoApiTest,
{
public:
SwXChapterNumbering()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
, XElementAccess(cppu::UnoType<Sequence<beans::PropertyValue>>::get())
, XIndexAccess(10)
{
@@ -45,7 +45,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
diff --git a/sw/qa/api/SwXDocumentIndex.cxx b/sw/qa/api/SwXDocumentIndex.cxx
index 929bf6e942ee..9954f5bf3955 100644
--- a/sw/qa/api/SwXDocumentIndex.cxx
+++ b/sw/qa/api/SwXDocumentIndex.cxx
@@ -50,8 +50,8 @@ public:
// SwXDocumentIndex()
// : apitest::XServiceInfo("SwXDocumentIndex",
"com.sun.star.text.BaseIndex"){};
SwXDocumentIndex()
- : UnoApiTest("")
- , apitest::XServiceInfo("SwXDocumentIndex",
"com.sun.star.text.BaseIndex")
+ : UnoApiTest(u""_ustr)
+ , apitest::XServiceInfo(u"SwXDocumentIndex"_ustr,
u"com.sun.star.text.BaseIndex"_ustr)
{
}
@@ -59,7 +59,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
@@ -68,7 +68,7 @@ public:
mxTextDocument = Reference<text::XTextDocument>(mxComponent,
UNO_QUERY_THROW);
Reference<lang::XMultiServiceFactory> xMSF(mxTextDocument,
UNO_QUERY_THROW);
Reference<text::XDocumentIndex> xDocumentIndex(
- xMSF->createInstance("com.sun.star.text.DocumentIndex"),
UNO_QUERY_THROW);
+ xMSF->createInstance(u"com.sun.star.text.DocumentIndex"_ustr),
UNO_QUERY_THROW);
auto xText = getTextDocument()->getText();
auto xTextCursor = xText->createTextCursor();
@@ -78,7 +78,7 @@ public:
mxTextRange = Reference<text::XTextRange>(xTextCursor,
UNO_QUERY_THROW);
mxTextContent = Reference<text::XTextContent>(
- xMSF->createInstance("com.sun.star.text.DocumentIndex"),
UNO_QUERY_THROW);
+ xMSF->createInstance(u"com.sun.star.text.DocumentIndex"_ustr),
UNO_QUERY_THROW);
return xDocumentIndex;
}
diff --git a/sw/qa/api/SwXDocumentIndexMark.cxx
b/sw/qa/api/SwXDocumentIndexMark.cxx
index 395769c5cca7..5206dbe068a5 100644
--- a/sw/qa/api/SwXDocumentIndexMark.cxx
+++ b/sw/qa/api/SwXDocumentIndexMark.cxx
@@ -72,7 +72,7 @@ void SwXDocumentIndexMark::setUp()
mxDesktop.set(frame::Desktop::create(mxComponentContext));
mxTextDocument = uno::Reference<text::XTextDocument>(
- loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument"),
+ loadFromDesktop(u"private:factory/swriter"_ustr,
u"com.sun.star.text.TextDocument"_ustr),
uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT(mxTextDocument.is());
}
@@ -93,11 +93,11 @@ Reference<XInterface> SwXDocumentIndexMark::init()
Reference<text::XTextCursor> xCursor = xText->createTextCursor();
Reference<text::XDocumentIndexMark> xDIM(
- xMSF->createInstance("com.sun.star.text.DocumentIndexMark"),
UNO_QUERY_THROW);
+ xMSF->createInstance(u"com.sun.star.text.DocumentIndexMark"_ustr),
UNO_QUERY_THROW);
mxTextRange = uno::Reference<text::XTextRange>(xCursor,
uno::UNO_QUERY_THROW);
mxTextContent = uno::Reference<text::XTextContent>(
- xMSF->createInstance("com.sun.star.text.DocumentIndex"),
uno::UNO_QUERY_THROW);
+ xMSF->createInstance(u"com.sun.star.text.DocumentIndex"_ustr),
uno::UNO_QUERY_THROW);
xText->insertTextContent(xCursor, xDIM, false);
return Reference<XInterface>(xDIM, UNO_QUERY_THROW);
diff --git a/sw/qa/api/SwXDocumentIndexes.cxx b/sw/qa/api/SwXDocumentIndexes.cxx
index 91be0e5c8448..841609df5131 100644
--- a/sw/qa/api/SwXDocumentIndexes.cxx
+++ b/sw/qa/api/SwXDocumentIndexes.cxx
@@ -36,10 +36,10 @@ class SwXDocumentIndexes final : public UnoApiTest,
{
public:
SwXDocumentIndexes()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
, XElementAccess(cppu::UnoType<text::XDocumentIndex>::get())
, XIndexAccess(1)
- , XNameAccess("Table of Contents1")
+ , XNameAccess(u"Table of Contents1"_ustr)
{
}
@@ -47,7 +47,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
@@ -59,7 +59,7 @@ public:
Reference<text::XText> xText = xTextDocument->getText();
Reference<text::XTextCursor> xCursor = xText->createTextCursor();
Reference<text::XTextContent> xTextContent(
- xMSF->createInstance("com.sun.star.text.ContentIndex"),
UNO_QUERY_THROW);
+ xMSF->createInstance(u"com.sun.star.text.ContentIndex"_ustr),
UNO_QUERY_THROW);
xText->insertTextContent(xCursor, xTextContent, false);
Reference<text::XDocumentIndexesSupplier> xDocIndSupp(xTextDocument,
UNO_QUERY_THROW);
diff --git a/sw/qa/api/SwXDocumentSettings.cxx
b/sw/qa/api/SwXDocumentSettings.cxx
index da2b366dae94..509bbfc3eb22 100644
--- a/sw/qa/api/SwXDocumentSettings.cxx
+++ b/sw/qa/api/SwXDocumentSettings.cxx
@@ -43,7 +43,8 @@ public:
virtual void tearDown() override;
SwXDocumentSettings()
- : apitest::XServiceInfo("SwXDocumentSettings",
"com.sun.star.text.DocumentSettings"){};
+ : apitest::XServiceInfo(u"SwXDocumentSettings"_ustr,
+ u"com.sun.star.text.DocumentSettings"_ustr){};
uno::Reference<uno::XInterface> init() override;
CPPUNIT_TEST_SUITE(SwXDocumentSettings);
@@ -73,12 +74,13 @@ void SwXDocumentSettings::tearDown()
uno::Reference<uno::XInterface> SwXDocumentSettings::init()
{
- mxComponent = loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument");
+ mxComponent
+ = loadFromDesktop(u"private:factory/swriter"_ustr,
u"com.sun.star.text.TextDocument"_ustr);
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY_THROW);
uno::Reference<lang::XMultiServiceFactory> xFactory(xTextDocument,
uno::UNO_QUERY_THROW);
uno::Reference<uno::XInterface> xDocumentSettings(
- xFactory->createInstance("com.sun.star.text.DocumentSettings"),
uno::UNO_SET_THROW);
+ xFactory->createInstance(u"com.sun.star.text.DocumentSettings"_ustr),
uno::UNO_SET_THROW);
return xDocumentSettings;
}
diff --git a/sw/qa/api/SwXFieldEnumeration.cxx
b/sw/qa/api/SwXFieldEnumeration.cxx
index 53c437ed18d3..282d0322e051 100644
--- a/sw/qa/api/SwXFieldEnumeration.cxx
+++ b/sw/qa/api/SwXFieldEnumeration.cxx
@@ -34,7 +34,7 @@ class SwXFieldEnumeration final : public UnoApiTest, public
apitest::XEnumeratio
{
public:
SwXFieldEnumeration()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
{
}
@@ -42,7 +42,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
@@ -57,9 +57,11 @@ public:
try
{
xFieldMaster = Reference<beans::XPropertySet>(
-
xMSF->createInstance("com.sun.star.text.FieldMaster.Database"),
UNO_QUERY_THROW);
+
xMSF->createInstance(u"com.sun.star.text.FieldMaster.Database"_ustr),
+ UNO_QUERY_THROW);
xTF = Reference<text::XDependentTextField>(
- xMSF->createInstance("com.sun.star.text.TextField.Database"),
UNO_QUERY_THROW);
+
xMSF->createInstance(u"com.sun.star.text.TextField.Database"_ustr),
+ UNO_QUERY_THROW);
}
catch (Exception&)
{
@@ -67,9 +69,9 @@ public:
try
{
- xFieldMaster->setPropertyValue("DataBaseName",
Any(OUString("Bibliography")));
- xFieldMaster->setPropertyValue("DataTableName",
Any(OUString("biblio")));
- xFieldMaster->setPropertyValue("DataColumnName",
Any(OUString("Address")));
+ xFieldMaster->setPropertyValue(u"DataBaseName"_ustr,
Any(u"Bibliography"_ustr));
+ xFieldMaster->setPropertyValue(u"DataTableName"_ustr,
Any(u"biblio"_ustr));
+ xFieldMaster->setPropertyValue(u"DataColumnName"_ustr,
Any(u"Address"_ustr));
}
catch (lang::WrappedTargetException&)
{
diff --git a/sw/qa/api/SwXFootnote.cxx b/sw/qa/api/SwXFootnote.cxx
index 5c6f7418d941..9f5d1e488bcf 100644
--- a/sw/qa/api/SwXFootnote.cxx
+++ b/sw/qa/api/SwXFootnote.cxx
@@ -87,7 +87,7 @@ void SwXFootnote::setUp()
mxDesktop.set(frame::Desktop::create(mxComponentContext));
mxTextDocument = Reference<text::XTextDocument>(
- loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument"),
+ loadFromDesktop(u"private:factory/swriter"_ustr,
u"com.sun.star.text.TextDocument"_ustr),
uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT(mxTextDocument.is());
}
@@ -104,7 +104,7 @@ Reference<XInterface> SwXFootnote::init()
{
Reference<lang::XMultiServiceFactory> xMSF(mxTextDocument,
UNO_QUERY_THROW);
- Reference<text::XFootnote>
xFootnote(xMSF->createInstance("com.sun.star.text.Footnote"),
+ Reference<text::XFootnote>
xFootnote(xMSF->createInstance(u"com.sun.star.text.Footnote"_ustr),
UNO_QUERY_THROW);
Reference<text::XText> xText = getTextDocument()->getText();
@@ -114,7 +114,7 @@ Reference<XInterface> SwXFootnote::init()
mxTextRange = Reference<text::XTextRange>(xCursor, UNO_QUERY_THROW);
mxTextContent = Reference<text::XTextContent>(
- xMSF->createInstance("com.sun.star.text.Footnote"), UNO_QUERY_THROW);
+ xMSF->createInstance(u"com.sun.star.text.Footnote"_ustr),
UNO_QUERY_THROW);
return Reference<XInterface>(xFootnote, UNO_QUERY_THROW);
}
diff --git a/sw/qa/api/SwXFootnoteProperties.cxx
b/sw/qa/api/SwXFootnoteProperties.cxx
index e716181a5594..69e58b4fca7e 100644
--- a/sw/qa/api/SwXFootnoteProperties.cxx
+++ b/sw/qa/api/SwXFootnoteProperties.cxx
@@ -73,11 +73,12 @@ void SwXFootnoteProperties::tearDown()
Reference<XInterface> SwXFootnoteProperties::init()
{
- component_ = loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument");
+ component_
+ = loadFromDesktop(u"private:factory/swriter"_ustr,
u"com.sun.star.text.TextDocument"_ustr);
Reference<text::XTextDocument> xTextDocument(component_, UNO_QUERY_THROW);
Reference<lang::XMultiServiceFactory> xMSF(component_, UNO_QUERY_THROW);
- Reference<text::XFootnote>
xFootnote(xMSF->createInstance("com.sun.star.text.Footnote"),
+ Reference<text::XFootnote>
xFootnote(xMSF->createInstance(u"com.sun.star.text.Footnote"_ustr),
UNO_QUERY_THROW);
Reference<text::XText> xText = xTextDocument->getText();
diff --git a/sw/qa/api/SwXFootnoteText.cxx b/sw/qa/api/SwXFootnoteText.cxx
index 23697293352a..14eb0c510139 100644
--- a/sw/qa/api/SwXFootnoteText.cxx
+++ b/sw/qa/api/SwXFootnoteText.cxx
@@ -96,11 +96,12 @@ void SwXFootnoteText::tearDown()
Reference<XInterface> SwXFootnoteText::init()
{
- component_ = loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument");
+ component_
+ = loadFromDesktop(u"private:factory/swriter"_ustr,
u"com.sun.star.text.TextDocument"_ustr);
Reference<text::XTextDocument> xTextDocument(component_, UNO_QUERY_THROW);
Reference<lang::XMultiServiceFactory> xMSF(component_, UNO_QUERY_THROW);
- Reference<text::XFootnote>
xFootnote(xMSF->createInstance("com.sun.star.text.Footnote"),
+ Reference<text::XFootnote>
xFootnote(xMSF->createInstance(u"com.sun.star.text.Footnote"_ustr),
UNO_QUERY_THROW);
Reference<text::XText> xText = xTextDocument->getText();
@@ -109,9 +110,9 @@ Reference<XInterface> SwXFootnoteText::init()
xText->insertTextContent(xCursor, xFootnote, false);
Reference<text::XSimpleText> xFootText(xFootnote, UNO_QUERY_THROW);
- xFootText->setString("SwXFootnoteText");
+ xFootText->setString(u"SwXFootnoteText"_ustr);
mxTextContent = Reference<text::XTextContent>(
- xMSF->createInstance("com.sun.star.text.Footnote"), UNO_QUERY_THROW);
+ xMSF->createInstance(u"com.sun.star.text.Footnote"_ustr),
UNO_QUERY_THROW);
return Reference<XInterface>(xFootText->getText(), UNO_QUERY_THROW);
}
diff --git a/sw/qa/api/SwXFootnotes.cxx b/sw/qa/api/SwXFootnotes.cxx
index c04e2be384a4..2d8f99aafed8 100644
--- a/sw/qa/api/SwXFootnotes.cxx
+++ b/sw/qa/api/SwXFootnotes.cxx
@@ -36,7 +36,7 @@ class SwXFootnotes final : public UnoApiTest,
{
public:
SwXFootnotes()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
, XElementAccess(cppu::UnoType<text::XFootnote>::get())
, XIndexAccess(1)
{
@@ -46,7 +46,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
@@ -55,8 +55,8 @@ public:
Reference<text::XTextDocument> xTextDocument(mxComponent,
UNO_QUERY_THROW);
Reference<lang::XMultiServiceFactory> xMSF(mxComponent,
UNO_QUERY_THROW);
- Reference<text::XFootnote>
xFootnote(xMSF->createInstance("com.sun.star.text.Footnote"),
- UNO_QUERY_THROW);
+ Reference<text::XFootnote> xFootnote(
+ xMSF->createInstance(u"com.sun.star.text.Footnote"_ustr),
UNO_QUERY_THROW);
Reference<text::XText> xText = xTextDocument->getText();
Reference<text::XTextCursor> xCursor = xText->createTextCursor();
diff --git a/sw/qa/api/SwXFrames.cxx b/sw/qa/api/SwXFrames.cxx
index 18bc2e204763..4cf72b9d42dc 100644
--- a/sw/qa/api/SwXFrames.cxx
+++ b/sw/qa/api/SwXFrames.cxx
@@ -36,10 +36,10 @@ class SwXFramesText final : public UnoApiTest,
{
public:
SwXFramesText()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
, XElementAccess(cppu::UnoType<text::XTextFrame>::get())
, XIndexAccess(1)
- , XNameAccess("Frame1")
+ , XNameAccess(u"Frame1"_ustr)
{
}
@@ -47,7 +47,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
@@ -56,8 +56,8 @@ public:
Reference<text::XTextDocument> xTextDocument(mxComponent,
UNO_QUERY_THROW);
Reference<lang::XMultiServiceFactory> xMSF(mxComponent,
UNO_QUERY_THROW);
- Reference<text::XTextFrame>
xTextFrame(xMSF->createInstance("com.sun.star.text.TextFrame"),
- UNO_QUERY_THROW);
+ Reference<text::XTextFrame> xTextFrame(
+ xMSF->createInstance(u"com.sun.star.text.TextFrame"_ustr),
UNO_QUERY_THROW);
Reference<text::XText> xText = xTextDocument->getText();
Reference<text::XTextCursor> xCursor = xText->createTextCursor();
diff --git a/sw/qa/api/SwXHeadFootText.cxx b/sw/qa/api/SwXHeadFootText.cxx
index b3769ccc58a1..6c873aef66bf 100644
--- a/sw/qa/api/SwXHeadFootText.cxx
+++ b/sw/qa/api/SwXHeadFootText.cxx
@@ -98,22 +98,23 @@ void SwXHeadFootText::tearDown()
Reference<XInterface> SwXHeadFootText::init()
{
- component_ = loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument");
+ component_
+ = loadFromDesktop(u"private:factory/swriter"_ustr,
u"com.sun.star.text.TextDocument"_ustr);
Reference<text::XTextDocument> xTextDocument(component_, UNO_QUERY_THROW);
Reference<lang::XMultiServiceFactory> xMSF(component_, UNO_QUERY_THROW);
Reference<style::XStyleFamiliesSupplier> xStyleFam(xTextDocument,
UNO_QUERY_THROW);
Reference<container::XNameAccess> xStyleFamNames =
xStyleFam->getStyleFamilies();
- Reference<container::XNameAccess>
xPageStyles(xStyleFamNames->getByName("PageStyles"),
+ Reference<container::XNameAccess>
xPageStyles(xStyleFamNames->getByName(u"PageStyles"_ustr),
UNO_QUERY_THROW);
- Reference<style::XStyle> xStyle(xPageStyles->getByName("Standard"),
UNO_QUERY_THROW);
+ Reference<style::XStyle> xStyle(xPageStyles->getByName(u"Standard"_ustr),
UNO_QUERY_THROW);
Reference<beans::XPropertySet> xPropSet(xStyle, UNO_QUERY_THROW);
- xPropSet->setPropertyValue("HeaderIsOn", uno::Any(true));
- xPropSet->setPropertyValue("FooterIsOn", uno::Any(true));
- Reference<text::XText> xText(xPropSet->getPropertyValue("HeaderText"),
UNO_QUERY_THROW);
+ xPropSet->setPropertyValue(u"HeaderIsOn"_ustr, uno::Any(true));
+ xPropSet->setPropertyValue(u"FooterIsOn"_ustr, uno::Any(true));
+ Reference<text::XText>
xText(xPropSet->getPropertyValue(u"HeaderText"_ustr), UNO_QUERY_THROW);
return Reference<XInterface>(xText, UNO_QUERY_THROW);
}
diff --git a/sw/qa/api/SwXNumberingRules.cxx b/sw/qa/api/SwXNumberingRules.cxx
index 41fb3395aa9c..67de5660e4ca 100644
--- a/sw/qa/api/SwXNumberingRules.cxx
+++ b/sw/qa/api/SwXNumberingRules.cxx
@@ -43,7 +43,7 @@ class SwXNumberingRules final : public UnoApiTest,
{
public:
SwXNumberingRules()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
, XElementAccess(cppu::UnoType<Sequence<beans::PropertyValue>>::get())
, XIndexAccess(10)
{
@@ -53,7 +53,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
@@ -69,7 +69,8 @@ public:
try
{
- xText->insertString(xCursor, "The quick brown fox jumps over the
lazy dog", false);
+ xText->insertString(xCursor, u"The quick brown fox jumps over the
lazy dog"_ustr,
+ false);
xText->insertControlCharacter(xCursor,
text::ControlCharacter::PARAGRAPH_BREAK, false);
}
catch (lang::IllegalArgumentException&)
@@ -82,7 +83,7 @@ public:
{
Reference<container::XNameAccess> xStyleFamNames =
xStyleFam->getStyleFamilies();
Reference<container::XNameContainer> xNumStyles(
- xStyleFamNames->getByName("NumberingStyles"), UNO_QUERY_THROW);
+ xStyleFamNames->getByName(u"NumberingStyles"_ustr),
UNO_QUERY_THROW);
xIndexAccess = Reference<container::XIndexAccess>(xNumStyles,
UNO_QUERY_THROW);
}
catch (lang::WrappedTargetException&)
@@ -99,7 +100,7 @@ public:
{
Reference<beans::XPropertySet>
xPropSet(xIndexAccess->getByIndex(0), UNO_QUERY_THROW);
xNumRules = Reference<container::XIndexAccess>(
- xPropSet->getPropertyValue("NumberingRules"), UNO_QUERY_THROW);
+ xPropSet->getPropertyValue(u"NumberingRules"_ustr),
UNO_QUERY_THROW);
}
catch (lang::WrappedTargetException&)
{
diff --git a/sw/qa/api/SwXParagraphEnumeration.cxx
b/sw/qa/api/SwXParagraphEnumeration.cxx
index 7e7ddd6d188a..f1dbac6c7ea4 100644
--- a/sw/qa/api/SwXParagraphEnumeration.cxx
+++ b/sw/qa/api/SwXParagraphEnumeration.cxx
@@ -35,7 +35,7 @@ class SwXParagraphEnumeration final : public UnoApiTest,
public apitest::XEnumer
{
public:
SwXParagraphEnumeration()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
{
}
@@ -43,7 +43,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
@@ -59,9 +59,11 @@ public:
{
try
{
- xText->insertString(xCursor, "The quick brown fox jumps over
the lazy dog", false);
+ xText->insertString(xCursor, u"The quick brown fox jumps over
the lazy dog"_ustr,
+ false);
xText->insertControlCharacter(xCursor,
text::ControlCharacter::LINE_BREAK, false);
- xText->insertString(xCursor, "THE QUICK BROWN FOX JUMPS OVER
THE LAZY DOG", false);
+ xText->insertString(xCursor, u"THE QUICK BROWN FOX JUMPS OVER
THE LAZY DOG"_ustr,
+ false);
xText->insertControlCharacter(xCursor,
text::ControlCharacter::LINE_BREAK, false);
}
catch (lang::IllegalArgumentException&)
diff --git a/sw/qa/api/SwXReferenceMark.cxx b/sw/qa/api/SwXReferenceMark.cxx
index bf7b14dc8090..7cfb8e598622 100644
--- a/sw/qa/api/SwXReferenceMark.cxx
+++ b/sw/qa/api/SwXReferenceMark.cxx
@@ -36,8 +36,8 @@ class SwXReferenceMark final : public UnoApiTest,
{
public:
SwXReferenceMark()
- : UnoApiTest("")
- , XNamed("SwXReferenceMark")
+ : UnoApiTest(u""_ustr)
+ , XNamed(u"SwXReferenceMark"_ustr)
{
}
@@ -45,7 +45,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
@@ -57,16 +57,17 @@ public:
Reference<text::XText> xText = xTextDocument->getText();
Reference<text::XTextCursor> xCursor = xText->createTextCursor();
- Reference<XInterface> xRefMark =
xMSF->createInstance("com.sun.star.text.ReferenceMark");
+ Reference<XInterface> xRefMark
+ = xMSF->createInstance(u"com.sun.star.text.ReferenceMark"_ustr);
Reference<container::XNamed> xNamed(xRefMark, UNO_QUERY_THROW);
- xNamed->setName("SwXReferenceMark");
+ xNamed->setName(u"SwXReferenceMark"_ustr);
Reference<text::XTextContent> xTextContent(xRefMark, UNO_QUERY_THROW);
xText->insertTextContent(xCursor, xTextContent, false);
mxTextRange = Reference<text::XTextRange>(xCursor,
uno::UNO_QUERY_THROW);
mxTextContent = Reference<text::XTextContent>(
- xMSF->createInstance("com.sun.star.text.ReferenceMark"),
UNO_QUERY_THROW);
+ xMSF->createInstance(u"com.sun.star.text.ReferenceMark"_ustr),
UNO_QUERY_THROW);
return xRefMark;
}
diff --git a/sw/qa/api/SwXReferenceMarks.cxx b/sw/qa/api/SwXReferenceMarks.cxx
index 1420a0468a66..22747741c72f 100644
--- a/sw/qa/api/SwXReferenceMarks.cxx
+++ b/sw/qa/api/SwXReferenceMarks.cxx
@@ -38,10 +38,10 @@ class SwXReferenceMarks final : public UnoApiTest,
{
public:
SwXReferenceMarks()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
, XElementAccess(cppu::UnoType<text::XTextContent>::get())
, XIndexAccess(2)
- , XNameAccess("SwXReferenceMarks2")
+ , XNameAccess(u"SwXReferenceMarks2"_ustr)
{
}
@@ -49,7 +49,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
@@ -62,17 +62,19 @@ public:
Reference<text::XTextCursor> xCursor = xText->createTextCursor();
//RefMark 1
- Reference<XInterface> xRefMark1 =
xMSF->createInstance("com.sun.star.text.ReferenceMark");
+ Reference<XInterface> xRefMark1
+ = xMSF->createInstance(u"com.sun.star.text.ReferenceMark"_ustr);
Reference<container::XNamed> xNamed1(xRefMark1, UNO_QUERY_THROW);
- xNamed1->setName("SwXReferenceMarks1");
+ xNamed1->setName(u"SwXReferenceMarks1"_ustr);
Reference<text::XTextContent> xTextContent1(xRefMark1,
UNO_QUERY_THROW);
xText->insertTextContent(xCursor, xTextContent1, false);
//RefMark 2
- Reference<XInterface> xRefMark2 =
xMSF->createInstance("com.sun.star.text.ReferenceMark");
+ Reference<XInterface> xRefMark2
+ = xMSF->createInstance(u"com.sun.star.text.ReferenceMark"_ustr);
Reference<container::XNamed> xNamed2(xRefMark2, UNO_QUERY_THROW);
- xNamed2->setName("SwXReferenceMarks2");
+ xNamed2->setName(u"SwXReferenceMarks2"_ustr);
Reference<text::XTextContent> xTextContent2(xRefMark2,
UNO_QUERY_THROW);
xText->insertTextContent(xCursor, xTextContent2, false);
diff --git a/sw/qa/api/SwXStyleFamilies.cxx b/sw/qa/api/SwXStyleFamilies.cxx
index 6cc1430ac55c..f5f959cd77cc 100644
--- a/sw/qa/api/SwXStyleFamilies.cxx
+++ b/sw/qa/api/SwXStyleFamilies.cxx
@@ -38,10 +38,10 @@ class SwXStyleFamilies final : public UnoApiTest,
{
public:
SwXStyleFamilies()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
, XElementAccess(cppu::UnoType<container::XNameContainer>::get())
, XIndexAccess(7)
- , XNameAccess("CharacterStyles")
+ , XNameAccess(u"CharacterStyles"_ustr)
{
}
@@ -49,7 +49,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
diff --git a/sw/qa/api/SwXTableCellText.cxx b/sw/qa/api/SwXTableCellText.cxx
index 733ba36415fd..0f698b37154a 100644
--- a/sw/qa/api/SwXTableCellText.cxx
+++ b/sw/qa/api/SwXTableCellText.cxx
@@ -41,7 +41,7 @@ class SwXTableCellText final : public UnoApiTest,
{
public:
SwXTableCellText()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
, XElementAccess(cppu::UnoType<text::XTextRange>::get())
{
}
@@ -50,7 +50,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
@@ -62,16 +62,16 @@ public:
Reference<text::XText> xText = xTextDocument->getText();
Reference<text::XTextCursor> xCursor = xText->createTextCursor();
- Reference<text::XTextTable>
xTable(xMSF->createInstance("com.sun.star.text.TextTable"),
- UNO_QUERY_THROW);
+ Reference<text::XTextTable> xTable(
+ xMSF->createInstance(u"com.sun.star.text.TextTable"_ustr),
UNO_QUERY_THROW);
xText->insertTextContent(xCursor, xTable, false);
- Reference<table::XCell> xCell = xTable->getCellByName("A1");
+ Reference<table::XCell> xCell = xTable->getCellByName(u"A1"_ustr);
Reference<text::XSimpleText> xCellText(xCell, UNO_QUERY_THROW);
- xCellText->setString("SwXTableCellText");
+ xCellText->setString(u"SwXTableCellText"_ustr);
mxTextContent = Reference<text::XTextContent>(
- xMSF->createInstance("com.sun.star.text.TextTable"),
UNO_QUERY_THROW);
+ xMSF->createInstance(u"com.sun.star.text.TextTable"_ustr),
UNO_QUERY_THROW);
return Reference<XInterface>(xCellText->getText(), UNO_QUERY_THROW);
}
diff --git a/sw/qa/api/SwXTextEmbeddedObjects.cxx
b/sw/qa/api/SwXTextEmbeddedObjects.cxx
index 4e8a19a702d1..36afea6ca1dc 100644
--- a/sw/qa/api/SwXTextEmbeddedObjects.cxx
+++ b/sw/qa/api/SwXTextEmbeddedObjects.cxx
@@ -41,10 +41,10 @@ class SwXTextEmbeddedObjects final : public UnoApiTest,
{
public:
SwXTextEmbeddedObjects()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
,
XElementAccess(cppu::UnoType<document::XEmbeddedObjectSupplier>::get())
, XIndexAccess(1)
- , XNameAccess("Object1")
+ , XNameAccess(u"Object1"_ustr)
{
}
@@ -52,7 +52,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
@@ -67,10 +67,11 @@ public:
try
{
Reference<text::XTextContent> xTextContent(
- xMSF->createInstance("com.sun.star.text.TextEmbeddedObject"),
UNO_QUERY_THROW);
+
xMSF->createInstance(u"com.sun.star.text.TextEmbeddedObject"_ustr),
+ UNO_QUERY_THROW);
Reference<beans::XPropertySet> xPropertySet(xTextContent,
UNO_QUERY_THROW);
- xPropertySet->setPropertyValue("CLSID",
-
Any(OUString("12dcae26-281f-416f-a234-c3086127382e")));
+ xPropertySet->setPropertyValue(u"CLSID"_ustr,
+
Any(u"12dcae26-281f-416f-a234-c3086127382e"_ustr));
xText->insertTextContent(xCursor, xTextContent, false);
}
diff --git a/sw/qa/api/SwXTextField.cxx b/sw/qa/api/SwXTextField.cxx
index e22ab89e47b1..2cc708380da0 100644
--- a/sw/qa/api/SwXTextField.cxx
+++ b/sw/qa/api/SwXTextField.cxx
@@ -44,7 +44,7 @@ struct SwXTextField final : public UnoApiTest,
public apitest::XTextField
{
SwXTextField()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
, TextContent(text::TextContentAnchorType_AS_CHARACTER,
text::TextContentAnchorType_AS_CHARACTER,
text::WrapTextMode_NONE,
text::WrapTextMode_NONE)
@@ -55,7 +55,7 @@ struct SwXTextField final : public UnoApiTest,
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
@@ -65,14 +65,14 @@ struct SwXTextField final : public UnoApiTest,
Reference<lang::XMultiServiceFactory> xMSF(mxComponent,
UNO_QUERY_THROW);
Reference<beans::XPropertySet> xFieldMaster(
- xMSF->createInstance("com.sun.star.text.FieldMaster.Database"),
UNO_QUERY_THROW);
+
xMSF->createInstance(u"com.sun.star.text.FieldMaster.Database"_ustr),
UNO_QUERY_THROW);
- xFieldMaster->setPropertyValue("DataBaseName", Any(OUString("Address
Book File")));
- xFieldMaster->setPropertyValue("DataTableName",
Any(OUString("address")));
- xFieldMaster->setPropertyValue("DataColumnName",
Any(OUString("FIRSTNAME")));
+ xFieldMaster->setPropertyValue(u"DataBaseName"_ustr, Any(u"Address
Book File"_ustr));
+ xFieldMaster->setPropertyValue(u"DataTableName"_ustr,
Any(u"address"_ustr));
+ xFieldMaster->setPropertyValue(u"DataColumnName"_ustr,
Any(u"FIRSTNAME"_ustr));
Reference<text::XDependentTextField> xField(
- xMSF->createInstance("com.sun.star.text.TextField.Database"),
UNO_QUERY_THROW);
+
xMSF->createInstance(u"com.sun.star.text.TextField.Database"_ustr),
UNO_QUERY_THROW);
xField->attachTextFieldMaster(xFieldMaster);
Reference<text::XText> xText = xTextDocument->getText();
@@ -82,7 +82,7 @@ struct SwXTextField final : public UnoApiTest,
mxTextRange = Reference<text::XTextRange>(xCursor, UNO_QUERY_THROW);
mxTextContent = Reference<text::XTextContent>(
- xMSF->createInstance("com.sun.star.text.TextField.DateTime"),
UNO_QUERY_THROW);
+
xMSF->createInstance(u"com.sun.star.text.TextField.DateTime"_ustr),
UNO_QUERY_THROW);
return Reference<XInterface>(xField, UNO_QUERY_THROW);
}
diff --git a/sw/qa/api/SwXTextFieldMasters.cxx
b/sw/qa/api/SwXTextFieldMasters.cxx
index a5d5042dcffa..ae233d595f51 100644
--- a/sw/qa/api/SwXTextFieldMasters.cxx
+++ b/sw/qa/api/SwXTextFieldMasters.cxx
@@ -36,9 +36,9 @@ class SwXTextFieldMasters final : public UnoApiTest,
{
public:
SwXTextFieldMasters()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
, XElementAccess(cppu::UnoType<beans::XPropertySet>::get())
- ,
XNameAccess("com.sun.star.text.fieldmaster.SetExpression.Illustration")
+ ,
XNameAccess(u"com.sun.star.text.fieldmaster.SetExpression.Illustration"_ustr)
{
}
@@ -46,7 +46,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
diff --git a/sw/qa/api/SwXTextFieldTypes.cxx b/sw/qa/api/SwXTextFieldTypes.cxx
index 1a99606c8707..d95b2ed85691 100644
--- a/sw/qa/api/SwXTextFieldTypes.cxx
+++ b/sw/qa/api/SwXTextFieldTypes.cxx
@@ -37,7 +37,7 @@ class SwXTextFieldTypes final : public UnoApiTest,
{
public:
SwXTextFieldTypes()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
, XElementAccess(cppu::UnoType<text::XDependentTextField>::get())
{
}
@@ -46,13 +46,14 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
Reference<XInterface> init() override
{
- component_ = loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument");
+ component_ = loadFromDesktop(u"private:factory/swriter"_ustr,
+ u"com.sun.star.text.TextDocument"_ustr);
Reference<text::XTextDocument> xTextDocument(component_,
UNO_QUERY_THROW);
Reference<text::XTextFieldsSupplier> xTFS;
diff --git a/sw/qa/api/SwXTextFrame.cxx b/sw/qa/api/SwXTextFrame.cxx
index 5f356fdbfb97..44d316037f4f 100644
--- a/sw/qa/api/SwXTextFrame.cxx
+++ b/sw/qa/api/SwXTextFrame.cxx
@@ -31,8 +31,8 @@ class SwXTextFrame final : public UnoApiTest,
{
public:
SwXTextFrame()
- : UnoApiTest("")
- , apitest::XServiceInfo("SwXTextFrame", "com.sun.star.text.TextFrame")
+ : UnoApiTest(u""_ustr)
+ , apitest::XServiceInfo(u"SwXTextFrame"_ustr,
u"com.sun.star.text.TextFrame"_ustr)
{
}
@@ -40,7 +40,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
@@ -49,7 +49,7 @@ public:
uno::Reference<lang::XMultiServiceFactory> xMSF(mxComponent,
uno::UNO_QUERY_THROW);
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY_THROW);
uno::Reference<text::XTextFrame> xTextFrame(
- xMSF->createInstance("com.sun.star.text.TextFrame"),
uno::UNO_QUERY_THROW);
+ xMSF->createInstance(u"com.sun.star.text.TextFrame"_ustr),
uno::UNO_QUERY_THROW);
auto xText = xTextDocument->getText();
auto xTextCursor = xText->createTextCursor();
CPPUNIT_ASSERT(xTextCursor.is());
diff --git a/sw/qa/api/SwXTextSections.cxx b/sw/qa/api/SwXTextSections.cxx
index 0e957ad911f9..b81f43866713 100644
--- a/sw/qa/api/SwXTextSections.cxx
+++ b/sw/qa/api/SwXTextSections.cxx
@@ -39,10 +39,10 @@ class SwXTextSections final : public UnoApiTest,
{
public:
SwXTextSections()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
, XElementAccess(cppu::UnoType<text::XTextSection>::get())
, XIndexAccess(2)
- , XNameAccess("TextSection")
+ , XNameAccess(u"TextSection"_ustr)
{
}
@@ -50,7 +50,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
@@ -63,11 +63,11 @@ public:
Reference<text::XTextCursor> xCursor = xText->createTextCursor();
Reference<text::XTextContent> xContent(
- xMSF->createInstance("com.sun.star.text.TextSection"),
UNO_QUERY_THROW);
+ xMSF->createInstance(u"com.sun.star.text.TextSection"_ustr),
UNO_QUERY_THROW);
xText->insertTextContent(xCursor, xContent, false);
Reference<text::XTextContent> xContent2(
- xMSF->createInstance("com.sun.star.text.TextSection"),
UNO_QUERY_THROW);
+ xMSF->createInstance(u"com.sun.star.text.TextSection"_ustr),
UNO_QUERY_THROW);
xText->insertTextContent(xCursor, xContent2, false);
Reference<container::XNameAccess> xNameAccess;
diff --git a/sw/qa/api/SwXTextTable.cxx b/sw/qa/api/SwXTextTable.cxx
index 229583ebcfd9..f682789b4d1c 100644
--- a/sw/qa/api/SwXTextTable.cxx
+++ b/sw/qa/api/SwXTextTable.cxx
@@ -67,12 +67,13 @@ void SwXTextTable::triggerDesktopTerminate() {
mxDesktop->terminate(); }
Reference<XInterface> SwXTextTable::init()
{
- component_ = loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument");
+ component_
+ = loadFromDesktop(u"private:factory/swriter"_ustr,
u"com.sun.star.text.TextDocument"_ustr);
Reference<text::XTextDocument> xTextDocument(component_, UNO_QUERY_THROW);
Reference<lang::XMultiServiceFactory> xMSF(component_, UNO_QUERY_THROW);
Reference<text::XText> xText = xTextDocument->getText();
Reference<text::XTextCursor> xCursor = xText->createTextCursor();
- Reference<text::XTextTable>
xTable(xMSF->createInstance("com.sun.star.text.TextTable"),
+ Reference<text::XTextTable>
xTable(xMSF->createInstance(u"com.sun.star.text.TextTable"_ustr),
UNO_QUERY_THROW);
xTable->initialize(4, 3);
xText->insertTextContent(xCursor, xTable, false);
diff --git a/sw/qa/api/SwXTextTables.cxx b/sw/qa/api/SwXTextTables.cxx
index a63a6592c82e..d67e376729d4 100644
--- a/sw/qa/api/SwXTextTables.cxx
+++ b/sw/qa/api/SwXTextTables.cxx
@@ -36,10 +36,10 @@ class SwXTextTables final : public UnoApiTest,
{
public:
SwXTextTables()
- : UnoApiTest("")
+ : UnoApiTest(u""_ustr)
, XElementAccess(cppu::UnoType<text::XTextTable>::get())
, XIndexAccess(1)
- , XNameAccess("Table1")
+ , XNameAccess(u"Table1"_ustr)
{
}
@@ -47,7 +47,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
- mxComponent = loadFromDesktop("private:factory/swriter");
+ mxComponent = loadFromDesktop(u"private:factory/swriter"_ustr);
CPPUNIT_ASSERT(mxComponent.is());
}
@@ -61,13 +61,13 @@ public:
try
{
- Reference<text::XTextTable>
xTable(xMSF->createInstance("com.sun.star.text.TextTable"),
- UNO_QUERY_THROW);
+ Reference<text::XTextTable> xTable(
+ xMSF->createInstance(u"com.sun.star.text.TextTable"_ustr),
UNO_QUERY_THROW);
xTable->initialize(4, 3);
xText->insertTextContent(xCursor, xTable, false);
- Reference<text::XTextTable>
xTable2(xMSF->createInstance("com.sun.star.text.TextTable"),
- UNO_QUERY_THROW);
+ Reference<text::XTextTable> xTable2(
+ xMSF->createInstance(u"com.sun.star.text.TextTable"_ustr),
UNO_QUERY_THROW);
xTable->initialize(4, 3);
xText->insertTextContent(xCursor, xTable2, false);
}
diff --git a/sw/qa/api/terminate.cxx b/sw/qa/api/terminate.cxx
index 9a0e26d4d7e2..258b2f97dd67 100644
--- a/sw/qa/api/terminate.cxx
+++ b/sw/qa/api/terminate.cxx
@@ -52,14 +52,14 @@ void TerminateTest::setUp()
css::uno::Reference<css::uno::XInterface> TerminateTest::init()
{
auto const component
- = loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument");
+ = loadFromDesktop(u"private:factory/swriter"_ustr,
u"com.sun.star.text.TextDocument"_ustr);
css::uno::Reference<css::text::XTextDocument> xTextDocument(component,
css::uno::UNO_QUERY_THROW);
css::uno::Reference<css::lang::XMultiServiceFactory> xMSF(component,
css::uno::UNO_QUERY_THROW);
css::uno::Reference<css::text::XText> xText = xTextDocument->getText();
css::uno::Reference<css::text::XTextCursor> xCursor =
xText->createTextCursor();
css::uno::Reference<css::text::XTextTable> xTable(
- xMSF->createInstance("com.sun.star.text.TextTable"),
css::uno::UNO_QUERY_THROW);
+ xMSF->createInstance(u"com.sun.star.text.TextTable"_ustr),
css::uno::UNO_QUERY_THROW);
xTable->initialize(4, 3);
xText->insertTextContent(xCursor, xTable, false);
CPPUNIT_ASSERT(xCursor.is());
