[Libreoffice-commits] core.git: 2 commits - basctl/qa chart2/qa cui/qa dbaccess/qa desktop/qa filter/qa include/test reportdesign/qa sc/qa sd/qa sfx2/qa starmath/qa svtools/qa svx/qa sw/qa test/source uui/qa vcl/qa xmlsecurity/qa
Stephan Bergmann
sbergman at redhat.com
Thu Nov 10 21:01:11 UTC 2016
basctl/qa/unit/basctl-dialogs-test.cxx | 13 +++----------
chart2/qa/unit/chart2-dialogs-test.cxx | 13 +++----------
cui/qa/unit/cui-dialogs-test.cxx | 13 +++----------
dbaccess/qa/unit/dbaccess-dialogs-test.cxx | 13 +++----------
desktop/qa/unit/desktop-dialogs-test.cxx | 13 +++----------
filter/qa/unit/filter-dialogs-test.cxx | 13 +++----------
include/test/screenshot_test.hxx | 4 ++--
reportdesign/qa/unit/reportdesign-dialogs-test.cxx | 13 +++----------
sc/qa/unit/screenshots/screenshots.cxx | 10 +++++-----
sd/qa/unit/dialogs-test.cxx | 8 ++++----
sfx2/qa/unit/sfx2-dialogs-test.cxx | 13 +++----------
starmath/qa/unit/starmath-dialogs-test.cxx | 13 +++----------
svtools/qa/unit/svtools-dialogs-test.cxx | 13 +++----------
svx/qa/unit/svx-dialogs-test.cxx | 13 +++----------
sw/qa/unit/sw-dialogs-test.cxx | 13 +++----------
test/source/screenshot_test.cxx | 5 ++---
uui/qa/unit/uui-dialogs-test.cxx | 13 +++----------
vcl/qa/unit/vcl-dialogs-test.cxx | 13 +++----------
xmlsecurity/qa/unit/xmlsecurity-dialogs-test.cxx | 4 ++--
19 files changed, 57 insertions(+), 156 deletions(-)
New commits:
commit 8cfa3f4b522d54845d2218610919e721bfb6f632
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Nov 10 22:00:18 2016 +0100
'make screenshot' use-after-free fixes
Change-Id: I4302d0d767a1bf50fd34a78e9aa0ad6d6b0c7a22
diff --git a/basctl/qa/unit/basctl-dialogs-test.cxx b/basctl/qa/unit/basctl-dialogs-test.cxx
index 3dc70db..5efec86 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 fee5611..4f9f6b2 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 e0a2a58..239f856 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 f369cc3..9ac1dbd 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 d65ef75..50b7eaf 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 d049825..3df6ac2 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 ab6aded..1868e18 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 d2a867a..7a12f73 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 0bb00c1..8347429 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 1bbc300..1484672 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 400c0d0..afbf712 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 91f4e3b..eb74b8f 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 17c3c53..3de36de 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 0d705b7..6a82620 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 5858529..762298c 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 650b9cd..df107b8 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 b79562f..33d68fb 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 2e15a26..9807a57 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 d11672b..6e9bf55 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;
}
commit d543b4df8084da777ea9624619d684a14cb91cb9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Nov 10 20:25:19 2016 +0100
'make screenshot' loplugin fixes
Change-Id: Ibebcd1c1ebfea0ecdf9d90b6f8bcc8ceb87df456
diff --git a/basctl/qa/unit/basctl-dialogs-test.cxx b/basctl/qa/unit/basctl-dialogs-test.cxx
index e0af831..3dc70db 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 112adbf..fee5611 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 58cc3b9..e0a2a58 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 a95a8ce..f369cc3 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 ff654ff..d65ef75 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 8cc1497..d049825 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 3f37364..d2a867a 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 97fa0af..0bb00c1 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 c98b143..1bbc300 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 42fb59e..400c0d0 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 2bd480d..91f4e3b 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 9be029e..17c3c53 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 fec1e18..0d705b7 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 ee9a855..5858529 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 c4fab13..b79562f 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 5ad8e10..2e15a26 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
More information about the Libreoffice-commits
mailing list