summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-11-10 23:22:15 +0200
committerTor Lillqvist <tml@collabora.com>2016-11-10 23:27:24 +0200
commitdf2e37eb03452ca6752515483c5d6e20e5d32c7f (patch)
treea7f6e87a52f1a3044342f647f329c4e58cc5d72f
parenta16296429f13b4c23f7327612a3c6fd9947b0f48 (diff)
use-after-free fix here, too
Change-Id: I228b6367abadfc25c85fdb6821faebc7e4e8dda8
-rw-r--r--formula/qa/unit/formula-dialogs-test.cxx4
-rw-r--r--fpicker/qa/unit/fpicker-dialogs-test.cxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/formula/qa/unit/formula-dialogs-test.cxx b/formula/qa/unit/formula-dialogs-test.cxx
index 97f3c90a49eb..0e57336f672c 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 622138d496c3..5bfcb2b432a5 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;
}