[Libreoffice-commits] core.git: 2 commits - formula/qa fpicker/qa

[Tor Lillqvist]

 formula/qa/unit/formula-dialogs-test.cxx |   13 +++----------
 fpicker/qa/unit/fpicker-dialogs-test.cxx |   13 +++----------
 2 files changed, 6 insertions(+), 20 deletions(-)

New commits:
commit be55107da2a05325261d810c69a55259f35aba97
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Nov 10 23:24:11 2016 +0200

    loplugin fixes here, too
    
    Change-Id: I32cf90d524f8dd9fb454d4145d314b748ac0b281

diff --git a/formula/qa/unit/formula-dialogs-test.cxx b/formula/qa/unit/formula-dialogs-test.cxx
index 0e57336..ee71816 100644
--- a/formula/qa/unit/formula-dialogs-test.cxx
+++ b/formula/qa/unit/formula-dialogs-test.cxx
@@ -30,9 +30,7 @@ private:
 
 public:
     FormulaDialogsTest();
-    virtual ~FormulaDialogsTest();
-
-    virtual void setUp() override;
+    virtual ~FormulaDialogsTest() override;
 
     // try to open a dialog
     void openAnyDialog();
@@ -50,11 +48,6 @@ FormulaDialogsTest::~FormulaDialogsTest()
 {
 }
 
-void FormulaDialogsTest::setUp()
-{
-    ScreenshotTest::setUp();
-}
-
 void FormulaDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
     // fill map of known dilogs
diff --git a/fpicker/qa/unit/fpicker-dialogs-test.cxx b/fpicker/qa/unit/fpicker-dialogs-test.cxx
index 5bfcb2b..3515817 100644
--- a/fpicker/qa/unit/fpicker-dialogs-test.cxx
+++ b/fpicker/qa/unit/fpicker-dialogs-test.cxx
@@ -30,9 +30,7 @@ private:
 
 public:
     FpickerDialogsTest();
-    virtual ~FpickerDialogsTest();
-
-    virtual void setUp() override;
+    virtual ~FpickerDialogsTest() override;
 
     // try to open a dialog
     void openAnyDialog();
@@ -50,11 +48,6 @@ FpickerDialogsTest::~FpickerDialogsTest()
 {
 }
 
-void FpickerDialogsTest::setUp()
-{
-    ScreenshotTest::setUp();
-}
-
 void FpickerDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
     // fill map of known dilogs
commit df2e37eb03452ca6752515483c5d6e20e5d32c7f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Nov 10 23:22:15 2016 +0200

    use-after-free fix here, too
    
    Change-Id: I228b6367abadfc25c85fdb6821faebc7e4e8dda8

diff --git a/formula/qa/unit/formula-dialogs-test.cxx b/formula/qa/unit/formula-dialogs-test.cxx
index 97f3c90..0e57336 100644
--- a/formula/qa/unit/formula-dialogs-test.cxx
+++ b/formula/qa/unit/formula-dialogs-test.cxx
@@ -26,7 +26,7 @@ private:
 
     /// dialog creation for known dialogs by ID. Has to be implemented for
     /// each registered known dialog
-    virtual VclAbstractDialog* createDialogByID(sal_uInt32 nID) override;
+    virtual VclPtr<VclAbstractDialog> createDialogByID(sal_uInt32 nID) override;
 
 public:
     FormulaDialogsTest();
@@ -60,7 +60,7 @@ void FormulaDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
     // fill map of known dilogs
 }
 
-VclAbstractDialog* FormulaDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+VclPtr<VclAbstractDialog> FormulaDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
 {
     return nullptr;
 }
diff --git a/fpicker/qa/unit/fpicker-dialogs-test.cxx b/fpicker/qa/unit/fpicker-dialogs-test.cxx
index 622138d..5bfcb2b 100644
--- a/fpicker/qa/unit/fpicker-dialogs-test.cxx
+++ b/fpicker/qa/unit/fpicker-dialogs-test.cxx
@@ -26,7 +26,7 @@ private:
 
     /// dialog creation for known dialogs by ID. Has to be implemented for
     /// each registered known dialog
-    virtual VclAbstractDialog* createDialogByID(sal_uInt32 nID) override;
+    virtual VclPtr<VclAbstractDialog> createDialogByID(sal_uInt32 nID) override;
 
 public:
     FpickerDialogsTest();
@@ -60,7 +60,7 @@ void FpickerDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
     // fill map of known dilogs
 }
 
-VclAbstractDialog* FpickerDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+VclPtr<VclAbstractDialog> FpickerDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
 {
     return nullptr;
 }