'make screenshot' loplugin fixes

Change-Id: Ibebcd1c1ebfea0ecdf9d90b6f8bcc8ceb87df456

16 files changed, 18 insertions, 116 deletions

diff --git a/basctl/qa/unit/basctl-dialogs-test.cxx b/basctl/qa/unit/basctl-dialogs-test.cxx
index e0af831b4700..3dc70db31b3e 100644
--- a/basctl/qa/unit/basctl-dialogs-test.cxx
+++ b/basctl/qa/unit/basctl-dialogs-test.cxx
@@ -30,9 +30,7 @@ private:
 
 public:
     BasctlDialogsTest();
-    virtual ~BasctlDialogsTest();
-
-    virtual void setUp() override;
+    virtual ~BasctlDialogsTest() override;
 
     // try to open a dialog
     void openAnyDialog();
@@ -50,11 +48,6 @@ BasctlDialogsTest::~BasctlDialogsTest()
 {
 }
 
-void BasctlDialogsTest::setUp()
-{
-    ScreenshotTest::setUp();
-}
-
 void BasctlDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
     // fill map of known dilogs
diff --git a/chart2/qa/unit/chart2-dialogs-test.cxx b/chart2/qa/unit/chart2-dialogs-test.cxx
index 112adbf4698f..fee5611e9487 100644
--- a/chart2/qa/unit/chart2-dialogs-test.cxx
+++ b/chart2/qa/unit/chart2-dialogs-test.cxx
@@ -30,9 +30,7 @@ private:
 
 public:
     Chart2DialogsTest();
-    virtual ~Chart2DialogsTest();
-
-    virtual void setUp() override;
+    virtual ~Chart2DialogsTest() override;
 
     // try to open a dialog
     void openAnyDialog();
@@ -50,11 +48,6 @@ Chart2DialogsTest::~Chart2DialogsTest()
 {
 }
 
-void Chart2DialogsTest::setUp()
-{
-    ScreenshotTest::setUp();
-}
-
 void Chart2DialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
     // fill map of known dilogs
diff --git a/cui/qa/unit/cui-dialogs-test.cxx b/cui/qa/unit/cui-dialogs-test.cxx
index 58cc3b9fcd04..e0a2a583b642 100644
--- a/cui/qa/unit/cui-dialogs-test.cxx
+++ b/cui/qa/unit/cui-dialogs-test.cxx
@@ -30,9 +30,7 @@ private:
 
 public:
     CuiDialogsTest();
-    virtual ~CuiDialogsTest();
-
-    virtual void setUp() override;
+    virtual ~CuiDialogsTest() override;
 
     // try to open a dialog
     void openAnyDialog();
@@ -50,11 +48,6 @@ CuiDialogsTest::~CuiDialogsTest()
 {
 }
 
-void CuiDialogsTest::setUp()
-{
-    ScreenshotTest::setUp();
-}
-
 void CuiDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
     // fill map of known dilogs
diff --git a/dbaccess/qa/unit/dbaccess-dialogs-test.cxx b/dbaccess/qa/unit/dbaccess-dialogs-test.cxx
index a95a8cea5949..f369cc326963 100644
--- a/dbaccess/qa/unit/dbaccess-dialogs-test.cxx
+++ b/dbaccess/qa/unit/dbaccess-dialogs-test.cxx
@@ -30,9 +30,7 @@ private:
 
 public:
     DbaccessDialogsTest();
-    virtual ~DbaccessDialogsTest();
-
-    virtual void setUp() override;
+    virtual ~DbaccessDialogsTest() override;
 
     // try to open a dialog
     void openAnyDialog();
@@ -50,11 +48,6 @@ DbaccessDialogsTest::~DbaccessDialogsTest()
 {
 }
 
-void DbaccessDialogsTest::setUp()
-{
-    ScreenshotTest::setUp();
-}
-
 void DbaccessDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
     // fill map of known dilogs
diff --git a/desktop/qa/unit/desktop-dialogs-test.cxx b/desktop/qa/unit/desktop-dialogs-test.cxx
index ff654ff44424..d65ef7513685 100644
--- a/desktop/qa/unit/desktop-dialogs-test.cxx
+++ b/desktop/qa/unit/desktop-dialogs-test.cxx
@@ -30,9 +30,7 @@ private:
 
 public:
     DesktopDialogsTest();
-    virtual ~DesktopDialogsTest();
-
-    virtual void setUp() override;
+    virtual ~DesktopDialogsTest() override;
 
     // try to open a dialog
     void openAnyDialog();
@@ -50,11 +48,6 @@ DesktopDialogsTest::~DesktopDialogsTest()
 {
 }
 
-void DesktopDialogsTest::setUp()
-{
-    ScreenshotTest::setUp();
-}
-
 void DesktopDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
     // fill map of known dilogs
diff --git a/filter/qa/unit/filter-dialogs-test.cxx b/filter/qa/unit/filter-dialogs-test.cxx
index 8cc149777ef8..d04982510ab9 100644
--- a/filter/qa/unit/filter-dialogs-test.cxx
+++ b/filter/qa/unit/filter-dialogs-test.cxx
@@ -30,9 +30,7 @@ private:
 
 public:
     FilterDialogsTest();
-    virtual ~FilterDialogsTest();
-
-    virtual void setUp() override;
+    virtual ~FilterDialogsTest() override;
 
     // try to open a dialog
     void openAnyDialog();
@@ -50,11 +48,6 @@ FilterDialogsTest::~FilterDialogsTest()
 {
 }
 
-void FilterDialogsTest::setUp()
-{
-    ScreenshotTest::setUp();
-}
-
 void FilterDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
     // fill map of known dilogs
diff --git a/reportdesign/qa/unit/reportdesign-dialogs-test.cxx b/reportdesign/qa/unit/reportdesign-dialogs-test.cxx
index 3f3736412c98..d2a867a217e7 100644
--- a/reportdesign/qa/unit/reportdesign-dialogs-test.cxx
+++ b/reportdesign/qa/unit/reportdesign-dialogs-test.cxx
@@ -30,9 +30,7 @@ private:
 
 public:
     ReportdesignDialogsTest();
-    virtual ~ReportdesignDialogsTest();
-
-    virtual void setUp() override;
+    virtual ~ReportdesignDialogsTest() override;
 
     // try to open a dialog
     void openAnyDialog();
@@ -50,11 +48,6 @@ ReportdesignDialogsTest::~ReportdesignDialogsTest()
 {
 }
 
-void ReportdesignDialogsTest::setUp()
-{
-    ScreenshotTest::setUp();
-}
-
 void ReportdesignDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
     // fill map of known dilogs
diff --git a/sc/qa/unit/screenshots/screenshots.cxx b/sc/qa/unit/screenshots/screenshots.cxx
index 97fa0af03c47..0bb00c17b219 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -68,7 +68,7 @@ private:
 
 public:
     ScScreenshotTest();
-    virtual ~ScScreenshotTest();
+    virtual ~ScScreenshotTest() override;
 
     void testOpeningModalDialogs();
 
@@ -258,7 +258,7 @@ VclAbstractDialog* ScScreenshotTest::createDialogByID(sal_uInt32 nID)
             mpItemSet->Put(SfxUInt32Item(ATTR_VALUE_FORMAT,
                            pAttr->GetNumberFormat( pDoc->GetFormatTable() ) ) );
 
-            pNumberInfoItem.reset(mpViewShell->MakeNumberInfoItem(pDoc, &rViewData));
+            pNumberInfoItem.reset(ScTabViewShell::MakeNumberInfoItem(pDoc, &rViewData));
 
             mpItemSet->MergeRange(SID_ATTR_NUMBERFORMAT_INFO, SID_ATTR_NUMBERFORMAT_INFO);
             mpItemSet->Put(*pNumberInfoItem);
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index c98b143dfab9..1bbc30056fea 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -97,7 +97,7 @@ private:
 
 public:
     SdDialogsTest();
-    virtual ~SdDialogsTest();
+    virtual ~SdDialogsTest() override;
 
     virtual void setUp() override;
 
@@ -257,7 +257,7 @@ void SdDialogsTest::registerKnownDialogsByID(mapType& rKnownDialogs)
 
 VclAbstractDialog* SdDialogsTest::createDialogByID(sal_uInt32 nID)
 {
-    VclAbstractDialog* pRetval = 0;
+    VclAbstractDialog* pRetval = nullptr;
 
     if (getSdAbstractDialogFactory())
     {
diff --git a/sfx2/qa/unit/sfx2-dialogs-test.cxx b/sfx2/qa/unit/sfx2-dialogs-test.cxx
index 42fb59e3cc6a..400c0d01f5a0 100644
--- a/sfx2/qa/unit/sfx2-dialogs-test.cxx
+++ b/sfx2/qa/unit/sfx2-dialogs-test.cxx
@@ -30,9 +30,7 @@ private:
 
 public:
     Sfx2DialogsTest();
-    virtual ~Sfx2DialogsTest();
-
-    virtual void setUp() override;
+    virtual ~Sfx2DialogsTest() override;
 
     // try to open a dialog
     void openAnyDialog();
@@ -50,11 +48,6 @@ Sfx2DialogsTest::~Sfx2DialogsTest()
 {
 }
 
-void Sfx2DialogsTest::setUp()
-{
-    ScreenshotTest::setUp();
-}
-
 void Sfx2DialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
     // fill map of known dilogs
diff --git a/starmath/qa/unit/starmath-dialogs-test.cxx b/starmath/qa/unit/starmath-dialogs-test.cxx
index 2bd480d57503..91f4e3baab9d 100644
--- a/starmath/qa/unit/starmath-dialogs-test.cxx
+++ b/starmath/qa/unit/starmath-dialogs-test.cxx
@@ -30,9 +30,7 @@ private:
 
 public:
     StarmathDialogsTest();
-    virtual ~StarmathDialogsTest();
-
-    virtual void setUp() override;
+    virtual ~StarmathDialogsTest() override;
 
     // try to open a dialog
     void openAnyDialog();
@@ -50,11 +48,6 @@ StarmathDialogsTest::~StarmathDialogsTest()
 {
 }
 
-void StarmathDialogsTest::setUp()
-{
-    ScreenshotTest::setUp();
-}
-
 void StarmathDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
     // fill map of known dilogs
diff --git a/svtools/qa/unit/svtools-dialogs-test.cxx b/svtools/qa/unit/svtools-dialogs-test.cxx
index 9be029e6941f..17c3c53277d2 100644
--- a/svtools/qa/unit/svtools-dialogs-test.cxx
+++ b/svtools/qa/unit/svtools-dialogs-test.cxx
@@ -30,9 +30,7 @@ private:
 
 public:
     SvtoolsDialogsTest();
-    virtual ~SvtoolsDialogsTest();
-
-    virtual void setUp() override;
+    virtual ~SvtoolsDialogsTest() override;
 
     // try to open a dialog
     void openAnyDialog();
@@ -50,11 +48,6 @@ SvtoolsDialogsTest::~SvtoolsDialogsTest()
 {
 }
 
-void SvtoolsDialogsTest::setUp()
-{
-    ScreenshotTest::setUp();
-}
-
 void SvtoolsDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
     // fill map of known dilogs
diff --git a/svx/qa/unit/svx-dialogs-test.cxx b/svx/qa/unit/svx-dialogs-test.cxx
index fec1e180a280..0d705b710a5c 100644
--- a/svx/qa/unit/svx-dialogs-test.cxx
+++ b/svx/qa/unit/svx-dialogs-test.cxx
@@ -30,9 +30,7 @@ private:
 
 public:
     SvxDialogsTest();
-    virtual ~SvxDialogsTest();
-
-    virtual void setUp() override;
+    virtual ~SvxDialogsTest() override;
 
     // try to open a dialog
     void openAnyDialog();
@@ -50,11 +48,6 @@ SvxDialogsTest::~SvxDialogsTest()
 {
 }
 
-void SvxDialogsTest::setUp()
-{
-    ScreenshotTest::setUp();
-}
-
 void SvxDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
     // fill map of known dilogs
diff --git a/sw/qa/unit/sw-dialogs-test.cxx b/sw/qa/unit/sw-dialogs-test.cxx
index ee9a8559f5e7..5858529c6149 100644
--- a/sw/qa/unit/sw-dialogs-test.cxx
+++ b/sw/qa/unit/sw-dialogs-test.cxx
@@ -30,9 +30,7 @@ private:
 
 public:
     SwDialogsTest();
-    virtual ~SwDialogsTest();
-
-    virtual void setUp() override;
+    virtual ~SwDialogsTest() override;
 
     // try to open a dialog
     void openAnyDialog();
@@ -50,11 +48,6 @@ SwDialogsTest::~SwDialogsTest()
 {
 }
 
-void SwDialogsTest::setUp()
-{
-    ScreenshotTest::setUp();
-}
-
 void SwDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
     // fill map of known dilogs
diff --git a/uui/qa/unit/uui-dialogs-test.cxx b/uui/qa/unit/uui-dialogs-test.cxx
index c4fab13f21c5..b79562fb05ce 100644
--- a/uui/qa/unit/uui-dialogs-test.cxx
+++ b/uui/qa/unit/uui-dialogs-test.cxx
@@ -30,9 +30,7 @@ private:
 
 public:
     UuiDialogsTest();
-    virtual ~UuiDialogsTest();
-
-    virtual void setUp() override;
+    virtual ~UuiDialogsTest() override;
 
     // try to open a dialog
     void openAnyDialog();
@@ -50,11 +48,6 @@ UuiDialogsTest::~UuiDialogsTest()
 {
 }
 
-void UuiDialogsTest::setUp()
-{
-    ScreenshotTest::setUp();
-}
-
 void UuiDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
     // fill map of known dilogs
diff --git a/vcl/qa/unit/vcl-dialogs-test.cxx b/vcl/qa/unit/vcl-dialogs-test.cxx
index 5ad8e1099a0c..2e15a2664f5f 100644
--- a/vcl/qa/unit/vcl-dialogs-test.cxx
+++ b/vcl/qa/unit/vcl-dialogs-test.cxx
@@ -30,9 +30,7 @@ private:
 
 public:
     VclDialogsTest();
-    virtual ~VclDialogsTest();
-
-    virtual void setUp() override;
+    virtual ~VclDialogsTest() override;
 
     // try to open a dialog
     void openAnyDialog();
@@ -50,11 +48,6 @@ VclDialogsTest::~VclDialogsTest()
 {
 }
 
-void VclDialogsTest::setUp()
-{
-    ScreenshotTest::setUp();
-}
-
 void VclDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
     // fill map of known dilogs