1 files changed, 17 insertions, 13 deletions
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index e622569496ca..583e2c2332dc 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -23,7 +23,6 @@
 #include <hintids.hxx>
 #include <swtypes.hxx>
 #include <globals.hrc>
-#include <svx/colorbox.hxx>
 #include <svx/xtable.hxx>
 #include <uitool.hxx>
 #include <editeng/sizeitem.hxx>
@@ -103,12 +102,23 @@ SwTextGridPage::SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet) :
     m_pLinesGridRB->SetClickHdl(aGridTypeHdl);
     m_pCharsGridRB->SetClickHdl(aGridTypeHdl);
 
-    m_pColorLB->SetSelectHdl(LINK(this, SwTextGridPage, ColorModifyHdl));
+    m_pColorLB->SetSelectHdl(LINK(this, SwTextGridPage, GridModifyHdl));
     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 )
@@ -424,7 +434,7 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, SpinField&, rField, void)
             SetLinesOrCharsRanges( *m_pCharsRangeFT , m_pCharsPerLineNF->GetMax() );
         }
     }
-    GridModifyHdl();
+    GridModifyHdl(*m_pColorLB);
 }
 
 IMPL_LINK(SwTextGridPage, TextSizeLoseFocusHdl, Control&, rControl, void)
@@ -479,7 +489,7 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField&, rField, void)
         }
         //rubySize is disabled
     }
-    GridModifyHdl();
+    GridModifyHdl(*m_pColorLB);
 }
 
 IMPL_LINK(SwTextGridPage, GridTypeHdl, Button*, pButton, void)
@@ -505,7 +515,7 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, Button*, pButton, void)
         m_pCharWidthMF->Enable(false);
     }
 
-    GridModifyHdl();
+    GridModifyHdl(*m_pColorLB);
 }
 
 IMPL_LINK_NOARG(SwTextGridPage, DisplayGridHdl, Button*, void)
@@ -517,15 +527,9 @@ IMPL_LINK_NOARG(SwTextGridPage, DisplayGridHdl, Button*, void)
 
 IMPL_LINK_NOARG(SwTextGridPage, GridModifyClickHdl, Button*, void)
 {
-    GridModifyHdl();
-}
-
-IMPL_LINK_NOARG(SwTextGridPage, ColorModifyHdl, SvxColorListBox&, void)
-{
-    GridModifyHdl();
+    GridModifyHdl(*m_pColorLB);
 }
-
-void SwTextGridPage::GridModifyHdl()
+IMPL_LINK_NOARG(SwTextGridPage, GridModifyHdl, ListBox&, void)
 {
     const SfxItemSet& rOldSet = GetItemSet();
     SfxItemSet aSet(rOldSet);