diff options
Diffstat (limited to 'sw')
27 files changed, 28 insertions, 28 deletions
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 |