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, 0 insertions, 25 deletions

diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx
index 9a97a6aed7af..a7eb77aea3e7 100644
--- a/sc/source/ui/drawfunc/drtxtob2.cxx
+++ b/sc/source/ui/drawfunc/drtxtob2.cxx
@@ -202,17 +202,8 @@ void ScDrawTextObjectBar::ExecFormText(SfxRequest& rReq)
 void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet)
 {
     const SdrObject*    pObj        = nullptr;
-    SvxFontWorkDialog*  pDlg        = nullptr;
     ScDrawView*         pDrView     = pViewData->GetView()->GetScDrawView();
     const SdrMarkList&  rMarkList   = pDrView->GetMarkedObjectList();
-    sal_uInt16              nId = SvxFontWorkChildWindow::GetChildWindowId();
-
-    SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
-    if (pViewFrm->HasChildWindow(nId))
-    {
-        SfxChildWindow* pWnd = pViewFrm->GetChildWindow(nId);
-        pDlg = pWnd ? static_cast<SvxFontWorkDialog*>(pWnd->GetWindow()) : nullptr;
-    }
 
     if ( rMarkList.GetMarkCount() == 1 )
         pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
@@ -240,22 +231,6 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet)
     }
     else
     {
-        if ( pDlg )
-        {
-            SfxObjectShell* pDocSh = SfxObjectShell::Current();
-
-            if ( pDocSh )
-            {
-                const SfxPoolItem*  pItem = pDocSh->GetItem( SID_COLOR_TABLE );
-                XColorListRef pColorList;
-
-                if ( pItem )
-                    pColorList = static_cast<const SvxColorListItem*>(pItem)->GetColorList();
-
-                if ( pColorList.is() )
-                    pDlg->SetColorList( pColorList );
-            }
-        }
         SfxItemSet aViewAttr(pDrView->GetModel()->GetItemPool());
         pDrView->GetAttributes(aViewAttr);
         rSet.Set(aViewAttr);