summaryrefslogtreecommitdiff
path: root/sfx2/source/sidebar/Panel.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/sidebar/Panel.hxx')
-rw-r--r--sfx2/source/sidebar/Panel.hxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx
index ad2c78d6e95d..03cd81ca5ec8 100644
--- a/sfx2/source/sidebar/Panel.hxx
+++ b/sfx2/source/sidebar/Panel.hxx
@@ -47,8 +47,7 @@ public:
const ::boost::function<void()>& rDeckLayoutTrigger,
const ::boost::function<Context()>& rContextAccess);
virtual ~Panel();
-
- void Dispose();
+ virtual void dispose() SAL_OVERRIDE;
PanelTitleBar* GetTitleBar() const;
bool IsTitleBarOptional() const { return mbIsTitleBarOptional;}
@@ -67,7 +66,7 @@ public:
private:
const ::rtl::OUString msPanelId;
- ::boost::scoped_ptr<PanelTitleBar> mpTitleBar;
+ VclPtr<PanelTitleBar> mpTitleBar;
const bool mbIsTitleBarOptional;
css::uno::Reference<css::ui::XUIElement> mxElement;
css::uno::Reference<css::ui::XSidebarPanel> mxPanelComponent;
@@ -75,8 +74,7 @@ private:
const ::boost::function<void()> maDeckLayoutTrigger;
const ::boost::function<Context()> maContextAccess;
};
-typedef ::boost::shared_ptr<Panel> SharedPanel;
-typedef ::std::vector<SharedPanel> SharedPanelContainer;
+typedef ::std::vector< VclPtr< Panel > > SharedPanelContainer;
} } // end of namespace sfx2::sidebar