diff options
Diffstat (limited to 'sw/qa/extras/uiwriter')
-rw-r--r-- | sw/qa/extras/uiwriter/uiwriter3.cxx | 6 | ||||
-rw-r--r-- | sw/qa/extras/uiwriter/uiwriter4.cxx | 10 | ||||
-rw-r--r-- | sw/qa/extras/uiwriter/uiwriter6.cxx | 2 | ||||
-rw-r--r-- | sw/qa/extras/uiwriter/uiwriter7.cxx | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx b/sw/qa/extras/uiwriter/uiwriter3.cxx index b43030a41d71..a030ad9c10f8 100644 --- a/sw/qa/extras/uiwriter/uiwriter3.cxx +++ b/sw/qa/extras/uiwriter/uiwriter3.cxx @@ -1651,7 +1651,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks) // click on the links... { - OUString constexpr tmp(u"Table of Contents"_ustr); + static OUString constexpr tmp(u"Table of Contents"_ustr); pWrtShell->GotoNextTOXBase(&tmp); } @@ -1686,7 +1686,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks) } { - OUString constexpr tmp(u"User-Defined1"_ustr); + static OUString constexpr tmp(u"User-Defined1"_ustr); pWrtShell->GotoNextTOXBase(&tmp); } @@ -1738,7 +1738,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks) } { - OUString constexpr tmp(u"NewUD!|1"_ustr); + static OUString constexpr tmp(u"NewUD!|1"_ustr); pWrtShell->GotoNextTOXBase(&tmp); } diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx b/sw/qa/extras/uiwriter/uiwriter4.cxx index a59491bf7491..7df258900c9f 100644 --- a/sw/qa/extras/uiwriter/uiwriter4.cxx +++ b/sw/qa/extras/uiwriter/uiwriter4.cxx @@ -653,7 +653,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testBookmarkCollapsed) // load only content.xml from the resaved document xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr); - constexpr const char* aPath("/office:document-content/office:body/office:text/text:p"); + const char* const aPath("/office:document-content/office:body/office:text/text:p"); const int pos1 = getXPathPosition(pXmlDoc, aPath, "bookmark"); CPPUNIT_ASSERT_EQUAL(0, pos1); // found, and it is first @@ -824,7 +824,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRemoveBookmarkTextAndAddNew) // load only content.xml from the resaved document xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr); - constexpr const char* aPath("/office:document-content/office:body/office:text/text:p"); + const char* const aPath("/office:document-content/office:body/office:text/text:p"); CPPUNIT_ASSERT_ASSERTION_FAIL(getXPathPosition(pXmlDoc, aPath, "bookmark")); // not found const int pos2 = getXPathPosition(pXmlDoc, aPath, "bookmark-start"); @@ -887,7 +887,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRemoveBookmarkTextAndAddNewAfterReload // load only content.xml from the resaved document xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr); - constexpr const char* aPath("/office:document-content/office:body/office:text/text:p"); + const char* const aPath("/office:document-content/office:body/office:text/text:p"); const int pos1 = getXPathPosition(pXmlDoc, aPath, "bookmark"); const int pos2 = getXPathPosition(pXmlDoc, aPath, "text"); @@ -1300,7 +1300,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRedlineViewAuthor) SwWrtShell* pWrtShell = pDocShell->GetWrtShell(); pWrtShell->Insert(u"middle"_ustr); SwView* pView = pDocShell->GetView(); - constexpr OUString aAuthor(u"A U. Thor"_ustr); + static constexpr OUString aAuthor(u"A U. Thor"_ustr); pView->SetRedlineAuthor(aAuthor); pDocShell->SetView(pView); @@ -2203,7 +2203,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testCreateDocxAnnotation) createSwDoc(); // insert an annotation with a text - constexpr OUString aSomeText(u"some text"_ustr); + static constexpr OUString aSomeText(u"some text"_ustr); uno::Sequence<beans::PropertyValue> aPropertyValues = comphelper::InitPropertySequence({ { "Text", uno::Any(aSomeText) }, { "Author", uno::Any(u"me"_ustr) }, diff --git a/sw/qa/extras/uiwriter/uiwriter6.cxx b/sw/qa/extras/uiwriter/uiwriter6.cxx index fd09758324d7..7d5bc22b8fa6 100644 --- a/sw/qa/extras/uiwriter/uiwriter6.cxx +++ b/sw/qa/extras/uiwriter/uiwriter6.cxx @@ -900,7 +900,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf113481) CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf115013) { - constexpr OUString sColumnName(u"Name with spaces, \"quotes\" and \\backslashes"_ustr); + static constexpr OUString sColumnName(u"Name with spaces, \"quotes\" and \\backslashes"_ustr); utl::TempFileNamed aTempDir(nullptr, true); aTempDir.EnableKillingFile(); diff --git a/sw/qa/extras/uiwriter/uiwriter7.cxx b/sw/qa/extras/uiwriter/uiwriter7.cxx index 964ccc0b4482..fdd09d358fa1 100644 --- a/sw/qa/extras/uiwriter/uiwriter7.cxx +++ b/sw/qa/extras/uiwriter/uiwriter7.cxx @@ -2392,8 +2392,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testUnicodeNotationToggle) sDocString = pWrtShell->GetCursor()->GetPointNode().GetTextNode()->GetText(); CPPUNIT_ASSERT_EQUAL(sOriginalDocString, sDocString); - constexpr OUString sWithCombiningSMPName = u"xyzU+4faeU+e0101"_ustr; - constexpr OUString sWithCombiningSMP = u"xyz\U00004fae\U000e0101"_ustr; + static constexpr OUString sWithCombiningSMPName = u"xyzU+4faeU+e0101"_ustr; + static constexpr OUString sWithCombiningSMP = u"xyz\U00004fae\U000e0101"_ustr; pWrtShell->SplitNode(); pWrtShell->Insert2(sWithCombiningSMPName); dispatchCommand(mxComponent, u".uno:UnicodeNotationToggle"_ustr, aPropertyValues); |