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>

1 files changed, 7 insertions, 50 deletions

diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx
index ab2e08983b3f..f6e9ebc4eb9d 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -13,6 +13,7 @@
 #include "document.hxx"
 #include "sc.hrc"
 
+#include <svx/colorbox.hxx>
 #include <svx/xtable.hxx>
 #include <svx/drawitem.hxx>
 #include <vcl/msgbox.hxx>
@@ -66,16 +67,6 @@ void SetValue( ScDocument* pDoc, ScColorScaleEntry* pEntry, Edit& aEdit)
         aEdit.Disable();
 }
 
-void SelectColor(const Color& aColor, const OUString & aCustomName, ColorListBox& rLstBox)
-{
-    rLstBox.SelectEntry( aColor );
-    if ( rLstBox.GetSelectEntryColor() != aColor )
-    {
-        rLstBox.InsertEntry( aColor, aCustomName );
-        rLstBox.SelectEntry( aColor );
-    }
-}
-
 }
 
 ScDataBarSettingsDlg::ScDataBarSettingsDlg(vcl::Window* pWindow, const ScDataBarFormatData& rData, ScDocument* pDoc, const ScAddress& rPos):
@@ -100,14 +91,13 @@ ScDataBarSettingsDlg::ScDataBarSettingsDlg(vcl::Window* pWindow, const ScDataBar
     get( mpCbOnlyBar, "only_bar");
 
     maStrWarnSameValue = get<FixedText>("str_same_value")->GetText();
-    maCustomColor = get<FixedText>("custom_color")->GetText();
 
     Init();
 
-    ::SelectColor( rData.maPositiveColor, maCustomColor, *mpLbPos);
+    mpLbPos->SelectEntry(rData.maPositiveColor);
     mpLbFillType->SelectEntryPos( rData.mbGradient ? 1 : 0 );
-    if(rData.mpNegativeColor)
-        ::SelectColor( *rData.mpNegativeColor, maCustomColor, *mpLbNeg );
+    if (rData.mpNegativeColor)
+        mpLbNeg->SelectEntry(*rData.mpNegativeColor);
 
     switch (rData.meAxisPosition)
     {
@@ -160,42 +150,9 @@ void ScDataBarSettingsDlg::dispose()
 
 void ScDataBarSettingsDlg::Init()
 {
-    SfxObjectShell*     pDocSh      = SfxObjectShell::Current();
-    XColorListRef       pColorTable;
-
-    DBG_ASSERT( pDocSh, "DocShell not found!" );
-
-    if ( pDocSh )
-    {
-        const SfxPoolItem*  pItem = pDocSh->GetItem( SID_COLOR_TABLE );
-        if ( pItem != nullptr )
-            pColorTable = static_cast<const SvxColorListItem*>(pItem)->GetColorList();
-    }
-    if ( pColorTable.is() )
-    {
-        // filling the line color box
-        mpLbPos->SetUpdateMode( false );
-        mpLbNeg->SetUpdateMode( false );
-        mpLbAxisCol->SetUpdateMode( false );
-
-        for ( long i = 0; i < pColorTable->Count(); ++i )
-        {
-            const XColorEntry* pEntry = pColorTable->GetColor(i);
-            mpLbPos->InsertEntry( pEntry->GetColor(), pEntry->GetName() );
-            mpLbNeg->InsertEntry( pEntry->GetColor(), pEntry->GetName() );
-            mpLbAxisCol->InsertEntry( pEntry->GetColor(), pEntry->GetName() );
-
-            if(pEntry->GetColor() == Color(COL_LIGHTRED))
-                mpLbNeg->SelectEntryPos(i);
-            if(pEntry->GetColor() == Color(COL_BLACK))
-                mpLbAxisCol->SelectEntryPos(i);
-            if(pEntry->GetColor() == Color(COL_LIGHTBLUE))
-                mpLbPos->SelectEntryPos(i);
-        }
-        mpLbPos->SetUpdateMode( true );
-        mpLbNeg->SetUpdateMode( true );
-        mpLbAxisCol->SetUpdateMode( true );
-    }
+    mpLbNeg->SelectEntry(Color(COL_LIGHTRED));
+    mpLbAxisCol->SelectEntry(Color(COL_BLACK));
+    mpLbPos->SelectEntry(Color(COL_LIGHTBLUE));
     mpBtnOk->SetClickHdl( LINK( this, ScDataBarSettingsDlg, OkBtnHdl ) );
 
     mpLbTypeMin->SetSelectHdl( LINK( this, ScDataBarSettingsDlg, TypeSelectHdl ) );