commit d2ce812f1d3a7a2aad89ca0bd11948b63d2db7b0
author Caolán McNamara <caolanm@redhat.com> Fri Nov 04 12:59:15 2016 +0000
committer Caolán McNamara <caolanm@redhat.com> Fri Nov 04 17:14:26 2016 +0000
tree 8e2b7019e6062a4cc3b3a6ee79c1c4ad397e8591
parent 43bc3031483d172eccd72c3804e2d4fc2ef37de4

inherit FillAttrLB from ListBox not ColorListBox

Change-Id: Icd6f51b61ec0d006c10c6a75da649cc83057b9f1

include/svx/dlgctrl.hxx

diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index fbf9369..5a2c217 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -245,7 +245,7 @@ public:

/************************************************************************/

class SAL_WARN_UNUSED SVX_DLLPUBLIC FillAttrLB : public ColorListBox
class SAL_WARN_UNUSED SVX_DLLPUBLIC FillAttrLB : public ListBox
{
private:
    BitmapEx        maBitmapEx;

svx/source/dialog/dlgctrl.cxx

diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 740033d..0ee46f7 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1303,7 +1303,7 @@ namespace
} // end of anonymous namespace

FillAttrLB::FillAttrLB(vcl::Window* pParent, WinBits aWB)
:   ColorListBox(pParent, aWB)
    : ListBox(pParent, aWB)
{
}