summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-10 09:07:06 +0200
committerMichael Meeks <michael.meeks@collabora.com>2015-04-10 10:55:36 +0100
commitd7a84ce8406096b455d81f50cd50ca2e877adc06 (patch)
treeb1dd2b5a4860cf2c9664e2ff3087b8dbb9db7576 /forms
parentc0a802b59e1edddeb0b621e15137f5058299efd7 (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 'forms')
-rw-r--r--forms/source/richtext/richtextvclcontrol.cxx2
-rw-r--r--forms/source/solar/control/navtoolbar.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 69f3f032e566..d7286204921c 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -59,7 +59,7 @@ namespace frm
RichTextControl::~RichTextControl( )
{
- dispose();
+ disposeOnce();
}
void RichTextControl::dispose()
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index 41405bbbe5fb..af7bf5dca883 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -147,7 +147,7 @@ namespace frm
NavigationToolBar::~NavigationToolBar( )
{
- dispose();
+ disposeOnce();
}
void NavigationToolBar::dispose()