summaryrefslogtreecommitdiff
path: root/include/svtools/ctrlbox.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'include/svtools/ctrlbox.hxx')
-rw-r--r--include/svtools/ctrlbox.hxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index fe29ee120083..a38f00940fb2 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -155,6 +155,7 @@ public:
WinBits nWinStyle = WB_BORDER );
ColorListBox( vcl::Window* pParent, const ResId& rResId );
virtual ~ColorListBox();
+ virtual void dispose() SAL_OVERRIDE;
virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE;
@@ -287,7 +288,7 @@ class SVT_DLLPUBLIC LineListBox : public ListBox
long m_nWidth;
OUString m_sNone;
- VirtualDevice aVirDev;
+ ScopedVclPtr<VirtualDevice> aVirDev;
Size aTxtSize;
Color aColor;
Color maPaintCol;
@@ -311,6 +312,7 @@ public:
LineListBox( vcl::Window* pParent, WinBits nWinStyle = WB_BORDER );
virtual ~LineListBox();
+ virtual void dispose() SAL_OVERRIDE;
/** Set the width in Twips */
void SetWidth( long nWidth );
@@ -408,6 +410,7 @@ public:
FontNameBox( vcl::Window* pParent,
WinBits nWinStyle = WB_SORT );
virtual ~FontNameBox();
+ virtual void dispose() SAL_OVERRIDE;
virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE;
@@ -433,7 +436,6 @@ private:
using ComboBox::SetText;
public:
FontStyleBox( vcl::Window* pParent, WinBits nBits );
- virtual ~FontStyleBox();
virtual void Select() SAL_OVERRIDE;
virtual void LoseFocus() SAL_OVERRIDE;
@@ -477,7 +479,6 @@ protected:
public:
FontSizeBox( vcl::Window* pParent, WinBits nWinStyle = 0 );
- virtual ~FontSizeBox();
void Reformat() SAL_OVERRIDE;
void Modify() SAL_OVERRIDE;