unify color selectors

Note: this removes the use of auto-color from writer's asian text grid, because
its always invisible as far as I can see in practice.

Change-Id: Ie850790d740a4d56c43015e493e093678cef3b4e

15 files changed, 49 insertions, 172 deletions

diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index e3269326c3c5..7f763c690346 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -180,7 +180,7 @@ public:
     SD_DLLPUBLIC static SdAbstractDialogFactory*     Create();
 
     virtual VclPtr<VclAbstractDialog>          CreateBreakDlg(vcl::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) = 0;
-    virtual VclPtr<AbstractCopyDlg>            CreateCopyDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) = 0;
+    virtual VclPtr<AbstractCopyDlg>            CreateCopyDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView ) = 0;
     virtual VclPtr<AbstractSdCustomShowDlg>    CreateSdCustomShowDlg(vcl::Window* pWindow, SdDrawDocument& rDrawDoc) = 0;
     virtual VclPtr<SfxAbstractTabDialog>       CreateSdTabCharDialog(vcl::Window* pWindow, const SfxItemSet* pAttr, SfxObjectShell* pDocShell) = 0;
     virtual VclPtr<SfxAbstractTabDialog>       CreateSdTabPageDialog(vcl::Window* pWindow, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage) = 0;
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 4acc570ca599..3b10d337a3ca 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -292,16 +292,10 @@ VclAbstractDialog* SdDialogsTest::createDialogByID(sal_uInt32 nID)
         }
         case 2:
         {
-            // CreateCopyDlg(const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView) override;
-            // works without XColorList (DropDowns will be empty), but
-            // it's easy to access, so use it
-            XColorListRef pColorList(XColorList::CreateStdColorList());
-
             // needs an SfxItemSet, use the one from the 1st object
             pRetval = getSdAbstractDialogFactory()->CreateCopyDlg(
                 getViewShell()->GetActiveWindow(),
                 getSfxItemSetFromSdrObject(),
-                pColorList,
                 getDrawView());
             break;
         }
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 2ba3459164ee..6726317d95ba 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -62,6 +62,7 @@
 #include <editeng/flstitem.hxx>
 #include <svx/drawitem.hxx>
 
+#include <svx/colorbox.hxx>
 #include <svx/xtable.hxx>
 #include <svx/gallery.hxx>
 
@@ -191,43 +192,24 @@ public:
     virtual Control* getControl() override;
 
 private:
-    VclPtr<ColorListBox> mpControl;
-    DECL_LINK(OnSelect, ListBox&, void);
+    VclPtr<SvxColorListBox> mpControl;
+    DECL_LINK(OnSelect, SvxColorListBox&, void);
     Link<LinkParamNone*,void> maModifyLink;
 };
 
 ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl )
 : PropertySubControl( nControlType ), maModifyLink(rModifyHdl)
 {
-    mpControl = VclPtr<ColorListBox>::Create( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN );
-    mpControl->SetDropDownLineCount( 10 );
+    mpControl = VclPtr<SvxColorListBox>::Create(pParent);
     mpControl->SetSelectHdl( LINK(this, ColorPropertyBox, OnSelect) );
     mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX );
 
-    SfxObjectShell* pDocSh = SfxObjectShell::Current();
-    DBG_ASSERT( pDocSh, "DocShell not found!" );
-    XColorListRef pColorList;
-    const SfxPoolItem* pItem = nullptr;
-
-    if ( pDocSh && ( ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) != nullptr) )
-        pColorList = static_cast<const SvxColorListItem*>(pItem)->GetColorList();
-
-    if ( !pColorList.is() )
-        pColorList = XColorList::CreateStdColorList();
-
     sal_Int32 nColor = 0;
     rValue >>= nColor;
-
-    for ( long i = 0; i < pColorList->Count(); i++ )
-    {
-        const XColorEntry* pEntry = pColorList->GetColor(i);
-        sal_Int32 nPos = mpControl->InsertEntry( pEntry->GetColor(), pEntry->GetName() );
-        if( pEntry->GetColor().GetRGBColor() == (sal_uInt32)nColor )
-            mpControl->SelectEntryPos( nPos );
-    }
+    mpControl->SelectEntry(static_cast<Color>(nColor));
 }
 
-IMPL_LINK_NOARG(ColorPropertyBox, OnSelect, ListBox&, void)
+IMPL_LINK_NOARG(ColorPropertyBox, OnSelect, SvxColorListBox&, void)
 {
     maModifyLink.Call(nullptr);
 }
@@ -245,7 +227,7 @@ void ColorPropertyBox::setValue( const Any& rValue, const OUString& )
         rValue >>= nColor;
 
         mpControl->SetNoSelection();
-        mpControl->SelectEntryPos( mpControl->GetEntryPos( static_cast<Color>(nColor) ) );
+        mpControl->SelectEntry(static_cast<Color>(nColor));
     }
 }
 
@@ -1040,7 +1022,7 @@ private:
     VclPtr<FixedText>      mpFTAfterEffect;
     VclPtr<ListBox>        mpLBAfterEffect;
     VclPtr<FixedText>      mpFTDimColor;
-    VclPtr<ColorListBox>   mpCLBDimColor;
+    VclPtr<SvxColorListBox> mpCLBDimColor;
     VclPtr<FixedText>      mpFTTextAnim;
     VclPtr<ListBox>        mpLBTextAnim;
     VclPtr<MetricField>    mpMFTextDelay;
@@ -1065,6 +1047,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( vcl::Window* pParent
     get(mpLBAfterEffect, "aeffect_list" );
     get(mpFTDimColor, "dim_color_label" );
     get(mpCLBDimColor, "dim_color_list" );
+    mpCLBDimColor->SelectEntry(Color(COL_BLACK));
     get(mpFTTextAnim, "text_animation_label" );
     get(mpLBTextAnim, "text_animation_list" );
     get(mpMFTextDelay,"text_delay" );
@@ -1077,28 +1060,6 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( vcl::Window* pParent
 
     mpPBSoundPreview->SetClickHdl( LINK( this, CustomAnimationEffectTabPage, implClickHdl ) );
 
-    // fill the color box
-    SfxObjectShell* pDocSh = SfxObjectShell::Current();
-    DBG_ASSERT( pDocSh, "DocShell not found!" );
-    XColorListRef pColorList;
-    const SfxPoolItem* pItem = nullptr;
-
-    if ( pDocSh && ( (pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) != nullptr ) )
-        pColorList = static_cast<const SvxColorListItem*>(pItem)->GetColorList();
-
-    if ( !pColorList.is() )
-        pColorList = XColorList::CreateStdColorList();
-
-    mpCLBDimColor->SetUpdateMode( false );
-
-    for ( long i = 0; i < pColorList->Count(); i++ )
-    {
-        const XColorEntry* pEntry = pColorList->GetColor(i);
-        mpCLBDimColor->InsertEntry( pEntry->GetColor(), pEntry->GetName() );
-    }
-
-    mpCLBDimColor->SetUpdateMode( true );
-
     // only show settings if all selected effects have the same preset-id
     if( pSet->getPropertyState( nHandlePresetId ) != STLPropertyState::Ambiguous )
     {
@@ -1174,13 +1135,8 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( vcl::Window* pParent
             {
                 sal_Int32 nColor = 0;
                 aDimColor >>= nColor;
-                Color aColor( nColor );
-                sal_Int32 nColorPos = mpCLBDimColor->GetEntryPos( aColor );
-                if ( LISTBOX_ENTRY_NOTFOUND != nColorPos )
-                    mpCLBDimColor->SelectEntryPos( nColorPos );
-                else
-                    mpCLBDimColor->SelectEntryPos(
-                        mpCLBDimColor->InsertEntry( aColor, SVX_RESSTR(RID_SVXSTR_COLOR_USER) ) );
+                Color aColor(nColor);
+                mpCLBDimColor->SelectEntry(aColor);
             }
             else
             {
@@ -1332,16 +1288,7 @@ IMPL_LINK( CustomAnimationEffectTabPage, implSelectHdl, ListBox&, rListBox, void
 
 void CustomAnimationEffectTabPage::implHdl(Control* pControl )
 {
-    if( pControl == mpLBAfterEffect )
-    {
-        sal_Int32 nPos = static_cast<ListBox*>( mpLBAfterEffect )->GetSelectEntryPos();
-        if( nPos == 1 )
-        {
-            if( mpCLBDimColor->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND )
-                mpCLBDimColor->SelectEntryPos(0);
-        }
-    }
-    else if( pControl == mpLBTextAnim )
+    if( pControl == mpLBTextAnim )
     {
         if( mpMFTextDelay->GetValue() == 0 )
             mpMFTextDelay->SetValue( 100 );
@@ -1420,10 +1367,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet )
         Any aDimColor;
         if( nPos == 1 )
         {
-            Color aSelectedColor;
-            if ( mpCLBDimColor->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
-                aSelectedColor = mpCLBDimColor->GetSelectEntryColor();
-
+            Color aSelectedColor = mpCLBDimColor->GetSelectEntryColor();
             aDimColor = makeAny( (sal_Int32)aSelectedColor.GetRGBColor() );
         }
 
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index f68e06c38293..efcebc1442f1 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -19,6 +19,7 @@
 
 #include "copydlg.hxx"
 #include <comphelper/string.hxx>
+#include <svx/colorbox.hxx>
 #include <svx/dlgutil.hxx>
 #include <sfx2/module.hxx>
 #include <svx/xcolit.hxx>
@@ -40,11 +41,9 @@ namespace sd {
 
 #define TOKEN ';'
 
-CopyDlg::CopyDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs,
-    const XColorListRef &pColList, ::sd::View* pInView)
+CopyDlg::CopyDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pInView)
     : SfxModalDialog(pWindow, "DuplicateDialog", "modules/sdraw/ui/copydlg.ui")
     , mrOutAttrs(rInAttrs)
-    , mpColorList(pColList)
     , maUIScale(pInView->GetDoc().GetUIScale())
     , mpView(pInView)
 {
@@ -60,11 +59,6 @@ CopyDlg::CopyDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs,
     get(m_pLbEndColor, "end");
     get(m_pBtnSetDefault, "default");
 
-    // color tables
-    DBG_ASSERT( mpColorList.is(), "No colortable available !" );
-    m_pLbStartColor->Fill( mpColorList );
-    m_pLbEndColor->CopyEntries( *m_pLbStartColor );
-
     m_pLbStartColor->SetSelectHdl( LINK( this, CopyDlg, SelectColorHdl ) );
     m_pBtnSetViewData->SetClickHdl( LINK( this, CopyDlg, SetViewData ) );
     m_pBtnSetDefault->SetClickHdl( LINK( this, CopyDlg, SetDefault ) );
@@ -201,31 +195,22 @@ void CopyDlg::GetAttr( SfxItemSet& rOutAttrs )
     rOutAttrs.Put( SfxInt32Item( ATTR_COPY_WIDTH, nWidth ) );
     rOutAttrs.Put( SfxInt32Item( ATTR_COPY_HEIGHT, nHeight ) );
 
-    if( m_pLbStartColor->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
-    {
-        XColorItem aXColorItem( ATTR_COPY_START_COLOR, m_pLbStartColor->GetSelectEntry(),
-                                    m_pLbStartColor->GetSelectEntryColor() );
-        rOutAttrs.Put( aXColorItem );
-    }
-    if( m_pLbEndColor->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
-    {
-        XColorItem aXColorItem( ATTR_COPY_END_COLOR, m_pLbEndColor->GetSelectEntry(),
-                                    m_pLbEndColor->GetSelectEntryColor() );
-        rOutAttrs.Put( aXColorItem );
-    }
+    NamedColor aColor = m_pLbStartColor->GetSelectEntry();
+    rOutAttrs.Put(XColorItem(ATTR_COPY_START_COLOR, aColor.second, aColor.first));
+    aColor = m_pLbEndColor->GetSelectEntry();
+    rOutAttrs.Put(XColorItem(ATTR_COPY_END_COLOR, aColor.second, aColor.first));
 }
 
 /**
  * enables and selects end color LB
  */
-IMPL_LINK_NOARG(CopyDlg, SelectColorHdl, ListBox&, void)
+IMPL_LINK_NOARG(CopyDlg, SelectColorHdl, SvxColorListBox&, void)
 {
-    sal_Int32 nPos = m_pLbStartColor->GetSelectEntryPos();
+    const Color aColor = m_pLbStartColor->GetSelectEntryColor();
 
-    if( nPos != LISTBOX_ENTRY_NOTFOUND &&
-        !m_pLbEndColor->IsEnabled() )
+    if (!m_pLbEndColor->IsEnabled())
     {
-        m_pLbEndColor->SelectEntryPos( nPos );
+        m_pLbEndColor->SelectEntry(aColor);
         m_pLbEndColor->Enable();
         m_pFtEndColor->Enable();
     }
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index d2041f2c7554..23289ab93810 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -315,10 +315,9 @@ VclPtr<VclAbstractDialog> SdAbstractDialogFactory_Impl::CreateBreakDlg(
 
 VclPtr<AbstractCopyDlg> SdAbstractDialogFactory_Impl::CreateCopyDlg(vcl::Window* pParent,
                                             const SfxItemSet& rInAttrs,
-                                            const rtl::Reference<XColorList> &pColTab,
                                             ::sd::View* pView )
 {
-    return VclPtr<AbstractCopyDlg_Impl>::Create( VclPtr<::sd::CopyDlg>::Create( pParent, rInAttrs, pColTab, pView ) );
+    return VclPtr<AbstractCopyDlg_Impl>::Create( VclPtr<::sd::CopyDlg>::Create( pParent, rInAttrs, pView ) );
 }
 
 VclPtr<AbstractSdCustomShowDlg> SdAbstractDialogFactory_Impl::CreateSdCustomShowDlg(vcl::Window* pParent, SdDrawDocument& rDrawDoc )
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index f014c8763e27..5eb076b09b11 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -215,7 +215,7 @@ public:
     virtual ~SdAbstractDialogFactory_Impl() {}
 
     virtual VclPtr<VclAbstractDialog>          CreateBreakDlg(vcl::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount) override;
-    virtual VclPtr<AbstractCopyDlg>            CreateCopyDlg(vcl::Window* pParent, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView) override;
+    virtual VclPtr<AbstractCopyDlg>            CreateCopyDlg(vcl::Window* pParent, const SfxItemSet& rInAttrs, ::sd::View* pView) override;
     virtual VclPtr<AbstractSdCustomShowDlg>    CreateSdCustomShowDlg(vcl::Window* pParent, SdDrawDocument& rDrawDoc) override;
     virtual VclPtr<SfxAbstractTabDialog>       CreateSdTabCharDialog(vcl::Window* pWindow, const SfxItemSet* pAttr, SfxObjectShell* pDocShell) override;
     virtual VclPtr<SfxAbstractTabDialog>       CreateSdTabPageDialog(vcl::Window* pWindow, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage) override;
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index a834258b78d2..3fb2dc929646 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -102,7 +102,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
             SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
             if( pFact )
             {
-                ScopedVclPtr<AbstractCopyDlg> pDlg(pFact->CreateCopyDlg(mpViewShell->GetActiveWindow(), aSet, mpDoc->GetColorList(), mpView ));
+                ScopedVclPtr<AbstractCopyDlg> pDlg(pFact->CreateCopyDlg(mpViewShell->GetActiveWindow(), aSet, mpView ));
                 if (!pDlg)
                     return;
 
diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx
index 98ac00ab7318..33a97c589943 100644
--- a/sd/source/ui/inc/copydlg.hxx
+++ b/sd/source/ui/inc/copydlg.hxx
@@ -28,6 +28,8 @@
 #include <sfx2/basedlgs.hxx>
 #include <tools/fract.hxx>
 
+class SvxColorListBox;
+
 namespace sd {
 
 class View;
@@ -39,8 +41,7 @@ class CopyDlg
     : public SfxModalDialog
 {
 public:
-    CopyDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs,
-        const XColorListRef &pColList, ::sd::View* pView );
+    CopyDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView);
     virtual ~CopyDlg() override;
     virtual void dispose() override;
 
@@ -58,18 +59,17 @@ private:
     VclPtr<MetricField>        m_pMtrFldWidth;
     VclPtr<MetricField>        m_pMtrFldHeight;
 
-    VclPtr<ColorLB>            m_pLbStartColor;
+    VclPtr<SvxColorListBox>    m_pLbStartColor;
     VclPtr<FixedText>          m_pFtEndColor;
-    VclPtr<ColorLB>            m_pLbEndColor;
+    VclPtr<SvxColorListBox>    m_pLbEndColor;
 
     VclPtr<PushButton>         m_pBtnSetDefault;
 
     const SfxItemSet&   mrOutAttrs;
-    XColorListRef       mpColorList;
     Fraction            maUIScale;
     ::sd::View*         mpView;
 
-    DECL_LINK( SelectColorHdl, ListBox&, void );
+    DECL_LINK( SelectColorHdl, SvxColorListBox&, void );
     DECL_LINK( SetViewData, Button*, void );
     DECL_LINK( SetDefault, Button*, void );
 };
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 89587c52282d..3957fbafbd0d 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -38,6 +38,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include "sdresid.hxx"
 #include <svtools/controldims.hrc>
+#include <svx/colorbox.hxx>
 #include <svx/gallery.hxx>
 #include <svx/drawitem.hxx>
 #include <unotools/pathoptions.hxx>
@@ -211,48 +212,21 @@ void SlideBackground::Update()
             mpFillAttr->Hide();
             mpFillGrad->Hide();
             mpFillLB->Show();
-            mpFillLB->Clear();
-            const SvxColorListItem aItem( *static_cast<const SvxColorListItem*>(pSh->GetItem(SID_COLOR_TABLE)));
-            mpFillLB->Fill(aItem.GetColorList());
-
             const Color aColor = GetColorSetOrDefault();
-            mpFillLB->SelectEntry( aColor );
-
-            if(mpFillLB->GetSelectEntryCount() == 0)
-            {
-                mpFillLB->InsertEntry(aColor, OUString());
-                mpFillLB->SelectEntry(aColor);
-            }
+            mpFillLB->SelectEntry(aColor);
         }
         break;
         case GRADIENT:
         {
             mpFillLB->Show();
-            const SvxColorListItem aItem(*static_cast<const SvxColorListItem*>(pSh->GetItem(SID_COLOR_TABLE)));
             mpFillAttr->Hide();
             mpFillGrad->Show();
-            mpFillLB->Clear();
-            mpFillGrad->Clear();
-            mpFillLB->Fill(aItem.GetColorList());
-            mpFillGrad->Fill(aItem.GetColorList());
 
             const XGradient xGradient = GetGradientSetOrDefault();
             const Color aStartColor = xGradient.GetStartColor();
+            mpFillLB->SelectEntry(aStartColor);
             const Color aEndColor = xGradient.GetEndColor();
-            mpFillLB->SelectEntry( aStartColor );
-            mpFillGrad->SelectEntry( aEndColor );
-
-            if(mpFillLB->GetSelectEntryCount() == 0)
-            {
-                mpFillLB->InsertEntry(aStartColor, OUString());
-                mpFillLB->SelectEntry(aStartColor);
-            }
-
-            if(mpFillGrad->GetSelectEntryCount() == 0)
-            {
-                mpFillGrad->InsertEntry(aEndColor, OUString());
-                mpFillGrad->SelectEntry(aEndColor);
-            }
+            mpFillGrad->SelectEntry(aEndColor);
         }
         break;
 
@@ -831,7 +805,7 @@ IMPL_LINK_NOARG(SlideBackground, PaperSizeModifyHdl, ListBox&, void)
     GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_SIZE, SfxCallMode::RECORD, { &aSizeItem, mpPageItem.get() });
 }
 
-IMPL_LINK_NOARG(SlideBackground, FillColorHdl, ListBox&, void)
+IMPL_LINK_NOARG(SlideBackground, FillColorHdl, SvxColorListBox&, void)
 {
     const drawing::FillStyle eXFS = (drawing::FillStyle)mpFillStyle->GetSelectEntryPos();
     switch(eXFS)
diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx
index deb9a3b8118a..fbbe7016b8aa 100644
--- a/sd/source/ui/sidebar/SlideBackground.hxx
+++ b/sd/source/ui/sidebar/SlideBackground.hxx
@@ -45,6 +45,8 @@
 #include "EventMultiplexer.hxx"
 #include <sfx2/sidebar/IContextChangeReceiver.hxx>
 
+class SvxColorListBox;
+
 namespace sd { namespace sidebar {
 
 class SlideBackground :
@@ -79,9 +81,9 @@ private:
     VclPtr<ListBox> mpPaperOrientation;
     VclPtr<ListBox> mpMasterSlide;
     VclPtr<SvxFillTypeBox> mpFillStyle;
-    VclPtr<ColorLB> mpFillLB;
+    VclPtr<SvxColorListBox> mpFillLB;
     VclPtr<SvxFillAttrBox> mpFillAttr;
-    VclPtr<ColorLB> mpFillGrad;
+    VclPtr<SvxColorListBox> mpFillGrad;
     VclPtr<CheckBox> mpDspMasterBackground;
     VclPtr<CheckBox> mpDspMasterObjects;
     VclPtr<Button> mpCloseMaster;
@@ -120,7 +122,7 @@ private:
     DECL_LINK(FillBackgroundHdl, ListBox&, void);
     DECL_LINK(FillStyleModifyHdl, ListBox&, void);
     DECL_LINK(PaperSizeModifyHdl, ListBox&, void);
-    DECL_LINK(FillColorHdl, ListBox&, void);
+    DECL_LINK(FillColorHdl, SvxColorListBox&, void);
     DECL_LINK(AssignMasterPage, ListBox&, void);
     DECL_LINK(DspBackground, Button*, void);
     DECL_LINK(DspObjects, Button*, void);
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index d34b08ffb694..7fa40d53e97e 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -87,15 +87,6 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet)
 {
     const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
     const SdrObject* pObj = nullptr;
-    SvxFontWorkDialog* pDlg = nullptr;
-
-    sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId();
-
-    if (GetViewFrame()->HasChildWindow(nId))
-    {
-        SfxChildWindow* pWnd = GetViewFrame()->GetChildWindow(nId);
-        pDlg = pWnd ? static_cast<SvxFontWorkDialog*>(pWnd->GetWindow()) : nullptr;
-    }
 
     if ( rMarkList.GetMarkCount() == 1 )
         pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
@@ -125,9 +116,6 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet)
     }
     else
     {
-        if ( pDlg )
-            pDlg->SetColorList(GetDoc()->GetColorList());
-
         SfxItemSet aSet( GetDoc()->GetPool() );
         mpDrawView->GetAttributes( aSet );
         rSet.Set( aSet );
@@ -341,17 +329,8 @@ void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet )
 {
     const SdrMarkList&  rMarkList = mpDrawView->GetMarkedObjectList();
     const SdrObject*    pObj = nullptr;
-    sal_uInt16              nId = SvxBmpMaskChildWindow::GetChildWindowId();
     bool                bEnable = false;
 
-    if ( GetViewFrame()->HasChildWindow( nId ) )
-    {
-        SfxChildWindow* pWnd = GetViewFrame()->GetChildWindow(nId);
-        SvxBmpMask* pDlg = pWnd ? static_cast<SvxBmpMask*>(pWnd->GetWindow()) : nullptr;
-        if (pDlg && pDlg->NeedsColorList())
-            pDlg->SetColorList(GetDoc()->GetColorList());
-    }
-
     if ( rMarkList.GetMarkCount() == 1 )
         pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
 
diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx
index a2fe62bb2d36..4236050fe3b3 100644
--- a/sd/source/ui/view/drviewsi.cxx
+++ b/sd/source/ui/view/drviewsi.cxx
@@ -72,7 +72,7 @@ void DrawViewShell::ExecEffectWin( SfxRequest& rReq )
             {
                 Svx3DWin* p3DWin = static_cast<Svx3DWin*>( pWindow->GetWindow() );
                 if( p3DWin )
-                    p3DWin->InitColorLB( GetDoc() );
+                    p3DWin->InitColorLB();
             }
         }
         break;
diff --git a/sd/uiconfig/sdraw/ui/copydlg.ui b/sd/uiconfig/sdraw/ui/copydlg.ui
index 2ae2610b38c5..451c854ea7b3 100644
--- a/sd/uiconfig/sdraw/ui/copydlg.ui
+++ b/sd/uiconfig/sdraw/ui/copydlg.ui
@@ -448,7 +448,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxlo-ColorLB" id="start">
+                          <object class="svxlo-SvxColorListBox" id="start">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
@@ -459,7 +459,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxlo-ColorLB" id="end">
+                          <object class="svxlo-SvxColorListBox" id="end">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
diff --git a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
index fffceb744ec9..758845856e8c 100644
--- a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
+++ b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
@@ -254,7 +254,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo-ColorListBox" id="dim_color_list">
+                  <object class="svxlo-SvxColorListBox" id="dim_color_list">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                   </object>
diff --git a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
index 9b5d24a435e3..0ab82e1086de 100644
--- a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
+++ b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
@@ -67,7 +67,7 @@
           </packing>
         </child>
         <child>
-          <object class="svxlo-ColorLB" id="fillattr">
+          <object class="svxlo-SvxColorListBox" id="fillattr">
             <property name="width_request">150</property>
             <property name="can_focus">False</property>
             <property name="has_tooltip">True</property>
@@ -140,7 +140,7 @@
           </packing>
         </child>
         <child>
-          <object class="svxlo-ColorLB" id="fillattr2">
+          <object class="svxlo-SvxColorListBox" id="fillattr2">
             <property name="width_request">150</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>