strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drop unused ModalDialog class

Browse source 
Change-Id: I3186b63d4c6c437ff0c0653a6b6c7fd61ae69304
Reviewed-on: https://gerrit.libreoffice.org/81069
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2019-10-18 16:47:23 +01:00
parent 3fb1417804
commit 66df14370e
4 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/vcl/dialog.hxx
View file

@ -166,21 +166,6 @@ public:
vcl::Window* get_widget_for_response(int nResponse);
};
class VCL_DLLPUBLIC ModalDialog : public Dialog
{
public:
explicit ModalDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription );
protected:
using Window::Show;
using Window::Hide;
private:
SAL_DLLPRIVATE ModalDialog (const ModalDialog &) = delete;
SAL_DLLPRIVATE ModalDialog & operator= (const ModalDialog &) = delete;
};
#endif // INCLUDED_VCL_DIALOG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
vcl/README.lifecycle
View file

@ -308,11 +308,11 @@ ways and often both.
Window that has already been destroyed. This can easily
happen via this sort of pattern:
ModalDialog *pDlg = VclPtr<ModalDialog>(nullptr /* parent */);
Dialog *pDlg = VclPtr<Dialog>(nullptr /* parent */);
// by here the pDlg quite probably points to free'd memory...
It is necessary in these cases to ensure that the *pDlg is
a VclPtr<ModalDialog> instead.
a VclPtr<Dialog> instead.
** It crashes with some invalid memory #2...

2
vcl/qa/cppunit/lifecycle.cxx
View file

@ -297,7 +297,7 @@ void LifecycleTest::testLeakage()
aObjects.push_back(LeakTestObject::Create<VclVButtonBox>(xVBox));
}
aObjects.push_back(LeakTestObject::Create<ModalDialog>(xParent, "PrintProgressDialog", "vcl/ui/printprogressdialog.ui"));
aObjects.push_back(LeakTestObject::Create<Dialog>(xParent, "PrintProgressDialog", "vcl/ui/printprogressdialog.ui"));
xParent.clear();
for (auto i = aObjects.rbegin(); i != aObjects.rend(); ++i)

5
vcl/source/window/dialog.cxx
View file

@ -1517,11 +1517,6 @@ VclBuilderContainer::~VclBuilderContainer()
{
}
ModalDialog::ModalDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ) :
Dialog(pParent, rID, rUIXMLDescription, WindowType::MODALDIALOG, InitFlag::Default)
{
}
void Dialog::Activate()
{
if (GetType() == WindowType::MODELESSDIALOG)