diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-04 13:47:35 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-04 17:14:26 +0000 |
| commit | 8bea644d6117a49405e6426dc97214220fc869d1 (patch) | |
| tree | 3a5574fcbd6062527dbb57bc91a38b58b11e78bc /svx | |
| parent | d2ce812f1d3a7a2aad89ca0bd11948b63d2db7b0 (diff) | |
extensions leaks out details of Color Selector, patch it up
and rebase it on SvxColorListBox
Change-Id: I3afef689ab0dc3c34e465810d82bf21797907558
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 66501632393f..800e53a4bf48 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -3200,8 +3200,8 @@ void SvxListBoxColorWrapper::operator()(const OUString& /*rCommand*/, const Name mxControl->Selected(rColor); } -SvxColorListBox::SvxColorListBox(vcl::Window* pParent) - : MenuButton(pParent) +SvxColorListBox::SvxColorListBox(vcl::Window* pParent, WinBits nStyle) + : MenuButton(pParent, nStyle) , m_aColorWrapper(this) , m_aAutoDisplayColor(Application::GetSettings().GetStyleSettings().GetDialogColor()) , m_nSlotId(0) |