diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-16 12:17:44 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 11:20:46 +0100 |
| commit | c72fac269626cd4c2c3f62a6eed69e47b59256a4 (patch) | |
| tree | d36dd1a09731cb07254ae4a09036b2d64a59de44 /sd/source/ui/sidebar/PanelBase.cxx | |
| parent | de6b9148eb64dfa4b31c87c1ac46fda0821645e3 (diff) | |
vclwidget: convert lots more sites to use VclPtr
seems there was a lot of shared_ptr usage floating around...
Change-Id: Icd05243170eb8493709275fc36bf986fc194b781
Diffstat (limited to 'sd/source/ui/sidebar/PanelBase.cxx')
| -rw-r--r-- | sd/source/ui/sidebar/PanelBase.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx index 7ee2a89f63d0..611c1977b451 100644 --- a/sd/source/ui/sidebar/PanelBase.cxx +++ b/sd/source/ui/sidebar/PanelBase.cxx @@ -43,16 +43,14 @@ PanelBase::~PanelBase (void) void PanelBase::dispose() { - OSL_TRACE("deleting wrapped control at %p", mpWrappedControl.get()); - mpWrappedControl.reset(); - OSL_TRACE("deleting PanelBase at %p from parent %p", this, GetParent()); + mpWrappedControl.disposeAndClear(); Control::dispose(); } void PanelBase::Dispose (void) { OSL_TRACE("PanelBase::DisposeL: deleting wrapped control at %p", mpWrappedControl.get()); - mpWrappedControl.reset(); + mpWrappedControl.disposeAndClear(); } css::ui::LayoutSize PanelBase::GetHeightForWidth (const sal_Int32 /*nWidth*/) @@ -75,7 +73,7 @@ void PanelBase::Resize (void) void PanelBase::SetSidebar (const css::uno::Reference<css::ui::XSidebar>& rxSidebar) { mxSidebar = rxSidebar; - if (mxSidebar.is() && mpWrappedControl!=0) + if (mxSidebar.is() && mpWrappedControl!=nullptr) mxSidebar->requestLayout(); } |