diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-04 17:10:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-04 17:14:32 +0000 |
| commit | f300754bb1c6a347c92bb9548be7a65237176542 (patch) | |
| tree | e20edced9821fb8820f0adde86750301feed923c /svx | |
| parent | 347c2c334589b18cc62af292674bb3df1dd54b71 (diff) | |
replace OColorPopup with SvxColorWindow
Change-Id: I1aa06f70016b935bb13a0f6e93234eea10ba8b84
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index b7545815f5d1..c5c0d568227c 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -3192,6 +3192,11 @@ void SvxListBoxColorWrapper::operator()(const OUString& /*rCommand*/, const Name mxControl->Selected(rColor); } +void SvxListBoxColorWrapper::dispose() +{ + mxControl.clear(); +} + SvxColorListBox::SvxColorListBox(vcl::Window* pParent, WinBits nStyle) : MenuButton(pParent, nStyle) , m_aColorWrapper(this) @@ -3306,6 +3311,7 @@ SvxColorListBox::~SvxColorListBox() void SvxColorListBox::dispose() { m_xColorWindow.disposeAndClear(); + m_aColorWrapper.dispose(); MenuButton::dispose(); } |