diff options
75 files changed, 98 insertions, 98 deletions
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 95768b0cfe54..bf1c17dc03c1 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -93,7 +93,7 @@ short const ValidWindow = 0x1234; #if defined(OW) || defined(MTF) char const FilterMask_All[] = "*"; #else -OUStringLiteral const FilterMask_All = u"*.*"; +constexpr OUStringLiteral FilterMask_All = u"*.*"; #endif } // end anonymous namespace diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 32dfa80c2baf..30d158aeb51b 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -71,7 +71,7 @@ using namespace ::com::sun::star::ui::dialogs; #ifdef _WIN32 char const FilterMask_All[] = "*.*"; #else -OUStringLiteral const FilterMask_All = u"*"; +constexpr OUStringLiteral FilterMask_All = u"*"; #endif DialogWindow::DialogWindow(DialogWindowLayout* pParent, ScriptDocument const& rDocument, diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index af9ca9e73da1..ac6fcf8a2879 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -100,9 +100,9 @@ using namespace cppu; // Identifiers for creating the strings for dbg_Properties -OUStringLiteral constexpr ID_DBG_SUPPORTEDINTERFACES = u"Dbg_SupportedInterfaces"; -OUStringLiteral const ID_DBG_PROPERTIES = u"Dbg_Properties"; -OUStringLiteral const ID_DBG_METHODS = u"Dbg_Methods"; +constexpr OUStringLiteral ID_DBG_SUPPORTEDINTERFACES = u"Dbg_SupportedInterfaces"; +constexpr OUStringLiteral ID_DBG_PROPERTIES = u"Dbg_Properties"; +constexpr OUStringLiteral ID_DBG_METHODS = u"Dbg_Methods"; char const aSeqLevelStr[] = "[]"; diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 96b66e95e338..784882739ac0 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -58,9 +58,9 @@ using ::osl::MutexGuard; namespace { -OUStringLiteral const sXML_metaStreamName = u"meta.xml"; -OUStringLiteral const sXML_styleStreamName = u"styles.xml"; -OUStringLiteral const sXML_contentStreamName = u"content.xml"; +constexpr OUStringLiteral sXML_metaStreamName = u"meta.xml"; +constexpr OUStringLiteral sXML_styleStreamName = u"styles.xml"; +constexpr OUStringLiteral sXML_contentStreamName = u"content.xml"; uno::Reference< embed::XStorage > lcl_getWriteStorage( diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index 294791516862..856d6d7fbab2 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -60,9 +60,9 @@ namespace configmgr::configuration_provider { namespace { -OUStringLiteral const accessServiceName = +constexpr OUStringLiteral accessServiceName = u"com.sun.star.configuration.ConfigurationAccess"; -OUStringLiteral const updateAccessServiceName = +constexpr OUStringLiteral updateAccessServiceName = u"com.sun.star.configuration.ConfigurationUpdateAccess"; void badNodePath() { diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 9c938e40ae66..0ed40de94df8 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -23,7 +23,7 @@ #include <hlinettp.hxx> #include <hlmarkwn_def.hxx> -OUStringLiteral const sAnonymous = u"anonymous"; +constexpr OUStringLiteral sAnonymous = u"anonymous"; char const sFTPScheme[] = INET_FTP_SCHEME; /************************************************************************* diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 732778e2bbd1..16e2590bd8a2 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -43,13 +43,13 @@ namespace { char const namespaceLibreOffice[] = "http://libreoffice.org/extensions/description/2011"; -OUStringLiteral const namespaceOpenOfficeOrg = +constexpr OUStringLiteral namespaceOpenOfficeOrg = u"http://openoffice.org/extensions/description/2006"; char const minimalVersionLibreOffice[] = "LibreOffice-minimal-version"; char const maximalVersionLibreOffice[] = "LibreOffice-maximal-version"; -OUStringLiteral const minimalVersionOpenOfficeOrg = +constexpr OUStringLiteral minimalVersionOpenOfficeOrg = u"OpenOffice.org-minimal-version"; char const maximalVersionOpenOfficeOrg[] = diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx index 3fbf8369b38b..be11dc57c631 100644 --- a/filter/qa/unit/svg.cxx +++ b/filter/qa/unit/svg.cxx @@ -24,7 +24,7 @@ using namespace ::com::sun::star; -OUStringLiteral const DATA_DIRECTORY = u"/filter/qa/unit/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/filter/qa/unit/data/"; /// SVG filter tests. class SvgFilterTest : public test::BootstrapFixture, public unotest::MacrosTest, public XmlTestTools diff --git a/filter/qa/unit/textfilterdetect.cxx b/filter/qa/unit/textfilterdetect.cxx index 1efbebc47b93..d66839402d9b 100644 --- a/filter/qa/unit/textfilterdetect.cxx +++ b/filter/qa/unit/textfilterdetect.cxx @@ -54,7 +54,7 @@ void TextFilterDetectTest::tearDown() test::BootstrapFixture::tearDown(); } -OUStringLiteral const DATA_DIRECTORY = u"/filter/qa/unit/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/filter/qa/unit/data/"; CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testTdf114428) { diff --git a/framework/qa/cppunit/loadenv.cxx b/framework/qa/cppunit/loadenv.cxx index 5ce6826060d0..4842645bb75c 100644 --- a/framework/qa/cppunit/loadenv.cxx +++ b/framework/qa/cppunit/loadenv.cxx @@ -35,7 +35,7 @@ void Test::setUp() mxDesktop.set(frame::Desktop::create(mxComponentContext)); } -OUStringLiteral const DATA_DIRECTORY = u"/framework/qa/cppunit/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/framework/qa/cppunit/data/"; class DocumentOpener { diff --git a/lotuswordpro/qa/cppunit/import_test.cxx b/lotuswordpro/qa/cppunit/import_test.cxx index 6963ba5d5a76..efd40267a9f9 100644 --- a/lotuswordpro/qa/cppunit/import_test.cxx +++ b/lotuswordpro/qa/cppunit/import_test.cxx @@ -51,7 +51,7 @@ void LotusWordProTest::tearDown() test::BootstrapFixture::tearDown(); } -OUStringLiteral const DATA_DIRECTORY = u"/lotuswordpro/qa/cppunit/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/lotuswordpro/qa/cppunit/data/"; CPPUNIT_TEST_FIXTURE(LotusWordProTest, testTdf129993) { diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx index 457df875c948..105bdf169115 100644 --- a/lotuswordpro/source/filter/lwpsilverbullet.cxx +++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx @@ -282,19 +282,19 @@ OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber const * pParaNum break; case NUMCHAR_Chinese1: { - static OUStringLiteral const sBuf = u"\u58f9\u002c\u0020\u8d30, \u53c1, ..."; + static constexpr OUStringLiteral sBuf = u"\u58f9\u002c\u0020\u8d30, \u53c1, ..."; strNumChar = OUString(sBuf); } break; case NUMCHAR_Chinese2: { - static OUStringLiteral const sBuf = u"\u4e00, \u4e8c, \u4e09, ..."; + static constexpr OUStringLiteral sBuf = u"\u4e00, \u4e8c, \u4e09, ..."; strNumChar = OUString(sBuf); } break; case NUMCHAR_Chinese3: { - static OUStringLiteral const sBuf = u"\u7532, \u4e59, \u4e19, ..."; + static constexpr OUStringLiteral sBuf = u"\u7532, \u4e59, \u4e19, ..."; strNumChar = OUString(sBuf); } break; diff --git a/oox/qa/unit/drawingml.cxx b/oox/qa/unit/drawingml.cxx index e5896b0b49ed..92d08b5f0c8a 100644 --- a/oox/qa/unit/drawingml.cxx +++ b/oox/qa/unit/drawingml.cxx @@ -95,7 +95,7 @@ void OoxDrawingmlTest::loadAndReload(const OUString& rURL, const OUString& rFilt mxComponent = loadFromDesktop(aTempFile.GetURL()); } -OUStringLiteral const DATA_DIRECTORY = u"/oox/qa/unit/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/oox/qa/unit/data/"; CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, testTransparentText) { diff --git a/oox/qa/unit/mathml.cxx b/oox/qa/unit/mathml.cxx index 87bdcaee3d9a..6d502b2933d8 100644 --- a/oox/qa/unit/mathml.cxx +++ b/oox/qa/unit/mathml.cxx @@ -42,7 +42,7 @@ void OoxMathmlTest::tearDown() test::BootstrapFixture::tearDown(); } -OUStringLiteral const DATA_DIRECTORY = u"/oox/qa/unit/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/oox/qa/unit/data/"; CPPUNIT_TEST_FIXTURE(OoxMathmlTest, testImportCharacters) { diff --git a/oox/qa/unit/shape.cxx b/oox/qa/unit/shape.cxx index 6c88ba4ea21e..6195e4955a39 100644 --- a/oox/qa/unit/shape.cxx +++ b/oox/qa/unit/shape.cxx @@ -22,7 +22,7 @@ using namespace ::com::sun::star; -OUStringLiteral const DATA_DIRECTORY = u"/oox/qa/unit/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/oox/qa/unit/data/"; /// oox shape tests. class OoxShapeTest : public test::BootstrapFixture, public unotest::MacrosTest diff --git a/oox/qa/unit/vml.cxx b/oox/qa/unit/vml.cxx index ca656a08276c..01c45b64f3ae 100644 --- a/oox/qa/unit/vml.cxx +++ b/oox/qa/unit/vml.cxx @@ -23,7 +23,7 @@ using namespace ::com::sun::star; -OUStringLiteral const DATA_DIRECTORY = u"/oox/qa/unit/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/oox/qa/unit/data/"; /// oox vml tests. class OoxVmlTest : public test::BootstrapFixture, public unotest::MacrosTest diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx index 3cc366a9336d..fc45ba238f2c 100644 --- a/sal/qa/rtl/uri/rtl_testuri.cxx +++ b/sal/qa/rtl/uri/rtl_testuri.cxx @@ -358,7 +358,7 @@ void Test::test_Uri() { // Check encode with unusual text encodings: { - static OUStringLiteral const aText1U = u" !\u0401\u045F"; + static constexpr OUStringLiteral aText1U = u" !\u0401\u045F"; aText1 = OUString(aText1U); aText2 = "%20!%A1%FF"; CPPUNIT_ASSERT_EQUAL_MESSAGE( @@ -374,9 +374,9 @@ void Test::test_Uri() { aText2, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_ISO_8859_5)); } { - static OUStringLiteral const aText1U = u" !\u0401\u0700\u045F"; + static constexpr OUStringLiteral aText1U = u" !\u0401\u0700\u045F"; aText1 = OUString(aText1U); - static OUStringLiteral const aText2U = + static constexpr OUStringLiteral aText2U = u"%20!%A1\u0700%FF"; aText2 = OUString(aText2U); CPPUNIT_ASSERT_EQUAL_MESSAGE( @@ -393,7 +393,7 @@ void Test::test_Uri() { } #if WITH_LOCALE_ALL || WITH_LOCALE_zh { - static OUStringLiteral const aText1U = u" !\u028A\U00022513"; + static constexpr OUStringLiteral aText1U = u" !\u028A\U00022513"; aText1 = OUString(aText1U); aText2 = "%20!%81%30%B1%33%95%39%C5%37"; CPPUNIT_ASSERT_EQUAL_MESSAGE( @@ -412,7 +412,7 @@ void Test::test_Uri() { // Check strict mode: { - static OUStringLiteral const aText1U = u" !\u0401\u0700\u045F"; + static constexpr OUStringLiteral aText1U = u" !\u0401\u0700\u045F"; aText1 = OUString(aText1U); aText2 = OUString(); CPPUNIT_ASSERT_EQUAL_MESSAGE( @@ -452,7 +452,7 @@ void Test::test_Uri() { } { aText1 = "%81%30%B1%33"; - static OUStringLiteral const aText2U = u"\u028A"; + static constexpr OUStringLiteral aText2U = u"\u028A"; aText2 = OUString(aText2U); CPPUNIT_ASSERT_EQUAL_MESSAGE( "failure 27", @@ -462,7 +462,7 @@ void Test::test_Uri() { } { aText1 = "%810%B13"; - static OUStringLiteral const aText2U = u"\u028A"; + static constexpr OUStringLiteral aText2U = u"\u028A"; aText2 = OUString(aText2U); CPPUNIT_ASSERT_EQUAL_MESSAGE( "failure 28", @@ -484,7 +484,7 @@ void Test::test_Uri() { RTL_TEXTENCODING_UTF8)); } { - static OUStringLiteral const aText1U = u"\u00EA"; + static constexpr OUStringLiteral aText1U = u"\u00EA"; aText1 = OUString(aText1U); aText2 = "%C3%AA"; CPPUNIT_ASSERT_EQUAL_MESSAGE( @@ -495,7 +495,7 @@ void Test::test_Uri() { RTL_TEXTENCODING_UTF8)); } { - static OUStringLiteral const aText1U = u" !\u0401\u0700\u045F"; + static constexpr OUStringLiteral aText1U = u" !\u0401\u0700\u045F"; aText1 = OUString(aText1U); aText2 = OUString(); CPPUNIT_ASSERT_EQUAL_MESSAGE( diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx index 7d4dc617b1ef..d849e3291820 100644 --- a/sc/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx @@ -56,7 +56,7 @@ static std::ostream& operator<<(std::ostream& os, ViewShellId const & id) namespace { -OUStringLiteral const DATA_DIRECTORY = u"/sc/qa/unit/tiledrendering/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sc/qa/unit/tiledrendering/data/"; class ScTiledRenderingTest : public test::BootstrapFixture, public unotest::MacrosTest, public XmlTestTools { diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx index a77a80d6e2d5..418cd531db02 100644 --- a/sc/qa/unit/uicalc/uicalc.cxx +++ b/sc/qa/unit/uicalc/uicalc.cxx @@ -59,7 +59,7 @@ void ScUiCalcTest::checkCurrentCell(SCCOL nCol, SCROW nRow) CPPUNIT_ASSERT_EQUAL(sal_Int32(nRow), ScDocShell::GetViewData()->GetCurY()); } -OUStringLiteral const DATA_DIRECTORY = u"/sc/qa/unit/uicalc/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sc/qa/unit/uicalc/data/"; ScModelObj* ScUiCalcTest::createDoc(const char* pName) { diff --git a/sd/qa/filter/eppt/eppt.cxx b/sd/qa/filter/eppt/eppt.cxx index 491d243b7bb8..d27713da20b0 100644 --- a/sd/qa/filter/eppt/eppt.cxx +++ b/sd/qa/filter/eppt/eppt.cxx @@ -48,7 +48,7 @@ void Test::tearDown() test::BootstrapFixture::tearDown(); } -OUStringLiteral const DATA_DIRECTORY = u"/sd/qa/filter/eppt/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sd/qa/filter/eppt/data/"; CPPUNIT_TEST_FIXTURE(Test, testOOXMLCustomShapeBitmapFill) { diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index f8901d2a0f9d..25a3430b307e 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -61,7 +61,7 @@ using namespace css; namespace { - OUStringLiteral const DATA_DIRECTORY = u"/sd/qa/unit/tiledrendering/data/"; + constexpr OUStringLiteral DATA_DIRECTORY = u"/sd/qa/unit/tiledrendering/data/"; } static std::ostream& operator<<(std::ostream& os, ViewShellId id) diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 052460495200..0e23d10c07c6 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -102,7 +102,7 @@ enum WID_PAGE } -OUStringLiteral const sEmptyPageName = u"page"; +constexpr OUStringLiteral sEmptyPageName = u"page"; // this function stores the property maps for draw pages in impress and draw static const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind ePageKind ) diff --git a/sfx2/qa/cppunit/view.cxx b/sfx2/qa/cppunit/view.cxx index 5df7ffa18c37..70bb5fd4f54b 100644 --- a/sfx2/qa/cppunit/view.cxx +++ b/sfx2/qa/cppunit/view.cxx @@ -24,7 +24,7 @@ using namespace com::sun::star; -OUStringLiteral const DATA_DIRECTORY = u"/sfx2/qa/cppunit/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sfx2/qa/cppunit/data/"; /// Covers sfx2/source/view/ fixes. class Sfx2ViewTest : public test::BootstrapFixture, public unotest::MacrosTest diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index 953bfb87f062..8416dc7ba6c3 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -1044,7 +1044,7 @@ void SmXMLExport::ExportAttributes(const SmNode* pNode, int nLevel) { //proper entity support required SvXMLElementExport aMath(*this, XML_NAMESPACE_MATH, XML_MO, true, true); - static OUStringLiteral const nArse = u"\u00AF"; + static constexpr OUStringLiteral nArse = u"\u00AF"; GetDocHandler()->characters(nArse); } break; @@ -1052,7 +1052,7 @@ void SmXMLExport::ExportAttributes(const SmNode* pNode, int nLevel) { //proper entity support required SvXMLElementExport aMath(*this, XML_NAMESPACE_MATH, XML_MO, true, true); - static OUStringLiteral const nArse = u"\u0332"; + static constexpr OUStringLiteral nArse = u"\u0332"; GetDocHandler()->characters(nArse); } break; diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index d8f755ba5be5..df8569b13dc6 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -51,7 +51,7 @@ using namespace svt; namespace { -OUStringLiteral const GREGORIAN = u"gregorian"; +constexpr OUStringLiteral GREGORIAN = u"gregorian"; const sal_uInt16 UPPER_PRECISION = 300; // entirely arbitrary... const double EXP_LOWER_BOUND = 1.0E-4; // prefer scientific notation below this value. diff --git a/svx/qa/unit/unodraw.cxx b/svx/qa/unit/unodraw.cxx index 8220234c2ea5..c0941034280e 100644 --- a/svx/qa/unit/unodraw.cxx +++ b/svx/qa/unit/unodraw.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; namespace { -OUStringLiteral const DATA_DIRECTORY = u"/svx/qa/unit/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/svx/qa/unit/data/"; /// Tests for svx/source/unodraw/ code. class UnodrawTest : public test::BootstrapFixture, public unotest::MacrosTest, public XmlTestTools diff --git a/sw/qa/core/crsr/crsr.cxx b/sw/qa/core/crsr/crsr.cxx index 5ccdf5c068c6..0b93fcc43522 100644 --- a/sw/qa/core/crsr/crsr.cxx +++ b/sw/qa/core/crsr/crsr.cxx @@ -24,7 +24,7 @@ #include <unotxdoc.hxx> #include <wrtsh.hxx> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/core/crsr/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/crsr/data/"; /// Covers sw/source/core/crsr/ fixes. class SwCoreCrsrTest : public SwModelTestBase diff --git a/sw/qa/core/doc/doc.cxx b/sw/qa/core/doc/doc.cxx index b2eb2de95c8a..d68217d65f30 100644 --- a/sw/qa/core/doc/doc.cxx +++ b/sw/qa/core/doc/doc.cxx @@ -25,7 +25,7 @@ #include <view.hxx> #include <ndtxt.hxx> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/core/doc/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/doc/data/"; /// Covers sw/source/core/doc/ fixes. class SwCoreDocTest : public SwModelTestBase diff --git a/sw/qa/core/docnode/docnode.cxx b/sw/qa/core/docnode/docnode.cxx index a2d2524a586e..bcda50c8de7a 100644 --- a/sw/qa/core/docnode/docnode.cxx +++ b/sw/qa/core/docnode/docnode.cxx @@ -13,7 +13,7 @@ #include <doc.hxx> #include <docary.hxx> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/core/docnode/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/docnode/data/"; /// Covers sw/source/core/docnode/ fixes. class Test : public SwModelTestBase diff --git a/sw/qa/core/draw/draw.cxx b/sw/qa/core/draw/draw.cxx index d015277286ab..b8544022589a 100644 --- a/sw/qa/core/draw/draw.cxx +++ b/sw/qa/core/draw/draw.cxx @@ -16,7 +16,7 @@ #include <drawdoc.hxx> #include <wrtsh.hxx> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/core/draw/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/draw/data/"; /// Covers sw/source/core/draw/ fixes. class SwCoreDrawTest : public SwModelTestBase diff --git a/sw/qa/core/frmedt/frmedt.cxx b/sw/qa/core/frmedt/frmedt.cxx index ca29e2121048..097db6402ae1 100644 --- a/sw/qa/core/frmedt/frmedt.cxx +++ b/sw/qa/core/frmedt/frmedt.cxx @@ -24,7 +24,7 @@ #include <docsh.hxx> #include <swdtflvr.hxx> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/core/frmedt/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/frmedt/data/"; /// Covers sw/source/core/frmedt/ fixes. class SwCoreFrmedtTest : public SwModelTestBase diff --git a/sw/qa/core/layout/layout.cxx b/sw/qa/core/layout/layout.cxx index 67b91433855e..6fe44dae97b6 100644 --- a/sw/qa/core/layout/layout.cxx +++ b/sw/qa/core/layout/layout.cxx @@ -21,7 +21,7 @@ #include <IDocumentLayoutAccess.hxx> #include <rootfrm.hxx> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/core/layout/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/layout/data/"; /// Covers sw/source/core/layout/ fixes. class SwCoreLayoutTest : public SwModelTestBase diff --git a/sw/qa/core/objectpositioning/objectpositioning.cxx b/sw/qa/core/objectpositioning/objectpositioning.cxx index 4c53f029ea9a..2a35a41f1ec2 100644 --- a/sw/qa/core/objectpositioning/objectpositioning.cxx +++ b/sw/qa/core/objectpositioning/objectpositioning.cxx @@ -16,7 +16,7 @@ #include <unotxdoc.hxx> #include <docsh.hxx> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/core/objectpositioning/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/objectpositioning/data/"; /// Covers sw/source/core/objectpositioning/ fixes. class SwCoreObjectpositioningTest : public SwModelTestBase diff --git a/sw/qa/core/text/text.cxx b/sw/qa/core/text/text.cxx index ee6ab278d333..8b4c6ae336bb 100644 --- a/sw/qa/core/text/text.cxx +++ b/sw/qa/core/text/text.cxx @@ -15,7 +15,7 @@ #include <unotxdoc.hxx> #include <wrtsh.hxx> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/core/text/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/text/data/"; /// Covers sw/source/core/text/ fixes. class SwCoreTextTest : public SwModelTestBase diff --git a/sw/qa/core/txtnode/txtnode.cxx b/sw/qa/core/txtnode/txtnode.cxx index 3874f0f858c7..a4c7baed8492 100644 --- a/sw/qa/core/txtnode/txtnode.cxx +++ b/sw/qa/core/txtnode/txtnode.cxx @@ -17,7 +17,7 @@ #include <unotxdoc.hxx> #include <docsh.hxx> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/core/txtnode/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/txtnode/data/"; /// Covers sw/source/core/txtnode/ fixes. class SwCoreTxtnodeTest : public SwModelTestBase diff --git a/sw/qa/core/undo/undo.cxx b/sw/qa/core/undo/undo.cxx index 32aecfbe6616..fd1069e64ae0 100644 --- a/sw/qa/core/undo/undo.cxx +++ b/sw/qa/core/undo/undo.cxx @@ -22,7 +22,7 @@ #include <view.hxx> #include <cmdid.h> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/core/undo/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/undo/data/"; /// Covers sw/source/core/undo/ fixes. class SwCoreUndoTest : public SwModelTestBase diff --git a/sw/qa/core/unocore/unocore.cxx b/sw/qa/core/unocore/unocore.cxx index 5ea16ca0a829..62c3f439c4e5 100644 --- a/sw/qa/core/unocore/unocore.cxx +++ b/sw/qa/core/unocore/unocore.cxx @@ -21,7 +21,7 @@ using namespace ::com::sun::star; namespace { -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/core/unocore/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/unocore/data/"; } /// Covers sw/source/core/unocore/ fixes. diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index 0db4e0c2f164..f749c363880e 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -246,7 +246,7 @@ void SwHtmlDomExportTest::ParseOle1FromRtfUrl(const OUString& rRtfUrl, SvMemoryS CPPUNIT_ASSERT(rOle1.Tell()); } -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/htmlexport/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/htmlexport/data/"; DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testFdo81276, "fdo81276.html") { diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx index d46f2d242b85..67759f8db511 100644 --- a/sw/qa/extras/htmlimport/htmlimport.cxx +++ b/sw/qa/extras/htmlimport/htmlimport.cxx @@ -404,7 +404,7 @@ class SwHtmlOptionsImportTest : public SwModelTestBase { }; -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/htmlimport/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/htmlimport/data/"; CPPUNIT_TEST_FIXTURE(SwHtmlOptionsImportTest, testAllowedRTFOLEMimeTypes) { diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 39562206284c..41fb0fec79ac 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -22,7 +22,7 @@ #include <textboxhelper.hxx> #include <unoframe.hxx> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/layout/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/layout/data/"; /// Test to assert layout / rendering result of Writer. class SwLayoutWriter : public SwModelTestBase diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx index bcb1f4c0f074..253783a9e146 100644 --- a/sw/qa/extras/layout/layout2.cxx +++ b/sw/qa/extras/layout/layout2.cxx @@ -50,7 +50,7 @@ #include <svx/svdotext.hxx> #include <dcontact.hxx> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/layout/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/layout/data/"; /// Test to assert layout / rendering result of Writer. class SwLayoutWriter2 : public SwModelTestBase diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx index 91116fbdf2d6..01fc4eb37ac6 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx @@ -38,7 +38,7 @@ using namespace com::sun::star; -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/ooxmlexport/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/ooxmlexport/data/"; class Test : public SwModelTestBase { diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx index 5b0d0e00a025..47c901dbd32f 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/text/XTextFieldsSupplier.hpp> #include <com/sun/star/text/XTextField.hpp> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/ooxmlexport/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/ooxmlexport/data/"; class Test : public SwModelTestBase { diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx index e7e1fb180121..8c521dcd6c8b 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx @@ -14,7 +14,7 @@ #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/text/XTextTablesSupplier.hpp> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/ooxmlexport/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/ooxmlexport/data/"; class Test : public SwModelTestBase { diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 6b39401a9580..936066755825 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -60,7 +60,7 @@ #include <docsh.hxx> #include <txtfrm.hxx> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/tiledrendering/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/tiledrendering/data/"; static std::ostream& operator<<(std::ostream& os, ViewShellId id) { diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 9816e18574a5..2147f581522f 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -140,7 +140,7 @@ namespace { -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/uiwriter/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/uiwriter/data/"; int CountFilesInDirectory(const OUString &rURL) { diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx index 91a429a7b151..7605d8d5acaf 100644 --- a/sw/qa/extras/uiwriter/uiwriter2.cxx +++ b/sw/qa/extras/uiwriter/uiwriter2.cxx @@ -71,8 +71,8 @@ namespace { -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/uiwriter/data2/"; -OUStringLiteral const FLOATING_TABLE_DATA_DIRECTORY +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/uiwriter/data2/"; +constexpr OUStringLiteral FLOATING_TABLE_DATA_DIRECTORY = u"/sw/qa/extras/uiwriter/data/floating_table/"; } // namespace diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx b/sw/qa/extras/uiwriter/uiwriter3.cxx index 7177c8fa7576..37e55f7e3318 100644 --- a/sw/qa/extras/uiwriter/uiwriter3.cxx +++ b/sw/qa/extras/uiwriter/uiwriter3.cxx @@ -39,7 +39,7 @@ namespace { -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/uiwriter/data3/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/uiwriter/data3/"; } // namespace /// Third set of tests asserting the behavior of Writer user interface shells. diff --git a/sw/qa/extras/unowriter/unowriter.cxx b/sw/qa/extras/unowriter/unowriter.cxx index c492712cff32..0266723d9e4d 100644 --- a/sw/qa/extras/unowriter/unowriter.cxx +++ b/sw/qa/extras/unowriter/unowriter.cxx @@ -59,7 +59,7 @@ using namespace ::com::sun::star; namespace { -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/unowriter/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/unowriter/data/"; /// Listener implementation for testPasteListener. class PasteListener : public cppu::WeakImplHelper<text::XPasteListener> diff --git a/sw/qa/uibase/frmdlg/frmdlg.cxx b/sw/qa/uibase/frmdlg/frmdlg.cxx index 607b8f1178b0..56b96803686e 100644 --- a/sw/qa/uibase/frmdlg/frmdlg.cxx +++ b/sw/qa/uibase/frmdlg/frmdlg.cxx @@ -11,7 +11,7 @@ #include <com/sun/star/text/TextContentAnchorType.hpp> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/uibase/frmdlg/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/uibase/frmdlg/data/"; /// Covers sw/source/uibase/frmdlg/ fixes. class SwUibaseFrmdlgTest : public SwModelTestBase diff --git a/sw/qa/uibase/shells/shells.cxx b/sw/qa/uibase/shells/shells.cxx index a0d3beb6a148..d267bda51a96 100644 --- a/sw/qa/uibase/shells/shells.cxx +++ b/sw/qa/uibase/shells/shells.cxx @@ -31,7 +31,7 @@ #include <drawdoc.hxx> #include <docsh.hxx> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/uibase/shells/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/uibase/shells/data/"; /// Covers sw/source/uibase/shells/ fixes. class SwUibaseShellsTest : public SwModelTestBase diff --git a/sw/qa/uibase/uiview/uiview.cxx b/sw/qa/uibase/uiview/uiview.cxx index 89c91af3c8ba..0c12fd6dd81d 100644 --- a/sw/qa/uibase/uiview/uiview.cxx +++ b/sw/qa/uibase/uiview/uiview.cxx @@ -20,7 +20,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/packages/zip/ZipFileAccess.hpp> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/uibase/uiview/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/uibase/uiview/data/"; /// Covers sw/source/uibase/uiview/ fixes. class SwUibaseUiviewTest : public SwModelTestBase diff --git a/sw/qa/uibase/uno/uno.cxx b/sw/qa/uibase/uno/uno.cxx index 2924d54c52e6..01dadbc80fee 100644 --- a/sw/qa/uibase/uno/uno.cxx +++ b/sw/qa/uibase/uno/uno.cxx @@ -13,7 +13,7 @@ #include <vcl/scheduler.hxx> -OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/uibase/uno/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/uibase/uno/data/"; /// Covers sw/source/uibase/uno/ fixes. class SwUibaseUnoTest : public SwModelTestBase diff --git a/unotools/qa/unit/testGetEnglishSearchName.cxx b/unotools/qa/unit/testGetEnglishSearchName.cxx index 18bec28f7521..84feb67b97ae 100644 --- a/unotools/qa/unit/testGetEnglishSearchName.cxx +++ b/unotools/qa/unit/testGetEnglishSearchName.cxx @@ -45,23 +45,23 @@ void Test::testSingleElement() //for Japanese fontname // IPAMincho - static OUStringLiteral const aIPAMincho=u"ipa\u660e\u671d"; + static constexpr OUStringLiteral aIPAMincho=u"ipa\u660e\u671d"; OUString test_ja_JP1 = GetEnglishSearchFontName(aIPAMincho); CPPUNIT_ASSERT_EQUAL( OUString("ipamincho"),test_ja_JP1); // IPAGothic - static OUStringLiteral const aIPAGothic=u"ipa\u30b4\u30b7\u30c3\u30af"; + static constexpr OUStringLiteral aIPAGothic=u"ipa\u30b4\u30b7\u30c3\u30af"; OUString test_ja_JP2 = GetEnglishSearchFontName(aIPAGothic); CPPUNIT_ASSERT_EQUAL( OUString("ipagothic"),test_ja_JP2); // HiraginoKakuGothic - static OUStringLiteral const aHiraginoKakuGothic=u"\u30D2\u30E9\u30AE\u30CE\u89D2\u30B4\u30B7\u30C3\u30AF"; + static constexpr OUStringLiteral aHiraginoKakuGothic=u"\u30D2\u30E9\u30AE\u30CE\u89D2\u30B4\u30B7\u30C3\u30AF"; OUString test_ja_JP3 = GetEnglishSearchFontName(aHiraginoKakuGothic); CPPUNIT_ASSERT_EQUAL( OUString("hiraginosans"),test_ja_JP3); // HiraginoMincho Pro N - static OUStringLiteral const aHiraginoMinchoProN=u"\u30D2\u30E9\u30AE\u30CE\u660E\u671Dpron"; + static constexpr OUStringLiteral aHiraginoMinchoProN=u"\u30D2\u30E9\u30AE\u30CE\u660E\u671Dpron"; OUString test_ja_JP4 = GetEnglishSearchFontName(aHiraginoMinchoProN); CPPUNIT_ASSERT_EQUAL( OUString("hiraginominchopron"),test_ja_JP4); // HiraginoMaruGothic Pro N - static OUStringLiteral const aHiraginoMaruGothicProN + static constexpr OUStringLiteral aHiraginoMaruGothicProN =u"\u30D2\u30E9\u30AE\u30CE\u4E38\u30B4pron"; OUString test_ja_JP5 = GetEnglishSearchFontName(aHiraginoMaruGothicProN); CPPUNIT_ASSERT_EQUAL( OUString("hiraginomarugothicpron"),test_ja_JP5); diff --git a/vcl/qa/cppunit/GraphicTest.cxx b/vcl/qa/cppunit/GraphicTest.cxx index 93c9c64ea3d2..0f3562388d97 100644 --- a/vcl/qa/cppunit/GraphicTest.cxx +++ b/vcl/qa/cppunit/GraphicTest.cxx @@ -211,8 +211,8 @@ bool checkBitmap(Graphic& rGraphic) return bResult; } -OUStringLiteral const DATA_DIRECTORY = u"/vcl/qa/cppunit/data/"; -OUStringLiteral const PDFEXPORT_DATA_DIRECTORY = u"/vcl/qa/cppunit/pdfexport/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/vcl/qa/cppunit/data/"; +constexpr OUStringLiteral PDFEXPORT_DATA_DIRECTORY = u"/vcl/qa/cppunit/pdfexport/data/"; void GraphicTest::testUnloadedGraphic() { diff --git a/vcl/qa/cppunit/PDFDocumentTest.cxx b/vcl/qa/cppunit/PDFDocumentTest.cxx index f1717cf4041f..2246f8e38924 100644 --- a/vcl/qa/cppunit/PDFDocumentTest.cxx +++ b/vcl/qa/cppunit/PDFDocumentTest.cxx @@ -22,7 +22,7 @@ public: PDFDocumentTest() = default; }; -OUStringLiteral const DATA_DIRECTORY = u"/vcl/qa/cppunit/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/vcl/qa/cppunit/data/"; CPPUNIT_TEST_FIXTURE(PDFDocumentTest, testParseBasicPDF) { diff --git a/vcl/qa/cppunit/filter/igif/igif.cxx b/vcl/qa/cppunit/filter/igif/igif.cxx index 21a2f8eb0ce8..4c730247f446 100644 --- a/vcl/qa/cppunit/filter/igif/igif.cxx +++ b/vcl/qa/cppunit/filter/igif/igif.cxx @@ -20,7 +20,7 @@ using namespace com::sun::star; namespace { -OUStringLiteral const DATA_DIRECTORY = u"/vcl/qa/cppunit/filter/igif/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/vcl/qa/cppunit/filter/igif/data/"; /// Covers vcl/source/filter/igif/ fixes. class Test : public test::BootstrapFixture diff --git a/vcl/qa/cppunit/filter/ipdf/ipdf.cxx b/vcl/qa/cppunit/filter/ipdf/ipdf.cxx index e7e407108d76..df93de1b3b68 100644 --- a/vcl/qa/cppunit/filter/ipdf/ipdf.cxx +++ b/vcl/qa/cppunit/filter/ipdf/ipdf.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star; namespace { -OUStringLiteral const DATA_DIRECTORY = u"/vcl/qa/cppunit/filter/ipdf/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/vcl/qa/cppunit/filter/ipdf/data/"; } /// Covers vcl/source/filter/ipdf/ fixes. diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index d8679081d348..a93d42f77ca9 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -114,7 +114,7 @@ void PdfExportTest::tearDown() test::BootstrapFixture::tearDown(); } -OUStringLiteral const DATA_DIRECTORY = u"/vcl/qa/cppunit/pdfexport/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/vcl/qa/cppunit/pdfexport/data/"; void PdfExportTest::saveAsPDF(std::u16string_view rFile) { diff --git a/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx b/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx index a834cf1173ec..4449e9a20e3f 100644 --- a/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx +++ b/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx @@ -46,7 +46,7 @@ void Test::tearDown() test::BootstrapFixture::tearDown(); } -OUStringLiteral const DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/"; CPPUNIT_TEST_FIXTURE(Test, test129205) { diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx b/writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx index 4090d6a05381..f89779ff131a 100644 --- a/writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx +++ b/writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx @@ -50,7 +50,7 @@ void Test::tearDown() test::BootstrapFixture::tearDown(); } -OUStringLiteral const DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/"; CPPUNIT_TEST_FIXTURE(Test, testLargeParaTopMargin) { diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx b/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx index d84fcac50d51..1accc77a1f5a 100644 --- a/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx @@ -48,7 +48,7 @@ void Test::tearDown() test::BootstrapFixture::tearDown(); } -OUStringLiteral const DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/"; CPPUNIT_TEST_FIXTURE(Test, test1cellInsidevRightborder) { diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx index 41d1d4065206..6cd688975bd1 100644 --- a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx @@ -50,7 +50,7 @@ void Test::tearDown() test::BootstrapFixture::tearDown(); } -OUStringLiteral const DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/"; CPPUNIT_TEST_FIXTURE(Test, testPageBreakFooterTable) { diff --git a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx index 1d88c651a149..d77d00c682fd 100644 --- a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx +++ b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx @@ -50,7 +50,7 @@ void Test::tearDown() test::BootstrapFixture::tearDown(); } -OUStringLiteral const DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/"; CPPUNIT_TEST_FIXTURE(Test, testGroupShapeRotation) { diff --git a/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx b/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx index 473f77a5c783..7b552af94bb0 100644 --- a/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx +++ b/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx @@ -47,7 +47,7 @@ void Test::tearDown() test::BootstrapFixture::tearDown(); } -OUStringLiteral const DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/"; CPPUNIT_TEST_FIXTURE(Test, testFloatingTableHeader) { diff --git a/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx b/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx index b3b7e5b1b11f..45a689b6b084 100644 --- a/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx +++ b/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx @@ -45,7 +45,7 @@ void Test::tearDown() test::BootstrapFixture::tearDown(); } -OUStringLiteral const DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/"; CPPUNIT_TEST_FIXTURE(Test, testSemiTransparentText) { diff --git a/writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx b/writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx index 6e8b09211ea3..f8ab49d40534 100644 --- a/writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx +++ b/writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx @@ -46,7 +46,7 @@ void Test::tearDown() test::BootstrapFixture::tearDown(); } -OUStringLiteral const DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/rtftok/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/rtftok/data/"; CPPUNIT_TEST_FIXTURE(Test, testPictureInTextframe) { diff --git a/writerfilter/qa/cppunittests/rtftok/rtfsprm.cxx b/writerfilter/qa/cppunittests/rtftok/rtfsprm.cxx index 5a39d0b8f9cf..abb0a19f4727 100644 --- a/writerfilter/qa/cppunittests/rtftok/rtfsprm.cxx +++ b/writerfilter/qa/cppunittests/rtftok/rtfsprm.cxx @@ -46,7 +46,7 @@ void Test::tearDown() test::BootstrapFixture::tearDown(); } -OUStringLiteral const DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/rtftok/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/rtftok/data/"; CPPUNIT_TEST_FIXTURE(Test, testLeftMarginDedup) { diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx b/writerperfect/qa/unit/EPUBExportTest.cxx index 91c62ad60a25..d703c9fa61f6 100644 --- a/writerperfect/qa/unit/EPUBExportTest.cxx +++ b/writerperfect/qa/unit/EPUBExportTest.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star; namespace { -OUStringLiteral const DATA_DIRECTORY = u"/writerperfect/qa/unit/data/writer/epubexport/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/writerperfect/qa/unit/data/writer/epubexport/"; /// Tests the EPUB export filter. class EPUBExportTest : public test::BootstrapFixture, diff --git a/xmloff/qa/unit/draw.cxx b/xmloff/qa/unit/draw.cxx index 4128e33b96f2..d386e92a2da6 100644 --- a/xmloff/qa/unit/draw.cxx +++ b/xmloff/qa/unit/draw.cxx @@ -20,7 +20,7 @@ using namespace ::com::sun::star; -OUStringLiteral const DATA_DIRECTORY = u"/xmloff/qa/unit/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/xmloff/qa/unit/data/"; /// Covers xmloff/source/draw/ fixes. class XmloffDrawTest : public test::BootstrapFixture, public unotest::MacrosTest diff --git a/xmloff/qa/unit/style.cxx b/xmloff/qa/unit/style.cxx index 1814d4f4f2ce..f2d9cdbedc37 100644 --- a/xmloff/qa/unit/style.cxx +++ b/xmloff/qa/unit/style.cxx @@ -19,7 +19,7 @@ using namespace ::com::sun::star; -OUStringLiteral const DATA_DIRECTORY = u"/xmloff/qa/unit/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/xmloff/qa/unit/data/"; /// Covers xmloff/source/style/ fixes. class XmloffStyleTest : public test::BootstrapFixture, public unotest::MacrosTest diff --git a/xmloff/qa/unit/text.cxx b/xmloff/qa/unit/text.cxx index de2f718f53dc..c8e867401ccd 100644 --- a/xmloff/qa/unit/text.cxx +++ b/xmloff/qa/unit/text.cxx @@ -14,7 +14,7 @@ using namespace ::com::sun::star; -OUStringLiteral const DATA_DIRECTORY = u"/xmloff/qa/unit/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/xmloff/qa/unit/data/"; /// Covers xmloff/source/text/ fixes. class XmloffStyleTest : public test::BootstrapFixture, public unotest::MacrosTest diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx index 0c0ce1107a3d..2561d8d18054 100644 --- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx +++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx @@ -37,7 +37,7 @@ using namespace com::sun::star; namespace { -OUStringLiteral const DATA_DIRECTORY = u"/xmlsecurity/qa/unit/pdfsigning/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/xmlsecurity/qa/unit/pdfsigning/data/"; } /// Testsuite for the PDF signing feature. diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index c5542dc3306f..3a784dd9e0fd 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -63,7 +63,7 @@ using namespace com::sun::star; namespace { -OUStringLiteral const DATA_DIRECTORY = u"/xmlsecurity/qa/unit/signing/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/xmlsecurity/qa/unit/signing/data/"; } /// Testsuite for the document signing feature. diff --git a/xmlsecurity/qa/unit/signing/signing2.cxx b/xmlsecurity/qa/unit/signing/signing2.cxx index 89a3e1bcf2ce..e23c5530a76c 100644 --- a/xmlsecurity/qa/unit/signing/signing2.cxx +++ b/xmlsecurity/qa/unit/signing/signing2.cxx @@ -31,7 +31,7 @@ using namespace css; namespace { -OUStringLiteral const DATA_DIRECTORY = u"/xmlsecurity/qa/unit/signing/data/"; +constexpr OUStringLiteral DATA_DIRECTORY = u"/xmlsecurity/qa/unit/signing/data/"; } /// Testsuite for the document signing feature. |