diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-01 09:08:12 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-03 11:56:43 +0200 |
commit | 4969f4c0d3e2581aaa8a5b5a5769840fa6b6f8ea (patch) | |
tree | eb42ab5be5d8c5ca3d23b686a8781c28822381b4 /test | |
parent | d5cc52fec12e3c8d1c3561f172d3e1c5434290b3 (diff) |
loplugin:constfields in sw
Change-Id: I1eb6583bb9ec815bc0564b0d7c676f5b1fb9045f
Reviewed-on: https://gerrit.libreoffice.org/61177
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'test')
-rw-r--r-- | test/source/diff/diff.cxx | 4 | ||||
-rw-r--r-- | test/source/screenshot_test.cxx | 10 | ||||
-rw-r--r-- | test/source/sheet/xspreadsheets2.cxx | 21 |
3 files changed, 19 insertions, 16 deletions
diff --git a/test/source/diff/diff.cxx b/test/source/diff/diff.cxx index 995d11d87304..477813259af7 100644 --- a/test/source/diff/diff.cxx +++ b/test/source/diff/diff.cxx @@ -90,8 +90,8 @@ private: void cppunitAssertEqualDouble(const xmlNodePtr node, const xmlAttrPtr attr, double expected, double found, double delta); ToleranceContainer toleranceContainer; - xmlDocPtr xmlFile1; - xmlDocPtr xmlFile2; + xmlDocPtr const xmlFile1; + xmlDocPtr const xmlFile2; std::string fileName; }; diff --git a/test/source/screenshot_test.cxx b/test/source/screenshot_test.cxx index 3726afaeb716..ecdd172fd585 100644 --- a/test/source/screenshot_test.cxx +++ b/test/source/screenshot_test.cxx @@ -34,9 +34,11 @@ namespace { using namespace css; using namespace css::uno; + /// the target directory for screenshots +static constexpr OUStringLiteral g_aScreenshotDirectory("screenshots"); + ScreenshotTest::ScreenshotTest() -: m_aScreenshotDirectory("screenshots"), - maKnownDialogs() + : maKnownDialogs() { maCurrentLanguage = OUString::fromUtf8(getenv("LO_TEST_LOCALE")); } @@ -52,7 +54,7 @@ void ScreenshotTest::setUp() mxDesktop = css::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) ); CPPUNIT_ASSERT_MESSAGE("no desktop!", mxDesktop.is()); - osl::Directory::create( m_directories.getURLFromWorkdir( m_aScreenshotDirectory)) ; + osl::Directory::create( m_directories.getURLFromWorkdir( g_aScreenshotDirectory)) ; // initialize maKnownDialogs if (maKnownDialogs.empty()) @@ -65,7 +67,7 @@ void ScreenshotTest::implSaveScreenshot(const BitmapEx& rScreenshot, const OStri { OUString aDirname, aBasename; splitHelpId(rScreenshotId, aDirname, aBasename); - aDirname = m_aScreenshotDirectory + "/" + aDirname + + aDirname = g_aScreenshotDirectory + "/" + aDirname + ( (maCurrentLanguage == "en-US") ? OUString() : "/" + maCurrentLanguage ); auto const dirUrl = m_directories.getURLFromWorkdir(aDirname); diff --git a/test/source/sheet/xspreadsheets2.cxx b/test/source/sheet/xspreadsheets2.cxx index 162198b00fad..cea68e1cfad9 100644 --- a/test/source/sheet/xspreadsheets2.cxx +++ b/test/source/sheet/xspreadsheets2.cxx @@ -40,10 +40,11 @@ using namespace css::uno; namespace apitest { -XSpreadsheets2::XSpreadsheets2(): - aSrcSheetName("SheetToCopy"), - aSrcFileName("rangenamessrc.ods"), - aDestFileBase("ScNamedRangeObj.ods") +static constexpr OUStringLiteral gaSrcSheetName("SheetToCopy"); +static constexpr OUStringLiteral gaSrcFileName("rangenamessrc.ods"); +static constexpr OUStringLiteral gaDestFileBase("ScNamedRangeObj.ods"); + +XSpreadsheets2::XSpreadsheets2() { } @@ -65,7 +66,7 @@ void XSpreadsheets2::testImportedSheetNameAndIndex() importSheetToCopy(); uno::Reference< container::XNameAccess > xDestSheetNameAccess(xDestDoc->getSheets(), UNO_QUERY_THROW); - CPPUNIT_ASSERT_MESSAGE("Wrong sheet name", xDestSheetNameAccess->hasByName(aSrcSheetName)); + CPPUNIT_ASSERT_MESSAGE("Wrong sheet name", xDestSheetNameAccess->hasByName(gaSrcSheetName)); } @@ -298,18 +299,18 @@ uno::Reference< sheet::XNamedRanges> XSpreadsheets2::getNamedRanges(uno::Referen void XSpreadsheets2::importSheetToCopy() { uno::Reference< container::XNameAccess> xSrcNameAccess(init(),UNO_QUERY_THROW); - xSrcSheet.set( xSrcNameAccess->getByName(aSrcSheetName), UNO_QUERY_THROW); + xSrcSheet.set( xSrcNameAccess->getByName(gaSrcSheetName), UNO_QUERY_THROW); uno::Reference< lang::XComponent > xDestComponent; if (!xDestComponent.is()) { - xDestDoc = getDoc(aDestFileBase, xDestComponent); + xDestDoc = getDoc(gaDestFileBase, xDestComponent); CPPUNIT_ASSERT(xDestDoc.is()); // import sheet uno::Reference< sheet::XSpreadsheets2 > xDestSheets (xDestDoc->getSheets(), UNO_QUERY_THROW); sal_Int32 nDestPos = 0; - sal_Int32 nDestPosEffective = xDestSheets->importSheet(xDocument, aSrcSheetName, nDestPos); + sal_Int32 nDestPosEffective = xDestSheets->importSheet(xDocument, gaSrcSheetName, nDestPos); CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong sheet index", nDestPosEffective, nDestPos); } else @@ -318,7 +319,7 @@ void XSpreadsheets2::importSheetToCopy() } uno::Reference< container::XNameAccess > xDestSheetNameAccess (xDestDoc->getSheets(), UNO_QUERY_THROW); - xDestSheet.set( xDestSheetNameAccess->getByName(aSrcSheetName), UNO_QUERY_THROW); + xDestSheet.set( xDestSheetNameAccess->getByName(gaSrcSheetName), UNO_QUERY_THROW); } bool XSpreadsheets2::isExternalReference(const OUString& aDestContent, const OUString& aSrcContent ) @@ -326,7 +327,7 @@ bool XSpreadsheets2::isExternalReference(const OUString& aDestContent, const OUS CPPUNIT_ASSERT(aDestContent.startsWith("'file://")); return (aDestContent.endsWithIgnoreAsciiCase(aSrcContent) // same cell address - && aDestContent.indexOf(aSrcFileName)>0); // contains source file name + && aDestContent.indexOf(gaSrcFileName)>0); // contains source file name } } |