summaryrefslogtreecommitdiff
path: root/framework/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-01-13 14:51:55 +0200
committerMichael Meeks <michael.meeks@collabora.com>2015-04-09 21:02:23 +0100
commit232eec872bdaf1dd6d87df97baa3b9ad432a7acd (patch)
treef1b05df7f1ab7c74690b1636f6ed17c10f0b969f /framework/inc
parent28c2cf4f569290095080ded0438cbb99746755d9 (diff)
vcl: VclPtr conversion in framework
Change-Id: I82df2d0ed6f40de40099537f982541480af16630
Diffstat (limited to 'framework/inc')
-rw-r--r--framework/inc/classes/fwktabwindow.hxx6
-rw-r--r--framework/inc/uielement/statusbar.hxx1
2 files changed, 4 insertions, 3 deletions
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index ebbac7fc80bb..f5e7375c1269 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -68,6 +68,7 @@ public:
const css::uno::Reference< css::awt::XContainerWindowProvider >& rProvider );
virtual ~FwkTabPage();
+ virtual void dispose() SAL_OVERRIDE;
virtual void ActivatePage() SAL_OVERRIDE;
virtual void DeactivatePage() SAL_OVERRIDE;
@@ -95,8 +96,8 @@ typedef std::vector< TabEntry* > TabEntryList;
class FwkTabWindow : public vcl::Window
{
private:
- FwkTabControl m_aTabCtrl;
- TabEntryList m_TabList;
+ VclPtr<FwkTabControl> m_aTabCtrl;
+ TabEntryList m_TabList;
css::uno::Reference< css::awt::XContainerWindowProvider > m_xWinProvider;
@@ -110,6 +111,7 @@ private:
public:
FwkTabWindow( vcl::Window* pParent );
virtual ~FwkTabWindow();
+ virtual void dispose() SAL_OVERRIDE;
void AddEventListener( const Link& rEventListener );
void RemoveEventListener( const Link& rEventListener );
diff --git a/framework/inc/uielement/statusbar.hxx b/framework/inc/uielement/statusbar.hxx
index be957eaedfb7..c192d50b48b2 100644
--- a/framework/inc/uielement/statusbar.hxx
+++ b/framework/inc/uielement/statusbar.hxx
@@ -33,7 +33,6 @@ class FrameworkStatusBar : public StatusBar
FrameworkStatusBar( vcl::Window* pParent,
WinBits nWinBits );
- virtual ~FrameworkStatusBar();
void SetStatusBarManager( StatusBarManager* pStatusBarManager );