'make screenshot' use-after-free fixes

Change-Id: I4302d0d767a1bf50fd34a78e9aa0ad6d6b0c7a22

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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);

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;
 }

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");
 

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())
     {

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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)

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;
 }

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;
 }

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;
 }