Revert "Reverts a commit series that cripple windows ci."

with addition of...

- svxlo-SvxColorListBox
+ svxcorelo-SvxColorListBox

This reverts commit db380aab1063e8a5e40111c40ee9f7921aa82601.

Change-Id: I3af7aa0abb1a430bce64188244404fcbd480b128
Reviewed-on: https://gerrit.libreoffice.org/30598
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

14 files changed, 149 insertions, 335 deletions

diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 0c7cb7dd2208..935495573295 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -88,6 +88,7 @@
 #include <com/sun/star/text/TextMarkupType.hpp>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <svx/colorwindow.hxx>
 
 #include <reffld.hxx>
 #include <expfld.hxx>
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index c599a6ed3e0f..e4c17d0ec431 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1730,20 +1730,22 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( vcl::Window* pParent,
                                                   const SfxItemSet& rSet )
     : SfxTabPage(pParent, "OptRedLinePage",
         "modules/swriter/ui/optredlinepage.ui" , &rSet)
-    , sNone(SW_RESSTR(SW_STR_NONE))
 {
     Size aPreviewSize(getPreviewOptionsSize(this));
 
     get(pInsertLB,"insert");
     get(pInsertColorLB,"insertcolor");
+    pInsertColorLB->SetSlotId(SID_AUTHOR_COLOR, true);
     get(pInsertedPreviewWN,"insertedpreview");
 
     get(pDeletedLB,"deleted");
     get(pDeletedColorLB,"deletedcolor");
+    pDeletedColorLB->SetSlotId(SID_AUTHOR_COLOR, true);
     get(pDeletedPreviewWN,"deletedpreview");
 
     get(pChangedLB,"changed");
     get(pChangedColorLB,"changedcolor");
+    pChangedColorLB->SetSlotId(SID_AUTHOR_COLOR, true);
     get(pChangedPreviewWN,"changedpreview");
 
     get(pMarkPosLB,"markpos");
@@ -1760,8 +1762,6 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( vcl::Window* pParent,
     pChangedPreviewWN->set_width_request(aPreviewSize.Width());
     pMarkPreviewWN->set_width_request(aPreviewSize.Width());
 
-    sAuthor = get<vcl::Window>("byauthor")->GetText();
-
     for (sal_Int32 i = 0; i < pInsertLB->GetEntryCount(); ++i)
     {
         const OUString sEntry(pInsertLB->GetEntry(i));
@@ -1781,14 +1781,13 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( vcl::Window* pParent,
     pDeletedLB->SetSelectHdl( aLk );
     pChangedLB->SetSelectHdl( aLk );
 
-    aLk = LINK(this, SwRedlineOptionsTabPage, ColorHdl);
-    pInsertColorLB->SetSelectHdl( aLk );
-    pDeletedColorLB->SetSelectHdl( aLk );
-    pChangedColorLB->SetSelectHdl( aLk );
+    Link<SvxColorListBox&,void> aLk2 = LINK(this, SwRedlineOptionsTabPage, ColorHdl);
+    pInsertColorLB->SetSelectHdl( aLk2 );
+    pDeletedColorLB->SetSelectHdl( aLk2 );
+    pChangedColorLB->SetSelectHdl( aLk2 );
 
-    aLk = LINK(this, SwRedlineOptionsTabPage, ChangedMaskPrevHdl);
-    pMarkPosLB->SetSelectHdl( aLk );
-    pMarkColorLB->SetSelectHdl( aLk );
+    pMarkPosLB->SetSelectHdl(LINK(this, SwRedlineOptionsTabPage, ChangedMaskPrevHdl));
+    pMarkColorLB->SetSelectHdl(LINK(this, SwRedlineOptionsTabPage, ChangedMaskColorPrevHdl));
 }
 
 SwRedlineOptionsTabPage::~SwRedlineOptionsTabPage()
@@ -1840,23 +1839,7 @@ bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* )
         pAttr = static_cast<CharAttr *>(pInsertLB->GetEntryData(nPos));
         aInsertedAttr.nItemId = pAttr->nItemId;
         aInsertedAttr.nAttr = pAttr->nAttr;
-
-        nPos = pInsertColorLB->GetSelectEntryPos();
-
-        switch (nPos)
-        {
-            case 0:
-                aInsertedAttr.nColor = COL_NONE_COLOR;
-                break;
-            case 1:
-            case LISTBOX_ENTRY_NOTFOUND:
-                aInsertedAttr.nColor = COL_TRANSPARENT;
-                break;
-            default:
-                aInsertedAttr.nColor = pInsertColorLB->GetEntryColor(nPos).GetColor();
-                break;
-        }
-
+        aInsertedAttr.nColor = pInsertColorLB->GetSelectEntryColor().GetColor();
         pOpt->SetInsertAuthorAttr(aInsertedAttr);
     }
 
@@ -1866,23 +1849,7 @@ bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* )
         pAttr = static_cast<CharAttr *>(pDeletedLB->GetEntryData(nPos));
         aDeletedAttr.nItemId = pAttr->nItemId;
         aDeletedAttr.nAttr = pAttr->nAttr;
-
-        nPos = pDeletedColorLB->GetSelectEntryPos();
-
-        switch (nPos)
-        {
-            case 0:
-                aDeletedAttr.nColor = COL_NONE_COLOR;
-                break;
-            case 1:
-            case LISTBOX_ENTRY_NOTFOUND:
-                aDeletedAttr.nColor = COL_TRANSPARENT;
-                break;
-            default:
-                aDeletedAttr.nColor = pDeletedColorLB->GetEntryColor(nPos).GetColor();
-                break;
-        }
-
+        aDeletedAttr.nColor = pDeletedColorLB->GetSelectEntryColor().GetColor();
         pOpt->SetDeletedAuthorAttr(aDeletedAttr);
     }
 
@@ -1892,23 +1859,7 @@ bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* )
         pAttr = static_cast<CharAttr *>(pChangedLB->GetEntryData(nPos));
         aChangedAttr.nItemId = pAttr->nItemId;
         aChangedAttr.nAttr = pAttr->nAttr;
-
-        nPos = pChangedColorLB->GetSelectEntryPos();
-
-        switch (nPos)
-        {
-            case 0:
-                aChangedAttr.nColor = COL_NONE_COLOR;
-                break;
-            case 1:
-            case LISTBOX_ENTRY_NOTFOUND:
-                aChangedAttr.nColor = COL_TRANSPARENT;
-                break;
-            default:
-                aChangedAttr.nColor = pChangedColorLB->GetEntryColor(nPos).GetColor();
-                break;
-        }
-
+        aChangedAttr.nColor = pChangedColorLB->GetSelectEntryColor().GetColor();
         pOpt->SetFormatAuthorAttr(aChangedAttr);
     }
 
@@ -1957,77 +1908,14 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet*  )
     InitFontStyle(*pDeletedPreviewWN);
     InitFontStyle(*pChangedPreviewWN);
 
-    // initialise colour list box
-    pInsertColorLB->SetUpdateMode(false);
-    pDeletedColorLB->SetUpdateMode(false);
-    pChangedColorLB->SetUpdateMode(false);
-    pMarkColorLB->SetUpdateMode(false);
-    pInsertColorLB->InsertEntry(sNone);
-    pDeletedColorLB->InsertEntry(sNone);
-    pChangedColorLB->InsertEntry(sNone);
-
-    pInsertColorLB->InsertEntry(sAuthor);
-    pDeletedColorLB->InsertEntry(sAuthor);
-    pChangedColorLB->InsertEntry(sAuthor);
-
-    XColorListRef pColorLst = XColorList::GetStdColorList();
-    for( long i = 0; i < pColorLst->Count(); ++i )
-    {
-        const XColorEntry* pEntry = pColorLst->GetColor(i);
-        Color aColor = pEntry->GetColor();
-        const OUString sName = pEntry->GetName();
-
-        pInsertColorLB->InsertEntry( aColor, sName );
-        pDeletedColorLB->InsertEntry( aColor, sName );
-        pChangedColorLB->InsertEntry( aColor, sName );
-        pMarkColorLB->InsertEntry( aColor, sName );
-    }
-    pInsertColorLB->SetUpdateMode( true );
-    pDeletedColorLB->SetUpdateMode( true );
-    pChangedColorLB->SetUpdateMode( true );
-    pMarkColorLB->SetUpdateMode( true );
-
     ColorData nColor = rInsertAttr.nColor;
-
-    switch (nColor)
-    {
-        case COL_TRANSPARENT:
-            pInsertColorLB->SelectEntryPos(1);
-            break;
-        case COL_NONE_COLOR:
-            pInsertColorLB->SelectEntryPos(0);
-            break;
-        default:
-            pInsertColorLB->SelectEntry(Color(nColor));
-    }
+    pInsertColorLB->SelectEntry(Color(nColor));
 
     nColor = rDeletedAttr.nColor;
-
-    switch (nColor)
-    {
-        case COL_TRANSPARENT:
-            pDeletedColorLB->SelectEntryPos(1);
-            break;
-        case COL_NONE_COLOR:
-            pDeletedColorLB->SelectEntryPos(0);
-            break;
-        default:
-            pDeletedColorLB->SelectEntry(Color(nColor));
-    }
+    pDeletedColorLB->SelectEntry(Color(nColor));
 
     nColor = rChangedAttr.nColor;
-
-    switch (nColor)
-    {
-        case COL_TRANSPARENT:
-            pChangedColorLB->SelectEntryPos(1);
-            break;
-        case COL_NONE_COLOR:
-            pChangedColorLB->SelectEntryPos(0);
-            break;
-        default:
-            pChangedColorLB->SelectEntry(Color(nColor));
-    }
+    pChangedColorLB->SelectEntry(Color(nColor));
 
     pMarkColorLB->SelectEntry(pOpt->GetMarkAlignColor());
 
@@ -2058,13 +1946,13 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet*  )
     AttribHdl(*pChangedLB);
     ColorHdl(*pChangedColorLB);
 
-    ChangedMaskPrevHdl(*pMarkPosLB);
+    ChangedMaskPrev();
 }
 
 IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox&, rLB, void )
 {
     SvxFontPrevWindow *pPrev = nullptr;
-    ColorListBox *pColorLB;
+    SvxColorListBox *pColorLB;
 
     if (&rLB == pInsertLB)
     {
@@ -2096,26 +1984,25 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox&, rLB, void )
     rFont.SetCaseMap(SVX_CASEMAP_NOT_MAPPED);
     rCJKFont.SetCaseMap(SVX_CASEMAP_NOT_MAPPED);
 
-    sal_Int32      nPos = pColorLB->GetSelectEntryPos();
+    Color aColor = pColorLB->GetSelectEntryColor();
 
-    switch( nPos )
+    if (aColor == COL_NONE_COLOR)
     {
-        case 0:
-            rFont.SetColor( Color( COL_BLACK ) );
-            rCJKFont.SetColor( Color( COL_BLACK ) );
-            break;
-        case 1:
-        case LISTBOX_ENTRY_NOTFOUND:
-            rFont.SetColor( Color( COL_RED ) );
-            rCJKFont.SetColor( Color( COL_RED ) );
-            break;
-        default:
-            rFont.SetColor( pColorLB->GetEntryColor( nPos ) );
-            rCJKFont.SetColor( pColorLB->GetEntryColor( nPos ) );
-            break;
+        rFont.SetColor( Color( COL_BLACK ) );
+        rCJKFont.SetColor( Color( COL_BLACK ) );
+    }
+    else if (aColor == COL_TRANSPARENT)
+    {
+        rFont.SetColor( Color( COL_RED ) );
+        rCJKFont.SetColor( Color( COL_RED ) );
+    }
+    else
+    {
+        rFont.SetColor(aColor);
+        rCJKFont.SetColor(aColor);
     }
 
-    nPos = rLB.GetSelectEntryPos();
+    sal_Int32 nPos = rLB.GetSelectEntryPos();
     if( nPos == LISTBOX_ENTRY_NOTFOUND )
         nPos = 0;
 
@@ -2151,12 +2038,11 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox&, rLB, void )
 
         case SID_ATTR_BRUSH:
         {
-            nPos = pColorLB->GetSelectEntryPos();
-            if( nPos )
-                pPrev->SetColor( pColorLB->GetSelectEntryColor() );
+            Color aBgColor = pColorLB->GetSelectEntryColor();
+            if (aBgColor != COL_NONE_COLOR)
+                pPrev->SetColor(aBgColor);
             else
-                pPrev->SetColor( Color( COL_LIGHTGRAY ) );
-
+                pPrev->SetColor(Color(COL_LIGHTGRAY));
             rFont.SetColor( Color( COL_BLACK ) );
             rCJKFont.SetColor( Color( COL_BLACK ) );
         }
@@ -2166,9 +2052,9 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox&, rLB, void )
     pPrev->Invalidate();
 }
 
-IMPL_LINK( SwRedlineOptionsTabPage, ColorHdl, ListBox&, rListBox, void )
+IMPL_LINK( SwRedlineOptionsTabPage, ColorHdl, SvxColorListBox&, rListBox, void )
 {
-    ColorListBox* pColorLB = static_cast<ColorListBox*>(&rListBox);
+    SvxColorListBox* pColorLB = &rListBox;
     SvxFontPrevWindow *pPrev = nullptr;
     ListBox* pLB;
 
@@ -2200,38 +2086,38 @@ IMPL_LINK( SwRedlineOptionsTabPage, ColorHdl, ListBox&, rListBox, void )
     {
         rFont.SetColor( Color( COL_BLACK ) );
         rCJKFont.SetColor( Color( COL_BLACK ) );
-        nPos = pColorLB->GetSelectEntryPos();
-        if( nPos && nPos != LISTBOX_ENTRY_NOTFOUND )
-            pPrev->SetColor( pColorLB->GetSelectEntryColor() );
+
+        Color aBgColor = pColorLB->GetSelectEntryColor();
+        if (aBgColor != COL_NONE_COLOR)
+            pPrev->SetColor(aBgColor);
         else
-            pPrev->SetColor( Color( COL_LIGHTGRAY ) );
+            pPrev->SetColor(Color(COL_LIGHTGRAY));
     }
     else
     {
-        nPos = pColorLB->GetSelectEntryPos();
+        Color aColor = pColorLB->GetSelectEntryColor();
 
-        switch( nPos )
+        if (aColor == COL_NONE_COLOR)
         {
-            case 0:
-                rFont.SetColor( Color( COL_BLACK ) );
-                rCJKFont.SetColor( Color( COL_BLACK ) );
-                break;
-            case 1:
-            case LISTBOX_ENTRY_NOTFOUND:
-                rFont.SetColor( Color( COL_RED ) );
-                rCJKFont.SetColor( Color( COL_RED ) );
-                break;
-            default:
-                rFont.SetColor( pColorLB->GetEntryColor( nPos ) );
-                rCJKFont.SetColor( pColorLB->GetEntryColor( nPos ) );
-                break;
+            rFont.SetColor( Color( COL_BLACK ) );
+            rCJKFont.SetColor( Color( COL_BLACK ) );
+        }
+        else if (aColor == COL_TRANSPARENT)
+        {
+            rFont.SetColor( Color( COL_RED ) );
+            rCJKFont.SetColor( Color( COL_RED ) );
+        }
+        else
+        {
+            rFont.SetColor(aColor);
+            rCJKFont.SetColor(aColor);
         }
     }
 
     pPrev->Invalidate();
 }
 
-IMPL_LINK_NOARG(SwRedlineOptionsTabPage, ChangedMaskPrevHdl, ListBox&, void)
+void SwRedlineOptionsTabPage::ChangedMaskPrev()
 {
     pMarkPreviewWN->SetMarkPos(pMarkPosLB->GetSelectEntryPos());
     pMarkPreviewWN->SetColor(pMarkColorLB->GetSelectEntryColor().GetColor());
@@ -2239,6 +2125,16 @@ IMPL_LINK_NOARG(SwRedlineOptionsTabPage, ChangedMaskPrevHdl, ListBox&, void)
     pMarkPreviewWN->Invalidate();
 }
 
+IMPL_LINK_NOARG(SwRedlineOptionsTabPage, ChangedMaskPrevHdl, ListBox&, void)
+{
+    ChangedMaskPrev();
+}
+
+IMPL_LINK_NOARG(SwRedlineOptionsTabPage, ChangedMaskColorPrevHdl, SvxColorListBox&, void)
+{
+    ChangedMaskPrev();
+}
+
 void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin)
 {
     const AllSettings&  rAllSettings = Application::GetSettings();
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index f3d5931111e0..6d038be747f1 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -25,6 +25,7 @@
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/htmlmode.hxx>
+#include <svx/colorbox.hxx>
 #include <svx/xtable.hxx>
 #include <svx/drawitem.hxx>
 #include <editeng/borderline.hxx>
@@ -497,12 +498,11 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet)
     m_pAutoWidthBox->SetClickHdl(LINK(this, SwColumnPage, AutoWidthHdl));
 
     aLk = LINK( this, SwColumnPage, UpdateColMgr );
-    Link<ListBox&,void> aLk2 = LINK( this, SwColumnPage, UpdateColMgrListBox );
-    m_pLineTypeDLB->SetSelectHdl( aLk2 );
+    m_pLineTypeDLB->SetSelectHdl(LINK(this, SwColumnPage, UpdateColMgrListBox));
     m_pLineWidthEdit->SetModifyHdl( aLk );
-    m_pLineColorDLB->SetSelectHdl( aLk2 );
+    m_pLineColorDLB->SetSelectHdl(LINK( this, SwColumnPage, UpdateColMgrColorBox));
     m_pLineHeightEdit->SetModifyHdl( aLk );
-    m_pLinePosDLB->SetSelectHdl( aLk2 );
+    m_pLinePosDLB->SetSelectHdl(LINK(this, SwColumnPage, UpdateColMgrListBox));
 
     // Separator line
     m_pLineTypeDLB->SetUnit( FUNIT_POINT );
@@ -525,29 +525,7 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet)
             m_pLineWidthEdit->GetDecimalDigits( ),
             m_pLineWidthEdit->GetUnit(), MapUnit::MapTwip ));
     m_pLineTypeDLB->SetWidth( nLineWidth );
-
-    // Fill the color listbox
-    SfxObjectShell* pDocSh = SfxObjectShell::Current();
-    XColorListRef pColorList;
-    if ( pDocSh )
-    {
-        const SfxPoolItem*  pItem = pDocSh->GetItem( SID_COLOR_TABLE );
-        if ( pItem != nullptr )
-            pColorList = static_cast<const SvxColorListItem*>(pItem)->GetColorList();
-    }
-
-    if ( pColorList.is() )
-    {
-        m_pLineColorDLB->SetUpdateMode( false );
-
-        for (long i = 0; i < pColorList->Count(); ++i )
-        {
-            const XColorEntry* pEntry = pColorList->GetColor(i);
-            m_pLineColorDLB->InsertEntry( pEntry->GetColor(), pEntry->GetName() );
-        }
-        m_pLineColorDLB->SetUpdateMode( true );
-    }
-    m_pLineColorDLB->SelectEntryPos( 0 );
+    m_pLineColorDLB->SelectEntry(COL_BLACK);
 }
 
 SwColumnPage::~SwColumnPage()
@@ -701,10 +679,18 @@ IMPL_LINK_NOARG( SwColumnPage, UpdateColMgrListBox, ListBox&, void )
 {
     UpdateColMgr(*m_pLineWidthEdit);
 }
+
+IMPL_LINK_NOARG( SwColumnPage, UpdateColMgrColorBox, SvxColorListBox&, void )
+{
+    UpdateColMgr(*m_pLineWidthEdit);
+}
+
 IMPL_LINK_NOARG( SwColumnPage, UpdateColMgr, Edit&, void )
 {
+    if (!m_pColMgr)
+        return;
     long nGutterWidth = m_pColMgr->GetGutterWidth();
-    if(m_nCols > 1)
+    if (m_nCols > 1)
     {
             // Determine whether the most narrow column is too narrow
             // for the adjusted column gap
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 43a51888edf1..691105f269ad 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -93,9 +93,9 @@ IMPL_LINK_NOARG(SwFootNotePage, LineWidthChanged_Impl, Edit&, void)
     m_pLineTypeBox->SetWidth( nVal );
 }
 
-IMPL_LINK_NOARG(SwFootNotePage, LineColorSelected_Impl, ListBox&, void)
+IMPL_LINK(SwFootNotePage, LineColorSelected_Impl, SvxColorListBox&, rColorBox, void)
 {
-    m_pLineTypeBox->SetColor( m_pLineColorBox->GetSelectEntryColor() );
+    m_pLineTypeBox->SetColor(rColorBox.GetSelectEntryColor());
 }
 
 SwFootNotePage::SwFootNotePage(vcl::Window *pParent, const SfxItemSet &rSet)
@@ -211,41 +211,9 @@ void SwFootNotePage::Reset(const SfxItemSet *rSet)
     m_pLineTypeBox->SelectEntry( pFootnoteInfo->GetLineStyle() );
 
     // Separator Color
-    SfxObjectShell*     pDocSh      = SfxObjectShell::Current();
-    XColorListRef pColorList;
-
-    OSL_ENSURE( pDocSh, "DocShell not found!" );
-
-    if ( pDocSh )
-    {
-        const SfxPoolItem* pColorItem = pDocSh->GetItem( SID_COLOR_TABLE );
-        if ( pColorItem != nullptr )
-            pColorList = static_cast<const SvxColorListItem*>(pColorItem)->GetColorList();
-    }
-
-    OSL_ENSURE( pColorList.is(), "ColorTable not found!" );
-
-    if ( pColorList.is() )
-    {
-        m_pLineColorBox->SetUpdateMode( false );
-
-        for ( long i = 0; i < pColorList->Count(); ++i )
-        {
-            const XColorEntry* pEntry = pColorList->GetColor(i);
-            m_pLineColorBox->InsertEntry( pEntry->GetColor(), pEntry->GetName() );
-        }
-        m_pLineColorBox->SetUpdateMode( true );
-    }
-
-    // select color in the list or add it as a user color
-    sal_Int32 nSelPos = m_pLineColorBox->GetEntryPos( pFootnoteInfo->GetLineColor() );
-    if( nSelPos == LISTBOX_ENTRY_NOTFOUND )
-        nSelPos = m_pLineColorBox->InsertEntry( pFootnoteInfo->GetLineColor(),
-                SVX_RESSTR(RID_SVXSTR_COLOR_USER) );
-
-    m_pLineColorBox->SetSelectHdl( LINK( this, SwFootNotePage, LineColorSelected_Impl ) );
-    m_pLineColorBox->SelectEntryPos( nSelPos );
-    m_pLineTypeBox->SetColor( pFootnoteInfo->GetLineColor() );
+    m_pLineColorBox->SelectEntry(pFootnoteInfo->GetLineColor());
+    m_pLineColorBox->SetSelectHdl(LINK(this, SwFootNotePage, LineColorSelected_Impl));
+    m_pLineTypeBox->SetColor(pFootnoteInfo->GetLineColor());
 
     // position
     m_pLinePosBox->SelectEntryPos( static_cast< sal_Int32 >(pFootnoteInfo->GetAdj()) );
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 583e2c2332dc..e622569496ca 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -23,6 +23,7 @@
 #include <hintids.hxx>
 #include <swtypes.hxx>
 #include <globals.hrc>
+#include <svx/colorbox.hxx>
 #include <svx/xtable.hxx>
 #include <uitool.hxx>
 #include <editeng/sizeitem.hxx>
@@ -102,23 +103,12 @@ SwTextGridPage::SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet) :
     m_pLinesGridRB->SetClickHdl(aGridTypeHdl);
     m_pCharsGridRB->SetClickHdl(aGridTypeHdl);
 
-    m_pColorLB->SetSelectHdl(LINK(this, SwTextGridPage, GridModifyHdl));
+    m_pColorLB->SetSelectHdl(LINK(this, SwTextGridPage, ColorModifyHdl));
     m_pPrintCB->SetClickHdl(LINK(this, SwTextGridPage, GridModifyClickHdl));
     m_pRubyBelowCB->SetClickHdl(LINK(this, SwTextGridPage, GridModifyClickHdl));
 
     m_pDisplayCB->SetClickHdl(LINK(this, SwTextGridPage, DisplayGridHdl));
 
-    XColorListRef pColorLst = XColorList::GetStdColorList();
-    m_pColorLB->InsertAutomaticEntryColor( Color( COL_AUTO ) );
-    const long nCount = pColorLst->Count();
-    for( long i = 0; i < nCount; ++i )
-    {
-        const XColorEntry* pEntry = pColorLst->GetColor(i);
-        Color aColor = pEntry->GetColor();
-        OUString sName = pEntry->GetName();
-        m_pColorLB->InsertEntry( aColor, sName );
-    }
-    m_pColorLB->SetUpdateMode( true );
     //Get the default paper mode
     SwView *pView   = ::GetActiveView();
     if( pView )
@@ -434,7 +424,7 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, SpinField&, rField, void)
             SetLinesOrCharsRanges( *m_pCharsRangeFT , m_pCharsPerLineNF->GetMax() );
         }
     }
-    GridModifyHdl(*m_pColorLB);
+    GridModifyHdl();
 }
 
 IMPL_LINK(SwTextGridPage, TextSizeLoseFocusHdl, Control&, rControl, void)
@@ -489,7 +479,7 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField&, rField, void)
         }
         //rubySize is disabled
     }
-    GridModifyHdl(*m_pColorLB);
+    GridModifyHdl();
 }
 
 IMPL_LINK(SwTextGridPage, GridTypeHdl, Button*, pButton, void)
@@ -515,7 +505,7 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, Button*, pButton, void)
         m_pCharWidthMF->Enable(false);
     }
 
-    GridModifyHdl(*m_pColorLB);
+    GridModifyHdl();
 }
 
 IMPL_LINK_NOARG(SwTextGridPage, DisplayGridHdl, Button*, void)
@@ -527,9 +517,15 @@ IMPL_LINK_NOARG(SwTextGridPage, DisplayGridHdl, Button*, void)
 
 IMPL_LINK_NOARG(SwTextGridPage, GridModifyClickHdl, Button*, void)
 {
-    GridModifyHdl(*m_pColorLB);
+    GridModifyHdl();
+}
+
+IMPL_LINK_NOARG(SwTextGridPage, ColorModifyHdl, SvxColorListBox&, void)
+{
+    GridModifyHdl();
 }
-IMPL_LINK_NOARG(SwTextGridPage, GridModifyHdl, ListBox&, void)
+
+void SwTextGridPage::GridModifyHdl()
 {
     const SfxItemSet& rOldSet = GetItemSet();
     SfxItemSet aSet(rOldSet);
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index 6d0030bee543..d3e4374ec5b5 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -28,6 +28,7 @@
 #include <cppuhelper/weak.hxx>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
+#include <svx/colorwindow.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/postitem.hxx>
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index bbaaef6cad08..d52d9a7cbbbd 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -31,6 +31,7 @@
 #include <svtools/valueset.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/tabdlg.hxx>
+#include <svx/colorbox.hxx>
 #include <fmtclbl.hxx>
 #include <colex.hxx>
 #include <prcntfld.hxx>
@@ -105,7 +106,7 @@ class SwColumnPage : public SfxTabPage
     VclPtr<FixedText>      m_pLineWidthLbl;
     VclPtr<MetricField>    m_pLineWidthEdit;
     VclPtr<FixedText>      m_pLineColorLbl;
-    VclPtr<ColorListBox>   m_pLineColorDLB;
+    VclPtr<SvxColorListBox> m_pLineColorDLB;
     VclPtr<FixedText>      m_pLineHeightLbl;
     VclPtr<MetricField>    m_pLineHeightEdit;
     VclPtr<FixedText>      m_pLinePosLbl;
@@ -146,6 +147,7 @@ class SwColumnPage : public SfxTabPage
     DECL_LINK( Down, Button *, void );
     DECL_LINK( UpdateColMgr, Edit&, void );
     DECL_LINK( UpdateColMgrListBox, ListBox&, void );
+    DECL_LINK( UpdateColMgrColorBox, SvxColorListBox&, void );
     void Timeout();
 
     void            Update(MetricField *pInteractiveField);
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 5f768e2d27a5..cfc6bf16ecbd 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -30,6 +30,7 @@
 
 #include <vcl/fixed.hxx>
 #include <svtools/ctrlbox.hxx>
+#include <svx/colorbox.hxx>
 #include <svx/fntctrl.hxx>
 #include <fontcfg.hxx>
 class SfxPrinter;
@@ -312,27 +313,26 @@ public:
 class SwRedlineOptionsTabPage : public SfxTabPage
 {
     VclPtr<ListBox>             pInsertLB;
-    VclPtr<ColorListBox>        pInsertColorLB;
+    VclPtr<SvxColorListBox>     pInsertColorLB;
     VclPtr<SvxFontPrevWindow>   pInsertedPreviewWN;
 
     VclPtr<ListBox>             pDeletedLB;
-    VclPtr<ColorListBox>        pDeletedColorLB;
+    VclPtr<SvxColorListBox>     pDeletedColorLB;
     VclPtr<SvxFontPrevWindow>   pDeletedPreviewWN;
 
     VclPtr<ListBox>             pChangedLB;
-    VclPtr<ColorListBox>        pChangedColorLB;
+    VclPtr<SvxColorListBox>     pChangedColorLB;
     VclPtr<SvxFontPrevWindow>   pChangedPreviewWN;
 
     VclPtr<ListBox>             pMarkPosLB;
-    VclPtr<ColorListBox>        pMarkColorLB;
+    VclPtr<SvxColorListBox>     pMarkColorLB;
     VclPtr<SwMarkPreview>       pMarkPreviewWN;
 
-    OUString             sAuthor;
-    OUString             sNone;
-
     DECL_LINK(AttribHdl, ListBox&, void);
+    void ChangedMaskPrev();
     DECL_LINK(ChangedMaskPrevHdl, ListBox&, void);
-    DECL_LINK(ColorHdl, ListBox&, void);
+    DECL_LINK(ChangedMaskColorPrevHdl, SvxColorListBox&, void);
+    DECL_LINK(ColorHdl, SvxColorListBox&, void);
 
     static void InitFontStyle(SvxFontPrevWindow& rExampleWin);
 
diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx
index 4ca6e8d8edc1..81a69ab2bc90 100644
--- a/sw/source/uibase/inc/pgfnote.hxx
+++ b/sw/source/uibase/inc/pgfnote.hxx
@@ -27,6 +27,7 @@
 
 #include <vcl/group.hxx>
 #include <svtools/ctrlbox.hxx>
+#include <svx/colorbox.hxx>
 
 // footnote settings TabPage
 class SwFootNotePage: public SfxTabPage
@@ -53,7 +54,7 @@ private:
     VclPtr<ListBox>        m_pLinePosBox;
     VclPtr<LineListBox>    m_pLineTypeBox;
     VclPtr<MetricField>    m_pLineWidthEdit;
-    VclPtr<ColorListBox>   m_pLineColorBox;
+    VclPtr<SvxColorListBox> m_pLineColorBox;
     VclPtr<MetricField>    m_pLineLengthEdit;
     VclPtr<MetricField>    m_pLineDistEdit;
 
@@ -61,7 +62,7 @@ private:
     DECL_LINK( HeightMetric, Button*, void );
     DECL_LINK( HeightModify, Control&, void );
     DECL_LINK( LineWidthChanged_Impl, Edit&, void );
-    DECL_LINK( LineColorSelected_Impl, ListBox&, void );
+    DECL_LINK( LineColorSelected_Impl, SvxColorListBox&, void );
 
     long            lMaxHeight;
 
diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx
index be73daec9483..ab560a6baa31 100644
--- a/sw/source/uibase/inc/pggrid.hxx
+++ b/sw/source/uibase/inc/pggrid.hxx
@@ -24,6 +24,7 @@
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <svtools/ctrlbox.hxx>
+#include <svx/colorbox.hxx>
 
 // TabPage Format/(Styles/)Page/Text grid
 class SwTextGridPage: public SfxTabPage
@@ -57,7 +58,7 @@ class SwTextGridPage: public SfxTabPage
 
     VclPtr<CheckBox>        m_pDisplayCB;
     VclPtr<CheckBox>        m_pPrintCB;
-    VclPtr<ColorListBox>    m_pColorLB;
+    VclPtr<SvxColorListBox> m_pColorLB;
 
     sal_Int32       m_nRubyUserValue;
     bool        m_bRubyUserValue;
@@ -71,12 +72,14 @@ class SwTextGridPage: public SfxTabPage
     void PutGridItem(SfxItemSet& rSet);
     static void SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 nValue );
 
+    void GridModifyHdl();
+
     DECL_LINK(GridTypeHdl, Button*, void);
     DECL_LINK(CharorLineChangedHdl, SpinField&, void);
     DECL_LINK(CharorLineLoseFocusdHdl, Control&, void);
     DECL_LINK(TextSizeChangedHdl, SpinField&, void);
     DECL_LINK(TextSizeLoseFocusHdl, Control&, void);
-    DECL_LINK(GridModifyHdl, ListBox&, void);
+    DECL_LINK(ColorModifyHdl, SvxColorListBox&, void);
     DECL_LINK(GridModifyClickHdl, Button*, void);
     DECL_LINK(DisplayGridHdl, Button*, void);
 
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index a0b3b3504613..d9aad7fb1c7a 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -579,16 +579,6 @@ void SwDrawShell::GetFormTextState(SfxItemSet& rSet)
     SdrView* pDrView = rSh.GetDrawView();
     const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
     const SdrObject* pObj = nullptr;
-    SvxFontWorkDialog* pDlg = nullptr;
-
-    const sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId();
-
-    SfxViewFrame* pVFrame = GetView().GetViewFrame();
-    if ( pVFrame->HasChildWindow(nId) )
-    {
-        SfxChildWindow *pChildWindow = pVFrame->GetChildWindow(nId);
-        pDlg = pChildWindow ? static_cast<SvxFontWorkDialog*>(pChildWindow->GetWindow()) : nullptr;
-    }
 
     if ( rMarkList.GetMarkCount() == 1 )
         pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
@@ -616,9 +606,6 @@ void SwDrawShell::GetFormTextState(SfxItemSet& rSet)
     }
     else
     {
-        if ( pDlg )
-            pDlg->SetColorList(XColorList::GetStdColorList());
-
         pDrView->GetAttributes( rSet );
     }
 }
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index c159843cb73c..2dde2604376f 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -239,16 +239,6 @@ void SwDrawTextShell::GetFormTextState(SfxItemSet& rSet)
     SdrView* pDrView = rSh.GetDrawView();
     const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
     const SdrObject* pObj = nullptr;
-    SvxFontWorkDialog* pDlg = nullptr;
-
-    const sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId();
-
-    SfxViewFrame* pVFrame = GetView().GetViewFrame();
-    if (pVFrame->HasChildWindow(nId))
-    {
-        SfxChildWindow* pWnd = pVFrame->GetChildWindow(nId);
-        pDlg = pWnd ? static_cast<SvxFontWorkDialog*>(pWnd->GetWindow()) : nullptr;
-    }
 
     if ( rMarkList.GetMarkCount() == 1 )
         pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
@@ -276,9 +266,6 @@ void SwDrawTextShell::GetFormTextState(SfxItemSet& rSet)
     }
     else
     {
-        if ( pDlg )
-            pDlg->SetColorList(XColorList::GetStdColorList());
-
         pDrView->GetAttributes( rSet );
     }
 }
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx b/sw/source/uibase/sidebar/PageStylesPanel.cxx
index 95985af7ed5a..cde9ae9b5612 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.cxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx
@@ -22,6 +22,7 @@
 #include <editeng/sizeitem.hxx>
 #include <editeng/paperinf.hxx>
 #include <svx/svxids.hrc>
+#include <svx/colorbox.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/rulritem.hxx>
 #include "svx/drawitem.hxx"
@@ -142,22 +143,20 @@ void PageStylesPanel::dispose()
 void PageStylesPanel::Initialize()
 {
     aCustomEntry = mpCustomEntry->GetText();
-    mpColumnCount->SetSelectHdl( LINK(this, PageStylesPanel, ModifyColumnCountHdl) );
+    mpBindings->Invalidate(SID_ATTR_PAGE_COLUMN);
+    mpBindings->Invalidate(SID_ATTR_PAGE);
+    mpBindings->Invalidate(SID_ATTR_PAGE_FILLSTYLE);
+    Update();
 
+    mpColumnCount->SetSelectHdl( LINK(this, PageStylesPanel, ModifyColumnCountHdl) );
     SvxNumOptionsTabPageHelper::GetI18nNumbering( *mpNumberSelectLB, ::std::numeric_limits<sal_uInt16>::max());
     mpNumberSelectLB->SetSelectHdl( LINK(this, PageStylesPanel, ModifyNumberingHdl) );
-
     mpLayoutSelectLB->SetSelectHdl( LINK(this, PageStylesPanel, ModifyLayoutHdl) );
     mpBgFillType->SetSelectHdl( LINK(this, PageStylesPanel, ModifyFillStyleHdl));
-    mpBgColorLB->SetSelectHdl( LINK(this, PageStylesPanel, ModifyFillColorHdl));
-    mpBgGradientLB->SetSelectHdl( LINK(this, PageStylesPanel, ModifyFillColorHdl));
+    mpBgColorLB->SetSelectHdl( LINK(this, PageStylesPanel, ModifyFillColorListHdl));
+    mpBgGradientLB->SetSelectHdl( LINK(this, PageStylesPanel, ModifyFillColorListHdl));
     mpBgHatchingLB->SetSelectHdl( LINK(this, PageStylesPanel, ModifyFillColorHdl));
     mpBgBitmapLB->SetSelectHdl( LINK(this, PageStylesPanel, ModifyFillColorHdl));
-
-    mpBindings->Invalidate(SID_ATTR_PAGE_COLUMN);
-    mpBindings->Invalidate(SID_ATTR_PAGE);
-    mpBindings->Invalidate(SID_ATTR_PAGE_FILLSTYLE);
-    Update();
 }
 
 void PageStylesPanel::Update()
@@ -180,49 +179,22 @@ void PageStylesPanel::Update()
             mpBgGradientLB->Hide();
             mpBgHatchingLB->Hide();
             mpBgColorLB->Show();
-            mpBgColorLB->Clear();
-            const SvxColorListItem aItem( *static_cast<const SvxColorListItem*>(pSh->GetItem(SID_COLOR_TABLE)));
-            mpBgColorLB->Fill(aItem.GetColorList());
-
             const Color aColor = GetColorSetOrDefault();
-            mpBgColorLB->SelectEntry( aColor );
-
-            if(mpBgColorLB->GetSelectEntryCount() == 0)
-            {
-                mpBgColorLB->InsertEntry(aColor, OUString());
-                mpBgColorLB->SelectEntry(aColor);
-            }
+            mpBgColorLB->SelectEntry(aColor);
         }
         break;
         case drawing::FillStyle_GRADIENT:
         {
-            const SvxColorListItem aItem(*static_cast<const SvxColorListItem*>(pSh->GetItem(SID_COLOR_TABLE)));
             mpBgBitmapLB->Hide();
             mpBgHatchingLB->Hide();
             mpBgColorLB->Show();
             mpBgGradientLB->Show();
-            mpBgColorLB->Clear();
-            mpBgGradientLB->Clear();
-            mpBgColorLB->Fill(aItem.GetColorList());
-            mpBgGradientLB->Fill(aItem.GetColorList());
 
             const XGradient xGradient = GetGradientSetOrDefault();
             const Color aStartColor = xGradient.GetStartColor();
+            mpBgColorLB->SelectEntry(aStartColor);
             const Color aEndColor = xGradient.GetEndColor();
-            mpBgColorLB->SelectEntry( aStartColor );
-            mpBgGradientLB->SelectEntry( aEndColor );
-
-            if(mpBgColorLB->GetSelectEntryCount() == 0)
-            {
-                mpBgColorLB->InsertEntry(aStartColor, OUString());
-                mpBgColorLB->SelectEntry(aStartColor);
-            }
-
-            if(mpBgGradientLB->GetSelectEntryCount() == 0)
-            {
-                mpBgGradientLB->InsertEntry(aEndColor, OUString());
-                mpBgGradientLB->SelectEntry(aEndColor);
-            }
+            mpBgGradientLB->SelectEntry(aEndColor);
         }
         break;
 
@@ -514,7 +486,7 @@ IMPL_LINK_NOARG(PageStylesPanel, ModifyFillStyleHdl, ListBox&, void)
     mpBgFillType->Selected();
 }
 
-IMPL_LINK_NOARG(PageStylesPanel, ModifyFillColorHdl, ListBox&, void)
+void PageStylesPanel::ModifyFillColor()
 {
     const drawing::FillStyle eXFS = (drawing::FillStyle)mpBgFillType->GetSelectEntryPos();
     SfxObjectShell* pSh = SfxObjectShell::Current();
@@ -564,6 +536,16 @@ IMPL_LINK_NOARG(PageStylesPanel, ModifyFillColorHdl, ListBox&, void)
     }
 }
 
+IMPL_LINK_NOARG(PageStylesPanel, ModifyFillColorHdl, ListBox&, void)
+{
+    ModifyFillColor();
+}
+
+IMPL_LINK_NOARG(PageStylesPanel, ModifyFillColorListHdl, SvxColorListBox&, void)
+{
+    ModifyFillColor();
+}
+
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.hxx b/sw/source/uibase/sidebar/PageStylesPanel.hxx
index c0dacdbfb10f..558b74e73a67 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.hxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.hxx
@@ -49,6 +49,7 @@
 #include <svx/pagenumberlistbox.hxx>
 
 class List;
+class SvxColorListBox;
 namespace sw { namespace sidebar {
 
 class PageStylesPanel:
@@ -94,9 +95,9 @@ private:
     ::sfx2::sidebar::ControllerItem maBgBitmapControl;
     ::sfx2::sidebar::ControllerItem maBgFillStyleControl;
 
-    VclPtr<ColorLB>         mpBgColorLB;
+    VclPtr<SvxColorListBox> mpBgColorLB;
     VclPtr<SvxFillAttrBox>  mpBgHatchingLB;
-    VclPtr<ColorLB>         mpBgGradientLB;
+    VclPtr<SvxColorListBox> mpBgGradientLB;
     VclPtr<SvxFillAttrBox>  mpBgBitmapLB;
     VclPtr<ListBox>         mpLayoutSelectLB;
     VclPtr<ListBox>         mpColumnCount;
@@ -112,11 +113,14 @@ private:
     const OUString GetHatchingSetOrDefault();
     const OUString GetBitmapSetOrDefault();
 
+    void ModifyFillColor();
+
     DECL_LINK( ModifyColumnCountHdl, ListBox&, void );
     DECL_LINK( ModifyNumberingHdl, ListBox&, void );
     DECL_LINK( ModifyLayoutHdl, ListBox&, void );
     DECL_LINK( ModifyFillStyleHdl, ListBox&, void );
     DECL_LINK( ModifyFillColorHdl, ListBox&, void );
+    DECL_LINK( ModifyFillColorListHdl, SvxColorListBox&, void );
 };
 
 } } //end of namespace sw::sidebar