From d7a84ce8406096b455d81f50cd50ca2e877adc06 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 10 Mar 2015 09:07:06 +0200 Subject: 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 --- basic/source/runtime/inputbox.cxx | 2 +- basic/source/runtime/iosys.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'basic') diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx index 739938925ee4..94d0693f3c94 100644 --- a/basic/source/runtime/inputbox.cxx +++ b/basic/source/runtime/inputbox.cxx @@ -46,7 +46,7 @@ class SvRTLInputBox : public ModalDialog public: SvRTLInputBox( vcl::Window* pParent, const OUString& rPrompt, const OUString& rTitle, const OUString& rDefault, long nXTwips = -1, long nYTwips = -1 ); - virtual ~SvRTLInputBox() { dispose(); } + virtual ~SvRTLInputBox() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE; OUString GetText() const SAL_OVERRIDE { return aText; } }; diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 831dee358422..297c970d32a6 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -74,7 +74,7 @@ class SbiInputDialog : public ModalDialog { DECL_LINK( Cancel, vcl::Window * ); public: SbiInputDialog( vcl::Window*, const OUString& ); - virtual ~SbiInputDialog() { dispose(); } + virtual ~SbiInputDialog() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE; const OUString& GetInput() { return aText; } }; -- cgit