19 files changed, 40 insertions, 41 deletions
diff --git a/basctl/qa/unit/basctl-dialogs-test.cxx b/basctl/qa/unit/basctl-dialogs-test.cxx
index 3dc70db31b3e..5efec865534b 100644
--- a/basctl/qa/unit/basctl-dialogs-test.cxx
+++ b/basctl/qa/unit/basctl-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:
     BasctlDialogsTest();
@@ -53,7 +53,7 @@ void BasctlDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
     // fill map of known dilogs
 }
 
-VclAbstractDialog* BasctlDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+VclPtr<VclAbstractDialog> BasctlDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
 {
     return nullptr;
 }
diff --git a/chart2/qa/unit/chart2-dialogs-test.cxx b/chart2/qa/unit/chart2-dialogs-test.cxx
index fee5611e9487..4f9f6b28aee2 100644
--- a/chart2/qa/unit/chart2-dialogs-test.cxx
+++ b/chart2/qa/unit/chart2-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:
     Chart2DialogsTest();
@@ -53,7 +53,7 @@ void Chart2DialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
     // fill map of known dilogs
 }
 
-VclAbstractDialog* Chart2DialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+VclPtr<VclAbstractDialog> Chart2DialogsTest::createDialogByID(sal_uInt32 /*nID*/)
 {
     return nullptr;
 }
diff --git a/cui/qa/unit/cui-dialogs-test.cxx b/cui/qa/unit/cui-dialogs-test.cxx
index e0a2a583b642..239f85639f2d 100644
--- a/cui/qa/unit/cui-dialogs-test.cxx
+++ b/cui/qa/unit/cui-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:
     CuiDialogsTest();
@@ -53,7 +53,7 @@ void CuiDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
     // fill map of known dilogs
 }
 
-VclAbstractDialog* CuiDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+VclPtr<VclAbstractDialog> CuiDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
 {
     return nullptr;
 }
diff --git a/dbaccess/qa/unit/dbaccess-dialogs-test.cxx b/dbaccess/qa/unit/dbaccess-dialogs-test.cxx
index f369cc326963..9ac1dbd8ea6c 100644
--- a/dbaccess/qa/unit/dbaccess-dialogs-test.cxx
+++ b/dbaccess/qa/unit/dbaccess-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:
     DbaccessDialogsTest();
@@ -53,7 +53,7 @@ void DbaccessDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
     // fill map of known dilogs
 }
 
-VclAbstractDialog* DbaccessDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+VclPtr<VclAbstractDialog> DbaccessDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
 {
     return nullptr;
 }
diff --git a/desktop/qa/unit/desktop-dialogs-test.cxx b/desktop/qa/unit/desktop-dialogs-test.cxx
index d65ef7513685..50b7eaf3eaf6 100644
--- a/desktop/qa/unit/desktop-dialogs-test.cxx
+++ b/desktop/qa/unit/desktop-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:
     DesktopDialogsTest();
@@ -53,7 +53,7 @@ void DesktopDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
     // fill map of known dilogs
 }
 
-VclAbstractDialog* DesktopDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+VclPtr<VclAbstractDialog> DesktopDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
 {
     return nullptr;
 }
diff --git a/filter/qa/unit/filter-dialogs-test.cxx b/filter/qa/unit/filter-dialogs-test.cxx
index d04982510ab9..3df6ac234335 100644
--- a/filter/qa/unit/filter-dialogs-test.cxx
+++ b/filter/qa/unit/filter-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:
     FilterDialogsTest();
@@ -53,7 +53,7 @@ void FilterDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
     // fill map of known dilogs
 }
 
-VclAbstractDialog* FilterDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+VclPtr<VclAbstractDialog> FilterDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
 {
     return nullptr;
 }
diff --git a/include/test/screenshot_test.hxx b/include/test/screenshot_test.hxx
index ab6adedc1f7c..1868e18eab28 100644
--- a/include/test/screenshot_test.hxx
+++ b/include/test/screenshot_test.hxx
@@ -42,7 +42,7 @@ private:
 
     /// dialog creation for known dialogs by ID. Has to be implemented for
     /// each registered known dialog
-    virtual VclAbstractDialog* createDialogByID(sal_uInt32 nID) = 0;
+    virtual VclPtr<VclAbstractDialog> createDialogByID(sal_uInt32 nID) = 0;
 
 public:
     ScreenshotTest();
@@ -53,7 +53,7 @@ public:
     /// Dialog creation for known dialogs by Name (path and UIXMLDescription, *.ui file).
     /// This uses maKnownDialogs to check if known, and if so, calls createDialogByID
     /// with the ID from the map
-    VclAbstractDialog* createDialogByName(const OString& rName);
+    VclPtr<VclAbstractDialog> createDialogByName(const OString& rName);
 
     /// version for AbstractDialogs, the ones created in AbstractDialogFactories
     void dumpDialogToPath(VclAbstractDialog& rDialog);
diff --git a/reportdesign/qa/unit/reportdesign-dialogs-test.cxx b/reportdesign/qa/unit/reportdesign-dialogs-test.cxx
index d2a867a217e7..7a12f73aafc8 100644
--- a/reportdesign/qa/unit/reportdesign-dialogs-test.cxx
+++ b/reportdesign/qa/unit/reportdesign-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:
     ReportdesignDialogsTest();
@@ -53,7 +53,7 @@ void ReportdesignDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*
     // fill map of known dilogs
 }
 
-VclAbstractDialog* ReportdesignDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+VclPtr<VclAbstractDialog> ReportdesignDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
 {
     return nullptr;
 }
diff --git a/sc/qa/unit/screenshots/screenshots.cxx b/sc/qa/unit/screenshots/screenshots.cxx
index 0bb00c17b219..834742943543 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -64,7 +64,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:
     ScScreenshotTest();
@@ -142,9 +142,9 @@ void ScScreenshotTest::registerKnownDialogsByID(mapType& rKnownDialogs)
     rKnownDialogs["modules/scalc/ui/formatcellsdialog.ui"] = 14;
 }
 
-VclAbstractDialog* ScScreenshotTest::createDialogByID(sal_uInt32 nID)
+VclPtr<VclAbstractDialog> ScScreenshotTest::createDialogByID(sal_uInt32 nID)
 {
-    VclAbstractDialog *pReturnDialog = nullptr;
+    VclPtr<VclAbstractDialog> pReturnDialog;
     ////FIXME: translatable string here
     const OUString aDefaultSheetName("Sheet1");
 
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 1bbc30056fea..148467272f13 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -93,7 +93,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:
     SdDialogsTest();
@@ -255,9 +255,9 @@ void SdDialogsTest::registerKnownDialogsByID(mapType& rKnownDialogs)
     rKnownDialogs["modules/simpress/ui/headerfooterdialog.ui"] = 22;
 }
 
-VclAbstractDialog* SdDialogsTest::createDialogByID(sal_uInt32 nID)
+VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID)
 {
-    VclAbstractDialog* pRetval = nullptr;
+    VclPtr<VclAbstractDialog> pRetval;
 
     if (getSdAbstractDialogFactory())
     {
diff --git a/sfx2/qa/unit/sfx2-dialogs-test.cxx b/sfx2/qa/unit/sfx2-dialogs-test.cxx
index 400c0d01f5a0..afbf712addf0 100644
--- a/sfx2/qa/unit/sfx2-dialogs-test.cxx
+++ b/sfx2/qa/unit/sfx2-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:
     Sfx2DialogsTest();
@@ -53,7 +53,7 @@ void Sfx2DialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
     // fill map of known dilogs
 }
 
-VclAbstractDialog* Sfx2DialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+VclPtr<VclAbstractDialog> Sfx2DialogsTest::createDialogByID(sal_uInt32 /*nID*/)
 {
     return nullptr;
 }
diff --git a/starmath/qa/unit/starmath-dialogs-test.cxx b/starmath/qa/unit/starmath-dialogs-test.cxx
index 91f4e3baab9d..eb74b8f6f0ab 100644
--- a/starmath/qa/unit/starmath-dialogs-test.cxx
+++ b/starmath/qa/unit/starmath-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:
     StarmathDialogsTest();
@@ -53,7 +53,7 @@ void StarmathDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
     // fill map of known dilogs
 }
 
-VclAbstractDialog* StarmathDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+VclPtr<VclAbstractDialog> StarmathDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
 {
     return nullptr;
 }
diff --git a/svtools/qa/unit/svtools-dialogs-test.cxx b/svtools/qa/unit/svtools-dialogs-test.cxx
index 17c3c53277d2..3de36deffa85 100644
--- a/svtools/qa/unit/svtools-dialogs-test.cxx
+++ b/svtools/qa/unit/svtools-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:
     SvtoolsDialogsTest();
@@ -53,7 +53,7 @@ void SvtoolsDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
     // fill map of known dilogs
 }
 
-VclAbstractDialog* SvtoolsDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+VclPtr<VclAbstractDialog> SvtoolsDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
 {
     return nullptr;
 }
diff --git a/svx/qa/unit/svx-dialogs-test.cxx b/svx/qa/unit/svx-dialogs-test.cxx
index 0d705b710a5c..6a8262052eca 100644
--- a/svx/qa/unit/svx-dialogs-test.cxx
+++ b/svx/qa/unit/svx-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:
     SvxDialogsTest();
@@ -53,7 +53,7 @@ void SvxDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
     // fill map of known dilogs
 }
 
-VclAbstractDialog* SvxDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+VclPtr<VclAbstractDialog> SvxDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
 {
     return nullptr;
 }
diff --git a/sw/qa/unit/sw-dialogs-test.cxx b/sw/qa/unit/sw-dialogs-test.cxx
index 5858529c6149..762298c2d2bc 100644
--- a/sw/qa/unit/sw-dialogs-test.cxx
+++ b/sw/qa/unit/sw-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:
     SwDialogsTest();
@@ -53,7 +53,7 @@ void SwDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
     // fill map of known dilogs
 }
 
-VclAbstractDialog* SwDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+VclPtr<VclAbstractDialog> SwDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
 {
     return nullptr;
 }
diff --git a/test/source/screenshot_test.cxx b/test/source/screenshot_test.cxx
index 650b9cd70912..df107b8f080d 100644
--- a/test/source/screenshot_test.cxx
+++ b/test/source/screenshot_test.cxx
@@ -107,9 +107,8 @@ void ScreenshotTest::saveScreenshot(Dialog& rDialog)
     }
 }
 
-VclAbstractDialog* ScreenshotTest::createDialogByName(const OString& rName)
+VclPtr<VclAbstractDialog> ScreenshotTest::createDialogByName(const OString& rName)
 {
-    VclAbstractDialog* pRetval = nullptr;
     const mapType::const_iterator aHit = maKnownDialogs.find(rName);
 
     if (aHit != maKnownDialogs.end())
@@ -117,7 +116,7 @@ VclAbstractDialog* ScreenshotTest::createDialogByName(const OString& rName)
         return createDialogByID((*aHit).second);
     }
 
-    return pRetval;
+    return VclPtr<VclAbstractDialog>();
 }
 
 void ScreenshotTest::dumpDialogToPath(VclAbstractDialog& rDialog)
diff --git a/uui/qa/unit/uui-dialogs-test.cxx b/uui/qa/unit/uui-dialogs-test.cxx
index b79562fb05ce..33d68fb8e9c3 100644
--- a/uui/qa/unit/uui-dialogs-test.cxx
+++ b/uui/qa/unit/uui-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:
     UuiDialogsTest();
@@ -53,7 +53,7 @@ void UuiDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
     // fill map of known dilogs
 }
 
-VclAbstractDialog* UuiDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+VclPtr<VclAbstractDialog> UuiDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
 {
     return nullptr;
 }
diff --git a/vcl/qa/unit/vcl-dialogs-test.cxx b/vcl/qa/unit/vcl-dialogs-test.cxx
index 2e15a2664f5f..9807a57682e4 100644
--- a/vcl/qa/unit/vcl-dialogs-test.cxx
+++ b/vcl/qa/unit/vcl-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:
     VclDialogsTest();
@@ -53,7 +53,7 @@ void VclDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
     // fill map of known dilogs
 }
 
-VclAbstractDialog* VclDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+VclPtr<VclAbstractDialog> VclDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
 {
     return nullptr;
 }
diff --git a/xmlsecurity/qa/unit/xmlsecurity-dialogs-test.cxx b/xmlsecurity/qa/unit/xmlsecurity-dialogs-test.cxx
index d11672bf4483..6e9bf55edbeb 100644
--- a/xmlsecurity/qa/unit/xmlsecurity-dialogs-test.cxx
+++ b/xmlsecurity/qa/unit/xmlsecurity-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:
     XmlsecurityDialogsTest();
@@ -53,7 +53,7 @@ void XmlsecurityDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/
     // fill map of known dilogs
 }
 
-VclAbstractDialog* XmlsecurityDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+VclPtr<VclAbstractDialog> XmlsecurityDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
 {
     return nullptr;
 }