ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

loplugin:ostr in sw/qa/api

Browse Source 
Change-Id: Ib8ad745095eceb588e502c44644136d943e79013
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167894
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
This commit is contained in:
Noel Grandin
2024-05-21 15:39:35 +02:00
parent 6ddb49bc32
commit 6725ae0d7d
31 changed files with 151 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/qa/api/SwXAutoTextContainer.cxx
+2 -2
View File
@@ -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)
{
}
sw/qa/api/SwXBodyText.cxx
+2 -1
View File
@@ -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);
sw/qa/api/SwXBookmark.cxx
+6 -6
View File
@@ -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);
}
sw/qa/api/SwXBookmarks.cxx
+5 -5
View File
@@ -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);
sw/qa/api/SwXChapterNumbering.cxx
+2 -2
View File
@@ -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());
}
sw/qa/api/SwXDocumentIndex.cxx
+5 -5
View File
@@ -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;
}
sw/qa/api/SwXDocumentIndexMark.cxx
+3 -3
View File
@@ -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);
sw/qa/api/SwXDocumentIndexes.cxx
+4 -4
View File
@@ -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);
sw/qa/api/SwXDocumentSettings.cxx
+5 -3
View File
@@ -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;
}
sw/qa/api/SwXFieldEnumeration.cxx
+9 -7
View File
@@ -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&)
{
sw/qa/api/SwXFootnote.cxx
+3 -3
View File
@@ -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);
}
sw/qa/api/SwXFootnoteProperties.cxx
+3 -2
View File
@@ -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();
sw/qa/api/SwXFootnoteText.cxx
+5 -4
View File
@@ -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);
}
sw/qa/api/SwXFootnotes.cxx
+4 -4
View File
@@ -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();
sw/qa/api/SwXFrames.cxx
+5 -5
View File
@@ -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();
sw/qa/api/SwXHeadFootText.cxx
+7 -6
View File
@@ -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);
}
sw/qa/api/SwXNumberingRules.cxx
+6 -5
View File
@@ -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&)
{
sw/qa/api/SwXParagraphEnumeration.cxx
+6 -4
View File
@@ -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&)
sw/qa/api/SwXReferenceMark.cxx
+7 -6
View File
@@ -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;
}
sw/qa/api/SwXReferenceMarks.cxx
+9 -7
View File
@@ -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);
sw/qa/api/SwXStyleFamilies.cxx
+3 -3
View File
@@ -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());
}
sw/qa/api/SwXTableCellText.cxx
+7 -7
View File
@@ -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);
}
sw/qa/api/SwXTextEmbeddedObjects.cxx
+7 -6
View File
@@ -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);
}
sw/qa/api/SwXTextField.cxx
+8 -8
View File
@@ -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);
}
sw/qa/api/SwXTextFieldMasters.cxx
+3 -3
View File
@@ -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());
}
sw/qa/api/SwXTextFieldTypes.cxx
+4 -3
View File
@@ -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;
sw/qa/api/SwXTextFrame.cxx
+4 -4
View File
@@ -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());
sw/qa/api/SwXTextSections.cxx
+5 -5
View File
@@ -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;
sw/qa/api/SwXTextTable.cxx
+3 -2
View File
@@ -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);
sw/qa/api/SwXTextTables.cxx
+7 -7
View File
@@ -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);
}
sw/qa/api/terminate.cxx
+2 -2
View File
@@ -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());