From 2d582244680e7f6dec6e4a466e276f93ccb01dc9 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 10 Aug 2020 20:47:32 +0200 Subject: loplugin:flatten Change-Id: I6560756eb63856a22b43e3e65a7b7843cd2d5376 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100447 Tested-by: Jenkins Reviewed-by: Noel Grandin --- test/source/screenshot_test.cxx | 42 +++++++++++++++++++------------------- test/source/sheet/xnamedranges.cxx | 26 +++++++++++------------ 2 files changed, 33 insertions(+), 35 deletions(-) (limited to 'test') diff --git a/test/source/screenshot_test.cxx b/test/source/screenshot_test.cxx index ea26f80c47a6..9d02a67b896b 100644 --- a/test/source/screenshot_test.cxx +++ b/test/source/screenshot_test.cxx @@ -197,27 +197,27 @@ void ScreenshotTest::dumpDialogToPath(weld::Builder& rBuilder) void ScreenshotTest::dumpDialogToPath(const OString& rUIXMLDescription) { - if (!rUIXMLDescription.isEmpty()) - { - bool bNonConforming = rUIXMLDescription == "modules/swriter/ui/sidebarstylepresets.ui" || - rUIXMLDescription == "modules/swriter/ui/sidebartheme.ui" || - rUIXMLDescription == "modules/swriter/ui/notebookbar.ui" || - rUIXMLDescription == "modules/scalc/ui/sidebaralignment.ui" || - rUIXMLDescription == "modules/scalc/ui/sidebarcellappearance.ui" || - rUIXMLDescription == "modules/scalc/ui/sidebarnumberformat.ui" || - rUIXMLDescription == "sfx/ui/helpbookmarkpage.ui" || - rUIXMLDescription == "sfx/ui/helpcontentpage.ui" || - rUIXMLDescription == "sfx/ui/helpindexpage.ui" || - rUIXMLDescription == "sfx/ui/helpsearchpage.ui" || - rUIXMLDescription == "sfx/ui/startcenter.ui" || - rUIXMLDescription == "svx/ui/datanavigator.ui" || - rUIXMLDescription == "svx/ui/xformspage.ui" || - rUIXMLDescription == "modules/dbreport/ui/conditionwin.ui"; - if (bNonConforming) // skip these broken ones - return; - std::unique_ptr xBuilder(Application::CreateBuilder(mxParentWidget.get(), OStringToOUString(rUIXMLDescription, RTL_TEXTENCODING_UTF8))); - dumpDialogToPath(*xBuilder); - } + if (rUIXMLDescription.isEmpty()) + return; + + bool bNonConforming = rUIXMLDescription == "modules/swriter/ui/sidebarstylepresets.ui" || + rUIXMLDescription == "modules/swriter/ui/sidebartheme.ui" || + rUIXMLDescription == "modules/swriter/ui/notebookbar.ui" || + rUIXMLDescription == "modules/scalc/ui/sidebaralignment.ui" || + rUIXMLDescription == "modules/scalc/ui/sidebarcellappearance.ui" || + rUIXMLDescription == "modules/scalc/ui/sidebarnumberformat.ui" || + rUIXMLDescription == "sfx/ui/helpbookmarkpage.ui" || + rUIXMLDescription == "sfx/ui/helpcontentpage.ui" || + rUIXMLDescription == "sfx/ui/helpindexpage.ui" || + rUIXMLDescription == "sfx/ui/helpsearchpage.ui" || + rUIXMLDescription == "sfx/ui/startcenter.ui" || + rUIXMLDescription == "svx/ui/datanavigator.ui" || + rUIXMLDescription == "svx/ui/xformspage.ui" || + rUIXMLDescription == "modules/dbreport/ui/conditionwin.ui"; + if (bNonConforming) // skip these broken ones + return; + std::unique_ptr xBuilder(Application::CreateBuilder(mxParentWidget.get(), OStringToOUString(rUIXMLDescription, RTL_TEXTENCODING_UTF8))); + dumpDialogToPath(*xBuilder); } void ScreenshotTest::processAllKnownDialogs() diff --git a/test/source/sheet/xnamedranges.cxx b/test/source/sheet/xnamedranges.cxx index c4d272cdcc39..25726ca9e739 100644 --- a/test/source/sheet/xnamedranges.cxx +++ b/test/source/sheet/xnamedranges.cxx @@ -146,20 +146,18 @@ void XNamedRanges::testRemoveByName() bool bHasIt = xNamedRanges->hasByName(maNameToRemove); CPPUNIT_ASSERT_MESSAGE("NamedRange initial1 does not exist, can't remove it", bHasIt); - if (bHasIt) - { - // remove existing - sal_Int32 nInitialCount = xIndex->getCount(); - xNamedRanges->removeByName(maNameToRemove); - sal_Int32 nNewCount = xIndex->getCount(); - CPPUNIT_ASSERT_EQUAL_MESSAGE("NamedRange initial1 not removed", nNewCount, - nInitialCount - 1); - CPPUNIT_ASSERT_MESSAGE("Wrong NamedRange removed, initial1 still present", - !xNamedRanges->hasByName(maNameToRemove)); - // try to remove non existing - xNamedRanges->removeByName( - "dummyNonExistingNamedRange"); // an exception should be raised here - } + if (!bHasIt) + return; + + // remove existing + sal_Int32 nInitialCount = xIndex->getCount(); + xNamedRanges->removeByName(maNameToRemove); + sal_Int32 nNewCount = xIndex->getCount(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("NamedRange initial1 not removed", nNewCount, nInitialCount - 1); + CPPUNIT_ASSERT_MESSAGE("Wrong NamedRange removed, initial1 still present", + !xNamedRanges->hasByName(maNameToRemove)); + // try to remove non existing + xNamedRanges->removeByName("dummyNonExistingNamedRange"); // an exception should be raised here } void XNamedRanges::testOutputList() -- cgit