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 /sc/source/ui/sidebar | |
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 'sc/source/ui/sidebar')
6 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 2cacee3f97f5..7bd1fbfd9f84 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -68,7 +68,7 @@ AlignmentPropertyPanel::AlignmentPropertyPanel( AlignmentPropertyPanel::~AlignmentPropertyPanel() { - dispose(); + disposeOnce(); } void AlignmentPropertyPanel::dispose() diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index b79e4fb5c5d8..2ca87de0e1e3 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -142,7 +142,7 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel( CellAppearancePropertyPanel::~CellAppearancePropertyPanel() { - dispose(); + disposeOnce(); } void CellAppearancePropertyPanel::dispose() diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx index 72bd59eae8bc..9b981096dfee 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx @@ -58,7 +58,7 @@ CellBorderStyleControl::CellBorderStyleControl(vcl::Window* pParent, CellAppeara CellBorderStyleControl::~CellBorderStyleControl(void) { - dispose(); + disposeOnce(); } void CellBorderStyleControl::dispose() diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx index 187cbed1111d..818616275ae6 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.cxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx @@ -46,7 +46,7 @@ CellLineStyleControl::CellLineStyleControl(vcl::Window* pParent, CellAppearanceP CellLineStyleControl::~CellLineStyleControl() { - dispose(); + disposeOnce(); } void CellLineStyleControl::dispose() diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx index d928903d2041..5ba64bdbced3 100644 --- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx +++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx @@ -34,7 +34,7 @@ CellLineStyleValueSet::CellLineStyleValueSet( vcl::Window* pParent, const ResId& CellLineStyleValueSet::~CellLineStyleValueSet() { - dispose(); + disposeOnce(); } void CellLineStyleValueSet::dispose() diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index ba600e2f2f29..fb70ac68a834 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -70,7 +70,7 @@ NumberFormatPropertyPanel::NumberFormatPropertyPanel( NumberFormatPropertyPanel::~NumberFormatPropertyPanel() { - dispose(); + disposeOnce(); } void NumberFormatPropertyPanel::dispose() |