diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-10 09:07:06 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 10:55:36 +0100 |
| commit | d7a84ce8406096b455d81f50cd50ca2e877adc06 (patch) | |
| tree | b1dd2b5a4860cf2c9664e2ff3087b8dbb9db7576 /vcl/generic | |
| parent | c0a802b59e1edddeb0b621e15137f5058299efd7 (diff) | |
vclwidget: only call dispose() once
by using a new utility method in vcl::Window
This means that we don't have to make all our dispose
methods safe to call more than once.
Change-Id: I2110c7de4a86c70fdc97dd8fd318c86b56865374
Diffstat (limited to 'vcl/generic')
| -rw-r--r-- | vcl/generic/print/genprnpsp.cxx | 2 | ||||
| -rw-r--r-- | vcl/generic/print/prtsetup.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index d8c184973bb1..62a4bddeea3f 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -101,7 +101,7 @@ namespace public: // parent window, Query text, initial value QueryString(vcl::Window*, OUString &, OUString &); - virtual ~QueryString() { dispose(); } + virtual ~QueryString() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { m_pOKButton.clear(); diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx index a67c9de91ed2..1603b8e4c1c5 100644 --- a/vcl/generic/print/prtsetup.cxx +++ b/vcl/generic/print/prtsetup.cxx @@ -93,7 +93,7 @@ RTSDialog::RTSDialog(const PrinterInfo& rJobData, vcl::Window* pParent) RTSDialog::~RTSDialog() { - dispose(); + disposeOnce(); } void RTSDialog::dispose() @@ -196,7 +196,7 @@ RTSPaperPage::RTSPaperPage(RTSDialog* pParent) RTSPaperPage::~RTSPaperPage() { - dispose(); + disposeOnce(); } void RTSPaperPage::dispose() @@ -378,7 +378,7 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) RTSDevicePage::~RTSDevicePage() { - dispose(); + disposeOnce(); } void RTSDevicePage::dispose() |