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 /extensions/source/scanner | |
| 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 'extensions/source/scanner')
| -rw-r--r-- | extensions/source/scanner/grid.cxx | 4 | ||||
| -rw-r--r-- | extensions/source/scanner/sanedlg.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index e99ffb542459..c0cce3d61936 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -215,7 +215,7 @@ GridDialog::GridDialog(double* pXValues, double* pYValues, int nValues, vcl::Win GridDialog::~GridDialog() { - dispose(); + disposeOnce(); } void GridDialog::dispose() @@ -229,7 +229,7 @@ void GridDialog::dispose() GridWindow::~GridWindow() { - dispose(); + disposeOnce(); } void GridWindow::dispose() diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 6f977ef7cce0..08ba735e7198 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -61,7 +61,7 @@ public: , mbIsDragging(false) { } - virtual ~ScanPreview() { dispose(); } + virtual ~ScanPreview() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { mpParentDialog.clear(); @@ -245,7 +245,7 @@ SaneDlg::SaneDlg( vcl::Window* pParent, Sane& rSane, bool bScanEnabled ) : SaneDlg::~SaneDlg() { - dispose(); + disposeOnce(); } void SaneDlg::dispose() |