Rename class XColorTable to XColorList

The class is now based on XPropertyList instead of XPropertyTable and all
of the other classed based on XPropertyList are named X..List.

82 files changed, 180 insertions, 185 deletions

diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index b852d561764d..0ddb6c1b4038 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -60,7 +60,7 @@ using namespace ::com::sun::star::chart2;
 
 sal_uInt16 View3DDialog::m_nLastPageId = 0;
 
-View3DDialog::View3DDialog(Window* pParent, const uno::Reference< frame::XModel > & xChartModel, XColorTable* pColorTable )
+View3DDialog::View3DDialog(Window* pParent, const uno::Reference< frame::XModel > & xChartModel, XColorList* pColorTable )
     : TabDialog(pParent,SchResId(DLG_3D_VIEW))
     , m_aTabControl(this,SchResId(TABCTRL))
     , m_aBtnOK(this,SchResId(BTN_OK))
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index e6548b58d112..0621e1883318 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -287,7 +287,7 @@ namespace
 ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWindow
                 , const uno::Reference< beans::XPropertySet > & xSceneProperties
                 , const uno::Reference< frame::XModel >& xChartModel
-                , XColorTable* pColorTable )
+                , XColorList* pColorTable )
                 : TabPage           ( pWindow, SchResId( TP_3D_SCENEILLUMINATION ) )
                 , m_aFT_LightSource( this, SchResId( FT_LIGHTSOURCE ) )
                 , m_aBtn_Light1( this, SchResId( BTN_LIGHT_1 ), 1 )
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
index 71c16c683bdf..990ece9af8f9 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
@@ -79,7 +79,7 @@ public:
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet > & xSceneProperties,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel,
-        XColorTable* pColorTable=0 );
+        XColorList* pColorTable=0 );
     virtual ~ThreeD_SceneIllumination_TabPage();
 
     // has to be called in case the dialog was closed with OK
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index bf1096a26e25..0f209a85afb3 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -94,7 +94,7 @@ ViewElementListProvider::~ViewElementListProvider()
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-XColorTable*   ViewElementListProvider::GetColorTable() const
+XColorList*   ViewElementListProvider::GetColorTable() const
 {
     if(m_pDrawModelWrapper)
         return m_pDrawModelWrapper->GetColorTable();
diff --git a/chart2/source/controller/inc/ViewElementListProvider.hxx b/chart2/source/controller/inc/ViewElementListProvider.hxx
index b6e2b79f93b3..ef1ced680dda 100644
--- a/chart2/source/controller/inc/ViewElementListProvider.hxx
+++ b/chart2/source/controller/inc/ViewElementListProvider.hxx
@@ -46,7 +46,7 @@ public:
     ViewElementListProvider( DrawModelWrapper* pDrawModelWrapper );
     virtual ~ViewElementListProvider();
 
-    XColorTable*    GetColorTable() const;
+    XColorList*     GetColorTable() const;
     XDashList*      GetDashList() const;
     XLineEndList*   GetLineEndList() const;
     XGradientList*  GetGradientList() const;
diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx
index d9e82e93000c..699916ff7b88 100644
--- a/chart2/source/controller/inc/dlg_View3D.hxx
+++ b/chart2/source/controller/inc/dlg_View3D.hxx
@@ -37,7 +37,7 @@
 #include <vcl/tabctrl.hxx>
 // header for class OKButton
 #include <vcl/button.hxx>
-// header for class XColorTable
+// header for class XColorList
 #include <svx/xtable.hxx>
 
 #include "ControllerLockGuard.hxx"
@@ -55,7 +55,7 @@ class View3DDialog : public TabDialog
 public:
     View3DDialog( Window* pWindow,
                   const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel,
-                  XColorTable* pColorTable=0 );
+                  XColorList* pColorTable=0 );
     ~View3DDialog();
 
     // from Dialog (base of TabDialog)
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index f633c990a16c..9f67c4b5893d 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -328,7 +328,7 @@ void ShapeController::executeDispatch_FormatArea()
                     SfxItemPool& rItemPool = pDrawViewWrapper->GetModel()->GetItemPool();
                     SfxItemSet aSet( rItemPool, rItemPool.GetFirstWhich(), rItemPool.GetLastWhich() );
                     const SvxColorTableItem* pColorItem = static_cast< const SvxColorTableItem* >( aSet.GetItem( SID_COLOR_TABLE ) );
-                    if ( pColorItem && pColorItem->GetColorTable() == &XColorTable::GetStdColorTable() )
+                    if ( pColorItem && pColorItem->GetColorTable() == &XColorList::GetStdColorTable() )
                     {
                         pDlg->DontDeleteColorTable();
                     }
diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx
index 8a39c3dd9519..f2ae17ddb2a5 100644
--- a/chart2/source/inc/chartview/DrawModelWrapper.hxx
+++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx
@@ -96,7 +96,7 @@ public:
         getUnoModel();
     SdrModel& getSdrModel();
 
-    XColorTable*    GetColorTable() const;
+    XColorList*     GetColorTable() const;
     XDashList*      GetDashList() const;
     XLineEndList*   GetLineEndList() const;
     XGradientList*  GetGradientList() const;
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index 938ba9ea9758..44f2f37c36b7 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -339,7 +339,7 @@ const SfxItemPool& DrawModelWrapper::GetItemPool() const
 {
     return this->SdrModel::GetItemPool();
 }
-XColorTable* DrawModelWrapper::GetColorTable() const
+XColorList* DrawModelWrapper::GetColorTable() const
 {
     return this->SdrModel::GetColorTable();
 }
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 2d8572ed4ab8..7766ec92fcd2 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -45,7 +45,6 @@ namespace editeng
 {
     class SvxBorderLine;
 }
-class XColorTable;
 
 #include <svx/flagsdef.hxx>
 
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index eee2bc172dfa..897916b6b829 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -43,8 +43,8 @@ class SvxAreaTabDialog : public SfxTabDialog
 private:
     SdrModel*           mpDrawModel;
 
-    XColorTable*        mpColorTab;
-    XColorTable*        mpNewColorTab;
+    XColorList*         mpColorTab;
+    XColorList*         mpNewColorTab;
     XGradientList*      mpGradientList;
     XGradientList*      mpNewGradientList;
     XHatchList*         mpHatchingList;
@@ -80,12 +80,12 @@ public:
                       const SdrView* pSdrView = NULL );
     ~SvxAreaTabDialog();
 
-    void                 SetNewColorTable( XColorTable* pColTab )
+    void                SetNewColorTable( XColorList* pColTab )
                             { mpNewColorTab = pColTab; }
-    XColorTable*         GetNewColorTable() const { return mpNewColorTab; }
-    const XColorTable*   GetColorTable() const { return mpColorTab; }
+    XColorList*         GetNewColorTable() const { return mpNewColorTab; }
+    const XColorList*   GetColorTable() const { return mpColorTab; }
 
-    void                 SetNewGradientList( XGradientList* pGrdLst)
+    void                SetNewGradientList( XGradientList* pGrdLst)
                             { mpNewGradientList = pGrdLst; }
     XGradientList*       GetNewGradientList() const
                             { return mpNewGradientList; }
@@ -243,7 +243,7 @@ private:
     const SfxItemSet&   rOutAttrs;
     RECT_POINT          eRP;
 
-    XColorTable*        pColorTab;
+    XColorList*         pColorTab;
     XGradientList*      pGradientList;
     XHatchList*         pHatchingList;
     XBitmapList*        pBitmapList;
@@ -298,7 +298,7 @@ public:
     virtual int  DeactivatePage( SfxItemSet* pSet );
     virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
 
-    void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+    void    SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
     void    SetGradientList( XGradientList* pGrdLst)
                 { pGradientList = pGrdLst; }
     void    SetHatchingList( XHatchList* pHtchLst)
@@ -343,7 +343,7 @@ private:
     const SfxItemSet&   rOutAttrs;
     RECT_POINT          eRP;
 
-    XColorTable*        pColorTab;
+    XColorList*         pColorTab;
     ChangeType*         pnColorTableState;
     sal_uInt16              nPageType;
     sal_uInt16              nDlgType;
@@ -375,7 +375,7 @@ public:
     virtual int  DeactivatePage( SfxItemSet* pSet );
     virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
 
-    void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+    void    SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
     void    SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }
     void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
     void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
@@ -423,7 +423,7 @@ private:
 
     const SfxItemSet&   rOutAttrs;
 
-    XColorTable*        pColorTab;
+    XColorList*         pColorTab;
     XGradientList*      pGradientList;
 
     ChangeType*         pnGradientListState;
@@ -464,7 +464,7 @@ public:
     virtual void ActivatePage( const SfxItemSet& rSet );
     virtual int  DeactivatePage( SfxItemSet* pSet );
 
-    void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+    void    SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
     void    SetGradientList( XGradientList* pGrdLst)
                 { pGradientList = pGrdLst; }
 
@@ -510,7 +510,7 @@ private:
     const SfxItemSet&   rOutAttrs;
     RECT_POINT          eRP;
 
-    XColorTable*        pColorTab;
+    XColorList*         pColorTab;
     XHatchList*         pHatchingList;
 
     ChangeType*         pnHatchingListState;
@@ -554,7 +554,7 @@ public:
 
     virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
 
-    void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+    void    SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
     void    SetHatchingList( XHatchList* pHtchLst)
                 { pHatchingList = pHtchLst; }
 
@@ -602,7 +602,7 @@ private:
 
     const SfxItemSet&   rOutAttrs;
 
-    XColorTable*        pColorTab;
+    XColorList*         pColorTab;
     XBitmapList*        pBitmapList;
 
     ChangeType*         pnBitmapListState;
@@ -648,7 +648,7 @@ public:
 
     virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
 
-    void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+    void    SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
     void    SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; }
 
     void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
@@ -714,7 +714,7 @@ private:
 
     const SfxItemSet&   rOutAttrs;
 
-    XColorTable*        pColorTab;
+    XColorList*         pColorTab;
 
     ChangeType*         pnColorTableState;
     sal_uInt16*             pPageType;
@@ -770,7 +770,7 @@ public:
     virtual void ActivatePage( const SfxItemSet& rSet );
     virtual int  DeactivatePage( SfxItemSet* pSet );
 
-    void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+    void    SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
 
     void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
     void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 3952b9f3a2aa..31481a571114 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -46,8 +46,8 @@ private:
 
     const SfxItemSet&   rOutAttrs;
 
-    XColorTable*        pColorTab;
-    XColorTable*        mpNewColorTab;
+    XColorList*         pColorTab;
+    XColorList*         mpNewColorTab;
     XDashList*          pDashList;
     XDashList*          pNewDashList;
     XLineEndList*       pLineEndList;
@@ -91,9 +91,9 @@ public:
     XLineEndList*       GetNewLineEndList() const { return pNewLineEndList; }
     const XLineEndList* GetLineEndList() const { return pLineEndList; }
 
-    void                SetNewColorTable( XColorTable* pColTab ) { mpNewColorTab = pColTab; }
-    XColorTable*        GetNewColorTable() const { return mpNewColorTab; }
-    const XColorTable*  GetColorTable() const { return pColorTab; }
+    void                SetNewColorTable( XColorList* pColTab ) { mpNewColorTab = pColTab; }
+    XColorList*         GetNewColorTable() const { return mpNewColorTab; }
+    const XColorList*   GetColorTable() const { return pColorTab; }
 };
 
 /*************************************************************************
@@ -172,7 +172,7 @@ private:
     XLineAttrSetItem    aXLineAttr;
     SfxItemSet&         rXLSet;
 
-    XColorTable*        pColorTab;
+    XColorList*         pColorTab;
     XDashList*          pDashList;
     XLineEndList*       pLineEndList;
 
@@ -232,7 +232,7 @@ public:
 
     virtual void FillUserData();
 
-    void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+    void    SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
     void    SetDashList( XDashList* pDshLst ) { pDashList = pDshLst; }
     void    SetLineEndList( XLineEndList* pLneEndLst) { pLineEndList = pLneEndLst; }
     void    SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index d830d92d2744..5760c58c8b6e 100644
--- a/cui/source/inc/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
@@ -32,7 +32,7 @@
 
 #include <sfx2/tabdlg.hxx>
 
-class XColorTable;
+class XColorList;
 class XGradientList;
 class XHatchList;
 class XBitmapList;
@@ -43,7 +43,7 @@ class SvxFormatCellsDialog : public SfxTabDialog
 private:
     const SfxItemSet&   mrOutAttrs;
 
-    XColorTable*        mpColorTab;
+    XColorList*         mpColorTab;
     XGradientList*      mpGradientList;
     XHatchList*         mpHatchingList;
     XBitmapList*        mpBitmapList;
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index fcf2e8b34944..178786e0be4a 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -47,7 +47,7 @@ CreateTabPage   GetSSOCreator( void );
 class SfxModule;
 class SfxShell;
 class SfxItemSet;
-class XColorTable;
+class XColorList;
 class OfaOptionsTreeListBox : public SvTreeListBox
 {
     using  SvListView::Collapse;
@@ -200,7 +200,7 @@ private:
 
     // for the ColorTabPage
     SfxItemSet*     pColorPageItemSet;
-    XColorTable*    pColorTab;
+    XColorList*     pColorTab;
     sal_uInt16          nChangeType;
     sal_uInt16          nUnknownType;
     sal_uInt16          nUnknownPos;
@@ -272,7 +272,7 @@ public:
     void                ApplyItemSets();
 
     sal_uInt16              GetColorChanged() const { return nChangeType; }
-    XColorTable*        GetColorTable() { return pColorTab; }
+    XColorList*         GetColorTable() { return pColorTab; }
 
     // helper functions to call the language settings TabPage from the SpellDialog
     static void         ApplyLanguageOptions(const SfxItemSet& rSet);
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index a9809be47f63..0279a352b6df 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -81,7 +81,7 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage( Window* pParent, const SfxItemSe
     aValSetColorBox.Show();
 
     pChartOptions = new SvxChartOptions;
-    pColorTab = new XColorTable( SvtPathOptions().GetPalettePath() );
+    pColorTab = new XColorList( SvtPathOptions().GetPalettePath() );
 
     const SfxPoolItem* pItem = NULL;
     if ( rInAttrs.GetItemState( SID_SCH_EDITOPTIONS, sal_False, &pItem ) == SFX_ITEM_SET )
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 1b457dd64385..1b2d528e59df 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -38,7 +38,7 @@
 #include <svx/dlgctrl.hxx>
 // header for PushButton
 #include <vcl/button.hxx>
-// header for XColorTable
+// header for XColorList
 #include <svx/xtable.hxx>
 
 #include "cfgchart.hxx"
@@ -67,7 +67,7 @@ private:
 
     SvxChartOptions*        pChartOptions;
     SvxChartColorTableItem* pColorConfig;
-    XColorTable*            pColorTab;
+    XColorList*             pColorTab;
 
     DECL_LINK( ResetToDefaults, void * );
     DECL_LINK( AddChartColor, void * );
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index bb7cd1506b4d..f8734841a9e5 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -953,7 +953,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
         }
     }
 
-    XColorTable aColorTable( SvtPathOptions().GetPalettePath() );
+    XColorList aColorTable( SvtPathOptions().GetPalettePath() );
     for( sal_Int32 i = 0; i < aColorTable.Count(); i++ )
     {
         XColorEntry* pEntry = aColorTable.GetColor(i);
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 3673960c57c6..de22b1f8cebd 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1166,7 +1166,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG )
                 if ( SfxViewFrame::Current() && SfxViewFrame::Current()->GetDispatcher() )
                     pPtr = (const OfaPtrItem*)SfxViewFrame::Current()->
                         GetDispatcher()->Execute( SID_GET_COLORTABLE, SFX_CALLMODE_SYNCHRON );
-                pColorTab = pPtr ? (XColorTable*)pPtr->GetValue() : &XColorTable::GetStdColorTable();
+                pColorTab = pPtr ? (XColorList*)pPtr->GetValue() : &XColorList::GetStdColorTable();
 
                 rColPage.SetColorTable( pColorTab );
                 rColPage.SetPageType( &nUnknownType );
@@ -2617,7 +2617,7 @@ short OfaTreeOptionsDialog::Execute()
                 const OfaPtrItem* pPtr = (const OfaPtrItem*)SfxViewFrame::Current()->GetDispatcher()->Execute( SID_GET_COLORTABLE, SFX_CALLMODE_SYNCHRON );
                 if( pPtr )
                 {
-                    XColorTable* _pColorTab = (XColorTable*)pPtr->GetValue();
+                    XColorList* _pColorTab = (XColorList*)pPtr->GetValue();
 
                     if( _pColorTab &&
                         _pColorTab->GetPath() == GetColorTable()->GetPath() &&
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index f3db1a861b48..86eb2220cf1e 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1133,7 +1133,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
 {
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
     const SfxPoolItem* pItem = NULL;
-    XColorTable* pColorTable = NULL;
+    XColorList* pColorTable = NULL;
     const Size aSize15x15 = Size( 15, 15 );
     bool bOwn = false;
 
@@ -1143,7 +1143,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
     if ( !pColorTable )
     {
         bOwn = true;
-        pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
+        pColorTable = new XColorList( SvtPathOptions().GetPalettePath() );
     }
 
     if ( pColorTable )
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 98aeae83afcb..aa6466e4fa04 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -40,7 +40,7 @@
 
 #define LINESTYLE_HTML_MAX 5
 
-#include <svx/xtable.hxx>               // XColorTable
+#include <svx/xtable.hxx>               // XColorList
 #include <svx/drawitem.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/shaditem.hxx>
@@ -274,10 +274,10 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
     FillValueSets();
     FillLineListBox_Impl();
 
-    // ColorBox aus der XColorTable fuellen.
+    // ColorBox aus der XColorList fuellen.
     SfxObjectShell*     pDocSh      = SfxObjectShell::Current();
     const SfxPoolItem*  pItem       = NULL;
-    XColorTable*        pColorTable = NULL;
+    XColorList*         pColorTable = NULL;
 
     DBG_ASSERT( pDocSh, "DocShell not found!" );
 
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 517ae4c0bfcc..33309de97100 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -47,7 +47,7 @@
 
 #include "chardlg.hrc"
 
-#include <svx/xtable.hxx>       // XColorTable
+#include <svx/xtable.hxx>       // XColorList
 #include "chardlg.hxx"
 #include "editeng/fontitem.hxx"
 #include <editeng/postitem.hxx>
@@ -458,7 +458,7 @@ void SvxCharNamePage::Initialize()
     // fill the color box
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
     //DBG_ASSERT( pDocSh, "DocShell not found!" );
-    XColorTable* pColorTable = NULL;
+    XColorList* pColorTable = NULL;
     bool bKillTable = false;
     const SfxPoolItem* pItem = NULL;
 
@@ -471,7 +471,7 @@ void SvxCharNamePage::Initialize()
 
     if ( !pColorTable )
     {
-        pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
+        pColorTable = new XColorList( SvtPathOptions().GetPalettePath() );
         bKillTable = true;
     }
 
@@ -1527,7 +1527,7 @@ void SvxCharEffectsPage::Initialize()
     // fill the color box
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
     DBG_ASSERT( pDocSh, "DocShell not found!" );
-    XColorTable* pColorTable = NULL;
+    XColorList* pColorTable = NULL;
     bool bKillTable = false;
 
     if ( pDocSh )
@@ -1539,7 +1539,7 @@ void SvxCharEffectsPage::Initialize()
 
     if ( !pColorTable )
     {
-        pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
+        pColorTable = new XColorList( SvtPathOptions().GetPalettePath() );
         bKillTable = true;
     }
 
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 42cde8c17fb2..4a47004c8b11 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1342,7 +1342,7 @@ void    SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
     {
         SfxObjectShell* pDocSh = SfxObjectShell::Current();
         DBG_ASSERT( pDocSh, "DocShell not found!" );
-        XColorTable* pColorTable = NULL;
+        XColorList* pColorTable = NULL;
         bool bKillTable = false;
         if ( pDocSh )
         {
@@ -1353,7 +1353,7 @@ void    SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
 
         if ( !pColorTable )
         {
-            pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
+            pColorTable = new XColorList( SvtPathOptions().GetPalettePath() );
             bKillTable = true;
         }
 
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 01dc8e08ce18..0a49fa99118c 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -756,12 +756,12 @@ IMPL_LINK( SvxColorTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
             aPathURL.removeFinalSlash();
 
             // Tabelle speichern
-            XColorTable* pColTab = new XColorTable( aPathURL.GetMainURL( INetURLObject::NO_DECODE ), pXPool );
+            XColorList* pColTab = new XColorList( aPathURL.GetMainURL( INetURLObject::NO_DECODE ), pXPool );
             pColTab->SetName( aURL.getName() ); // XXX
             if( pColTab->Load() )
             {
                 // Pruefen, ob Tabelle geloescht werden darf:
-                const XColorTable *pTempTable = 0;
+                const XColorList *pTempTable = 0;
                 SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( DLGWIN );
                 SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( DLGWIN );
                 if( pArea )
diff --git a/editeng/inc/editeng/itemtype.hxx b/editeng/inc/editeng/itemtype.hxx
index abf1dae39b59..a54be72cde4f 100644
--- a/editeng/inc/editeng/itemtype.hxx
+++ b/editeng/inc/editeng/itemtype.hxx
@@ -42,7 +42,6 @@
 #include "editeng/editengdllapi.h"
 
 class Color;
-class XColorTable;
 class IntlWrapper;
 // static and prototypes -------------------------------------------------
 
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 75b61bda4195..6f5c934bc92c 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -683,7 +683,7 @@ namespace pcr
         :OColorControl_Base( PropertyControlType::ColorListBox, pParent, nWinStyle )
     {
         // initialize the color listbox
-        XColorTable* pColorTable = NULL;
+        XColorList* pColorTable = NULL;
         SfxObjectShell* pDocSh = SfxObjectShell::Current();
         const SfxPoolItem* pItem = pDocSh ? pDocSh->GetItem( SID_COLOR_TABLE ) : NULL;
         if ( pItem )
@@ -693,7 +693,7 @@ namespace pcr
         }
 
         if ( !pColorTable )
-            pColorTable = &XColorTable::GetStdColorTable();
+            pColorTable = &XColorList::GetStdColorTable();
 
 
         DBG_ASSERT(pColorTable, "OColorControl::OColorControl: no color table!");
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 2825cba14163..aad4c9bc5fd0 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -151,7 +151,7 @@ OColorPopup::OColorPopup(Window* _pParent,Condition* _pCondition)
     m_aColorSet.SetHelpId( HID_RPT_POPUP_COLOR_CTRL );
     SetHelpId( HID_RPT_POPUP_COLOR );
     const Size aSize12( 13, 13 );
-    ::std::auto_ptr<XColorTable> pColorTable(new XColorTable( SvtPathOptions().GetPalettePath() ));
+    ::std::auto_ptr<XColorList> pColorTable(new XColorList( SvtPathOptions().GetPalettePath() ));
     short i = 0;
     long nCount = pColorTable->Count();
     XColorEntry* pEntry = NULL;
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 6fafee3d07ca..abde2bced493 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -50,7 +50,7 @@
 #include <editeng/charscaleitem.hxx>
 #include <svx/algitem.hxx>
 #include <svx/svdpagv.hxx>
-#include <svx/xtable.hxx>       // XColorTable
+#include <svx/xtable.hxx>       // XColorList
 #include <editeng/brshitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/emphitem.hxx>
@@ -657,7 +657,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
     };
     Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow );
     ::std::auto_ptr<FontList> pFontList(new FontList( pParent ));
-    ::std::auto_ptr<XColorTable> pColorTable( new XColorTable( SvtPathOptions().GetPalettePath() ));
+    ::std::auto_ptr<XColorList> pColorTable( new XColorList( SvtPathOptions().GetPalettePath() ));
     SfxPoolItem* pDefaults[] =
     {
         new SvxFontItem(ITEMID_FONT),
@@ -771,7 +771,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R
             // #i74099# by default, the dialog deletes the current color table if a different one is loaded
             // (see SwDrawShell::ExecDrawDlg)
             const SvxColorTableItem* pColorItem = static_cast<const SvxColorTableItem*>( pDescriptor->GetItem(SID_COLOR_TABLE) );
-            if (pColorItem && pColorItem->GetColorTable() == &XColorTable::GetStdColorTable())
+            if (pColorItem && pColorItem->GetColorTable() == &XColorList::GetStdColorTable())
                 pDialog->DontDeleteColorTable();
             bSuccess = ( RET_OK == pDialog->Execute() );
             if ( bSuccess )
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 6ca827a9ae23..97ed45e9a5e6 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -80,7 +80,7 @@ namespace sfx2 {
 class SvxSearchItem;
 class SvxShadowItem;
 class Window;
-class XColorTable;
+class XColorList;
 
 struct ScAttrEntry;
 class ScAutoFormatData;
@@ -235,7 +235,7 @@ private:
     SfxPrinter*         pPrinter;
     VirtualDevice*      pVirtualDevice_100th_mm;
     ScDrawLayer*        pDrawLayer;                     // SdrModel
-    XColorTable*        pColorTable;
+    XColorList*         pColorTable;
     ScConditionalFormatList* pCondFormList;             // conditional formats
     ScValidationDataList* pValidationList;              // validity
     SvNumberFormatterIndexTable*    pFormatExchangeList;    // for application of number formats
@@ -434,7 +434,7 @@ public:
     void            GetDocStat( ScDocStat& rDocStat );
 
     SC_DLLPUBLIC void           InitDrawLayer( SfxObjectShell* pDocShell = NULL );
-    XColorTable*    GetColorTable();
+    XColorList*     GetColorTable();
 
     SC_DLLPUBLIC sfx2::LinkManager*     GetLinkManager() const;
 
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 191ed190406e..86bc7677f762 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -83,7 +83,7 @@ void ScDocument::BeginDrawUndo()
         pDrawLayer->BeginCalcUndo();
 }
 
-XColorTable* ScDocument::GetColorTable()
+XColorList* ScDocument::GetColorTable()
 {
     if (pDrawLayer)
         return pDrawLayer->GetColorTable();
@@ -92,7 +92,7 @@ XColorTable* ScDocument::GetColorTable()
         if (!pColorTable)
         {
             SvtPathOptions aPathOpt;
-            pColorTable = new XColorTable( aPathOpt.GetPalettePath() );
+            pColorTable = new XColorList( aPathOpt.GetPalettePath() );
         }
 
         return pColorTable;
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index e5cac4b258cc..9ef0e337bef5 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -242,11 +242,11 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) :
 
         // set color table
         SvxColorTableItem* pColItem = (SvxColorTableItem*) pObjSh->GetItem( SID_COLOR_TABLE );
-        XColorTable* pXCol = pColItem ? pColItem->GetColorTable() : &XColorTable::GetStdColorTable();
+        XColorList* pXCol = pColItem ? pColItem->GetColorTable() : &XColorList::GetStdColorTable();
         SetColorTable( pXCol );
     }
     else
-        SetColorTable( &XColorTable::GetStdColorTable() );
+        SetColorTable( &XColorList::GetStdColorTable() );
 
     SetSwapGraphics(sal_True);
 
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index a018b1943d4f..5e1cbc3121e5 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -83,7 +83,7 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, sal_Bo
         const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE );
         if ( pItem )
         {
-            XColorTable* pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
+            XColorList* pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
             if (pColorTable)
             {
                 aLbColor.SetUpdateMode( false );
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index 42421248b44c..f94bc36acffc 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -144,7 +144,7 @@ void ScDocShell::InitItems()
     else
     {
         //  always use global color table instead of local copy
-        PutItem( SvxColorTableItem( &XColorTable::GetStdColorTable(), SID_COLOR_TABLE ) );
+        PutItem( SvxColorTableItem( &XColorList::GetStdColorTable(), SID_COLOR_TABLE ) );
     }
 
     if ( !aDocument.GetForbiddenCharacters().is() ||
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 356b6b52de10..5fe6de5ffafd 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -591,7 +591,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
             {
                 //  passende ColorTable ist per PutItem gesetzt worden
                 SvxColorTableItem* pColItem = (SvxColorTableItem*)GetItem(SID_COLOR_TABLE);
-                XColorTable* pTable = pColItem->GetColorTable();
+                XColorList* pTable = pColItem->GetColorTable();
                 rReq.SetReturnValue(OfaPtrItem(SID_GET_COLORTABLE, pTable));
             }
             break;
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 2843d151141b..836d47201712 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -422,7 +422,7 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, sal_uInt16 nTabPage )
     // (see SwDrawShell::ExecDrawDlg)
     const SvxColorTableItem* pColorItem =
         static_cast<const SvxColorTableItem*>( pViewData->GetSfxDocShell()->GetItem(SID_COLOR_TABLE) );
-    if (pColorItem->GetColorTable() == &XColorTable::GetStdColorTable())
+    if (pColorItem->GetColorTable() == &XColorList::GetStdColorTable())
         pDlg->DontDeleteColorTable();
 
     if ( nTabPage != 0xffff )
diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx
index 75b1747dc3be..6f021d82b776 100644
--- a/sc/source/ui/drawfunc/drawsh4.cxx
+++ b/sc/source/ui/drawfunc/drawsh4.cxx
@@ -93,7 +93,7 @@ void ScDrawShell::GetFormTextState(SfxItemSet& rSet)
             if ( pDocSh )
             {
                 const SfxPoolItem*  pItem = pDocSh->GetItem( SID_COLOR_TABLE );
-                XColorTable*        pColorTable = NULL;
+                XColorList*         pColorTable = NULL;
 
                 if ( pItem )
                     pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx
index d85ac90fa677..4278cc976992 100644
--- a/sc/source/ui/drawfunc/drtxtob2.cxx
+++ b/sc/source/ui/drawfunc/drtxtob2.cxx
@@ -276,7 +276,7 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet)
             if ( pDocSh )
             {
                 const SfxPoolItem*  pItem = pDocSh->GetItem( SID_COLOR_TABLE );
-                XColorTable*        pColorTable = NULL;
+                XColorList*         pColorTable = NULL;
 
                 if ( pItem )
                     pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index 5fb8d609bc6f..961eef00e616 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -93,8 +93,8 @@ void ScTabBgColorDlg::FillColorValueSets_Impl()
 {
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
     const SfxPoolItem* pItem = NULL;
-    XColorTable* pColorTable = NULL;
-    ::boost::scoped_ptr<XColorTable> pOwnColorTable; // locally instantiated in case the doc shell doesn't have one.
+    XColorList* pColorTable = NULL;
+    ::boost::scoped_ptr<XColorList> pOwnColorTable; // locally instantiated in case the doc shell doesn't have one.
 
     const Size aSize15x15 = Size( 15, 15 );
     sal_uInt16 nSelectedItem = 0;
@@ -105,7 +105,7 @@ void ScTabBgColorDlg::FillColorValueSets_Impl()
         pColorTable = ( (SvxColorTableItem*)pItem )->GetColorTable();
     if ( !pColorTable )
     {
-        pOwnColorTable.reset(new XColorTable(SvtPathOptions().GetPalettePath()));
+        pOwnColorTable.reset(new XColorList(SvtPathOptions().GetPalettePath()));
         pColorTable = pOwnColorTable.get();
     }
     if ( pColorTable )
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index 6d8ac204b2eb..a93122bb4b55 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -169,7 +169,7 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ )
     aInsertColorLB.SetUpdateMode( false);
     aRemoveColorLB.SetUpdateMode( false);
 
-    XColorTable& rColorTbl = XColorTable::GetStdColorTable();
+    XColorList& rColorTbl = XColorList::GetStdColorTable();
     for( sal_uInt16 i = 0; i < rColorTbl.Count(); ++i )
     {
         XColorEntry* pEntry = rColorTbl.GetColor( i );
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 016a6658cefd..88cbb2e97070 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -337,7 +337,7 @@ void ScTpContentOptions::InitGridOpt()
         // there might be another DocShell here
         pDocSh = PTR_CAST(ScDocShell, pDocSh);
 
-        XColorTable* pColorTable = NULL;
+        XColorList* pColorTable = NULL;
 
         if ( pDocSh  )
         {
@@ -347,7 +347,7 @@ void ScTpContentOptions::InitGridOpt()
                 pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
         }
         else
-            pColorTable = &XColorTable::GetStdColorTable();
+            pColorTable = &XColorList::GetStdColorTable();
 
         if ( !pColorTable )
             return;
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index efae95e173eb..02a9b7d372fb 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -57,7 +57,7 @@ class SfxObjectShell;
 class SfxObjectShellLock;
 class SvxFieldData;
 class GDIMetaFile;
-class XColorTable;
+class XColorList;
 class SdDrawDocument;
 class SfxMedium;
 class SdrObject;
@@ -188,7 +188,7 @@ public:
     static SdAbstractDialogFactory*     Create();
 
     virtual VclAbstractDialog*          CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) = 0;
-    virtual AbstractCopyDlg*            CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorTable* pColTab, ::sd::View* pView ) = 0;
+    virtual AbstractCopyDlg*            CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorList* pColTab, ::sd::View* pView ) = 0;
     virtual AbstractSdCustomShowDlg*    CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) = 0;
     virtual SfxAbstractTabDialog*       CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) = 0;
     virtual SfxAbstractTabDialog*       CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage = sal_True ) = 0;
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index a10db789f2b6..cdd455a4ebfe 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -223,7 +223,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, con
 
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
     DBG_ASSERT( pDocSh, "DocShell not found!" );
-    XColorTable* pColorTable = NULL;
+    XColorList* pColorTable = NULL;
     bool bKillTable = false;
     const SfxPoolItem* pItem = NULL;
 
@@ -232,7 +232,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, con
 
     if ( !pColorTable )
     {
-        pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
+        pColorTable = new XColorList( SvtPathOptions().GetPalettePath() );
         bKillTable = sal_True;
     }
 
@@ -1231,7 +1231,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
     // fill the color box
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
     DBG_ASSERT( pDocSh, "DocShell not found!" );
-    XColorTable* pColorTable = NULL;
+    XColorList* pColorTable = NULL;
     bool bKillTable = false;
     const SfxPoolItem* pItem = NULL;
 
@@ -1240,7 +1240,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
 
     if ( !pColorTable )
     {
-        pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
+        pColorTable = new XColorList( SvtPathOptions().GetPalettePath() );
         bKillTable = sal_True;
     }
 
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 427ec463a5bc..2fb53f0b9d8d 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -67,7 +67,7 @@ namespace sd {
 CopyDlg::CopyDlg(
     ::Window* pWindow,
     const SfxItemSet& rInAttrs,
-    XColorTable* pColTab,
+    XColorList* pColTab,
     ::sd::View* pInView )
     : SfxModalDialog     ( pWindow, SdResId( DLG_COPY ) ),
       maFtCopies           ( this, SdResId( FT_COPIES ) ),
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index 09bdd0d4f28a..57683a9f5f19 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -396,7 +396,7 @@ VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg(
 //add for CopyDlg begin
 AbstractCopyDlg * SdAbstractDialogFactory_Impl::CreateCopyDlg(
                                             ::Window* pWindow, const SfxItemSet& rInAttrs,
-                                            XColorTable* pColTab, ::sd::View* pView ) //add for CopyDlg
+                                            XColorList* pColTab, ::sd::View* pView ) //add for CopyDlg
 {
     return new AbstractCopyDlg_Impl( new ::sd::CopyDlg( pWindow, rInAttrs, pColTab, pView ) );
 }
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index f5aa8d9d1b8c..4b6f4b76002e 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -260,7 +260,7 @@ class SdAbstractDialogFactory_Impl : public SdAbstractDialogFactory
 
 public:
     virtual VclAbstractDialog*          CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount );
-    virtual AbstractCopyDlg*            CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorTable* pColTab, ::sd::View* pView );
+    virtual AbstractCopyDlg*            CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorList* pColTab, ::sd::View* pView );
     virtual AbstractSdCustomShowDlg*    CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc );
     virtual SfxAbstractTabDialog*       CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell );
     virtual SfxAbstractTabDialog*       CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage = sal_True );
diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx
index b587e4f97a48..c853a6c72d8a 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -192,7 +192,7 @@ void DrawDocShell::Execute( SfxRequest& rReq )
         {
             //  passende ColorTable ist per PutItem gesetzt worden
             SvxColorTableItem* pColItem = (SvxColorTableItem*) GetItem( SID_COLOR_TABLE );
-            XColorTable* pTable = pColItem->GetColorTable();
+            XColorList* pTable = pColItem->GetColorTable();
             rReq.SetReturnValue( OfaPtrItem( SID_GET_COLORTABLE, pTable ) );
         }
         break;
diff --git a/sd/source/ui/inc/celltempl.hxx b/sd/source/ui/inc/celltempl.hxx
index b0164eebb7a3..ca2b3736e345 100644
--- a/sd/source/ui/inc/celltempl.hxx
+++ b/sd/source/ui/inc/celltempl.hxx
@@ -31,7 +31,7 @@
 
 #include <sfx2/styledlg.hxx>
 
-class XColorTable;
+class XColorList;
 class XGradientList;
 class XHatchList;
 class XBitmapList;
@@ -41,7 +41,7 @@ class SdrModel;
 class SdPresCellTemplateDlg : public SfxStyleDialog
 {
 private:
-    XColorTable*        mpColorTab;
+    XColorList*         mpColorTab;
     XGradientList*      mpGradientList;
     XHatchList*         mpHatchingList;
     XBitmapList*        mpBitmapList;
diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx
index e45744e39fb3..17da615a5583 100644
--- a/sd/source/ui/inc/copydlg.hxx
+++ b/sd/source/ui/inc/copydlg.hxx
@@ -36,7 +36,7 @@
 #include <vcl/fixed.hxx>
 #include <sfx2/basedlgs.hxx>
 
-class XColorTable;
+class XColorList;
 
 namespace sd {
 
@@ -52,7 +52,7 @@ class CopyDlg
 {
 public:
     CopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs,
-        XColorTable* pColTab, ::sd::View* pView );
+        XColorList* pColTab, ::sd::View* pView );
     ~CopyDlg();
 
     void    GetAttr( SfxItemSet& rOutAttrs );
@@ -89,7 +89,7 @@ private:
     PushButton          maBtnSetDefault;
 
     const SfxItemSet&   mrOutAttrs;
-    XColorTable*        mpColorTab;
+    XColorList*         mpColorTab;
     Fraction            maUIScale;
     ::sd::View*         mpView;
 
diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx
index 4dc783797025..40b931ae0e80 100644
--- a/sd/source/ui/inc/dlgpage.hxx
+++ b/sd/source/ui/inc/dlgpage.hxx
@@ -34,7 +34,7 @@
 #include "dlgpage.hrc"
 
 class SfxObjectShell;
-class XColorTable;
+class XColorList;
 class XGradientList;
 class XHatchList;
 class XBitmapList;
@@ -53,7 +53,7 @@ private:
 
     const SfxObjectShell* mpDocShell;
 
-    XColorTable*        mpColorTab;
+    XColorList*         mpColorTab;
     XGradientList*      mpGradientList;
     XHatchList*         mpHatchingList;
     XBitmapList*        mpBitmapList;
diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx
index b186f200aeca..3d502708f066 100644
--- a/sd/source/ui/inc/prltempl.hxx
+++ b/sd/source/ui/inc/prltempl.hxx
@@ -37,7 +37,7 @@
 #include "prlayout.hxx" // fuer enum PresentationObjects
 
 
-class XColorTable;
+class XColorList;
 class XGradientList;
 class XHatchList;
 class XBitmapList;
@@ -57,7 +57,7 @@ class SdPresLayoutTemplateDlg : public SfxTabDialog
 private:
     const SfxObjectShell*   mpDocShell;
 
-    XColorTable*        pColorTab;
+    XColorList*         pColorTab;
     XGradientList*      pGradientList;
     XHatchList*         pHatchingList;
     XBitmapList*        pBitmapList;
diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx
index b7e46f603d0e..fccf3f789276 100644
--- a/sd/source/ui/inc/tabtempl.hxx
+++ b/sd/source/ui/inc/tabtempl.hxx
@@ -35,7 +35,7 @@
 class SdrModel;
 class SfxObjectShell;
 class SdrView;
-class XColorTable;
+class XColorList;
 class XGradientList;
 class XBitmapList;
 class XDashList;
@@ -54,7 +54,7 @@ private:
     const SfxObjectShell&   rDocShell;
     SdrView*                pSdrView;
 
-    XColorTable*        pColorTab;
+    XColorList*         pColorTab;
     XGradientList*      pGradientList;
     XHatchList*         pHatchingList;
     XBitmapList*        pBitmapList;
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index 58f701d55a59..f3fd62d5e6c0 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -93,7 +93,7 @@ private:
     const SfxItemSet&       rOutAttrs;
     const ::sd::View*       mpView;
     SdDrawDocument*         mpDoc;
-    XColorTable*            pColTab;
+    XColorList*             pColTab;
 
     sal_Bool                    bTreeUpdated;
     std::vector<com::sun::star::presentation::ClickAction> maCurrentActions;
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 8ade950c35a5..b09c4c4e74d5 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -264,7 +264,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
                         aPathURL.removeSegment();
                         aPathURL.removeFinalSlash();
 
-                        XColorTable* pColTab = new XColorTable( aPathURL.GetMainURL( INetURLObject::NO_DECODE ), (XOutdevItemPool*)&pDoc->GetPool() );
+                        XColorList* pColTab = new XColorList( aPathURL.GetMainURL( INetURLObject::NO_DECODE ), (XOutdevItemPool*)&pDoc->GetPool() );
                         pColTab->SetName( aURL.getName() );
                         if( pColTab->Load() )
                         {
diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx
index 3236078794ac..6848337a85ef 100644
--- a/svx/inc/svx/bmpmask.hxx
+++ b/svx/inc/svx/bmpmask.hxx
@@ -124,7 +124,7 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
     CheckBox            aCbxTrans;
     ColorLB             aLbColorTrans;
 
-    const XColorTable*  pColTab;
+    const XColorList*   pColTab;
     Color               aPipetteColor;
     SvxBmpMaskSelectItem aSelItem;
 
@@ -165,7 +165,7 @@ public:
     void                PipetteClicked();
 
     sal_Bool                NeedsColorTable() const;
-    void                SetColorTable( const XColorTable* pColorTable );
+    void                SetColorTable( const XColorList* pColorTable );
 
     void                SetExecState( sal_Bool bEnable );
 
diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx
index 9d91a424b444..9470c78657b6 100644
--- a/svx/inc/svx/colrctrl.hxx
+++ b/svx/inc/svx/colrctrl.hxx
@@ -35,7 +35,7 @@
 #include <svl/lstner.hxx>
 #include "svx/svxdllapi.h"
 
-class XColorTable;
+class XColorList;
 class SvData;
 
 /*************************************************************************
@@ -100,12 +100,12 @@ class SvxColorDockingWindow : public SfxDockingWindow, public SfxListener
  friend class SvxColorChildWindow;
 
 private:
-    XColorTable*        pColorTable;
+    XColorList*         pColorTable;
     SvxColorValueSet    aColorSet;
-    sal_uInt16              nLeftSlot;
-    sal_uInt16              nRightSlot;
-    sal_uInt16              nCols;
-    sal_uInt16              nLines;
+    sal_uInt16          nLeftSlot;
+    sal_uInt16          nRightSlot;
+    sal_uInt16          nCols;
+    sal_uInt16          nLines;
     long                nCount;
     Size                aColorSize;
     Size                aItemSize;
diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx
index 0ccda5df85f8..7fc7d8cca346 100644
--- a/svx/inc/svx/dlgctrl.hxx
+++ b/svx/inc/svx/dlgctrl.hxx
@@ -39,7 +39,7 @@
 class XBitmapEntry;
 class XBitmapList;
 class XColorEntry;
-class XColorTable;
+class XColorList;
 class XDash;
 class XDashEntry;
 class XDashList;
@@ -262,7 +262,7 @@ public:
          ColorLB( Window* pParent, ResId Id ) : ColorListBox( pParent, Id ) {}
          ColorLB( Window* pParent, WinBits aWB ) : ColorListBox( pParent, aWB ) {}
 
-    virtual void Fill( const XColorTable* pTab );
+    virtual void Fill( const XColorList* pTab );
 
     void Append( XColorEntry* pEntry, Bitmap* pBmp = NULL );
     void Modify( XColorEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
@@ -356,7 +356,7 @@ private:
 public:
          FillAttrLB( Window* pParent, WinBits aWB );
 
-    virtual void Fill( const XColorTable* pTab );
+    virtual void Fill( const XColorList* pTab );
     virtual void Fill( const XHatchList* pList );
     virtual void Fill( const XGradientList* pList );
     virtual void Fill( const XBitmapList* pList );
diff --git a/svx/inc/svx/drawitem.hxx b/svx/inc/svx/drawitem.hxx
index 42fbfd2bcd35..6264ccbbd27b 100644
--- a/svx/inc/svx/drawitem.hxx
+++ b/svx/inc/svx/drawitem.hxx
@@ -39,16 +39,16 @@
 //  SvxColorTableItem
 //==================================================================
 
-class XColorTable;
+class XColorList;
 
 class SVX_DLLPUBLIC SvxColorTableItem: public SfxPoolItem
 {
-    XColorTable*            pColorTable;
+    XColorList*             pColorTable;
 
 public:
                             TYPEINFO();
                             SvxColorTableItem();
-                            SvxColorTableItem( XColorTable* pTable,
+                            SvxColorTableItem( XColorList* pTable,
                                     sal_uInt16 nWhich  );
                             SvxColorTableItem( const SvxColorTableItem& );
 
@@ -62,8 +62,8 @@ public:
     virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
-    XColorTable*            GetColorTable() const { return pColorTable; }
-    void                    SetColorTable( XColorTable* pTable ) {
+    XColorList*             GetColorTable() const { return pColorTable; }
+    void                    SetColorTable( XColorList* pTable ) {
                                     pColorTable = pTable; }
 };
 
diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx
index 86d29f6184bc..bd67fd103c6c 100644
--- a/svx/inc/svx/fontwork.hxx
+++ b/svx/inc/svx/fontwork.hxx
@@ -135,7 +135,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
 
     ImageList       maImageList;
 
-    const XColorTable* pColorTable;
+    const XColorList* pColorTable;
 
 #ifdef _SVX_FONTWORK_CXX
  friend class SvxFontWorkChildWindow;
@@ -181,7 +181,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
                         const ResId& rResId );
     ~SvxFontWorkDialog();
 
-    void SetColorTable(const XColorTable* pTable);
+    void SetColorTable(const XColorList* pTable);
     void SetActive(sal_Bool bActivate = sal_True);
 
     void CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index d4a30a3f4e19..77c799508939 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -79,7 +79,7 @@ class SfxStyleSheet;
 class SfxUndoAction;
 class SfxUndoManager;
 class XBitmapList;
-class XColorTable;
+class XColorList;
 class XDashList;
 class XGradientList;
 class XHatchList;
@@ -276,7 +276,7 @@ public:
     bool            mbInDestruction;
 
     // Zeiger auf Paletten, Listen und Tabellen
-    XColorTable*    pColorTable;
+    XColorList*     pColorTable;
     XDashList*      pDashList;
     XLineEndList*   pLineEndList;
     XHatchList*     pHatchList;
@@ -645,8 +645,8 @@ public:
 
     // Accessor methods for Palettes, Lists and Tabeles
     // FIXME: this badly needs re-factoring ...
-    void            SetColorTable(XColorTable* pTable)       { pColorTable=pTable; }
-    XColorTable*    GetColorTable() const                    { return pColorTable; }
+    void            SetColorTable(XColorList* pTable)       { pColorTable=pTable; }
+    XColorList*     GetColorTable() const                    { return pColorTable; }
     void            SetDashList(XDashList* pList)            { pDashList=pList; }
     XDashList*      GetDashList() const                      { return pDashList; }
     void            SetLineEndList(XLineEndList* pList)      { pLineEndList=pList; }
diff --git a/svx/inc/svx/xattr.hxx b/svx/inc/svx/xattr.hxx
index 97bfff4336ac..be117e6b14c6 100644
--- a/svx/inc/svx/xattr.hxx
+++ b/svx/inc/svx/xattr.hxx
@@ -28,8 +28,6 @@
 #ifndef _XATTR_HXX
 #define _XATTR_HXX
 
-class XColorTable;
-
 #include <svx/xit.hxx>
 #include <svx/xcolit.hxx>
 #include <svx/xgrad.hxx>
diff --git a/svx/inc/svx/xcolit.hxx b/svx/inc/svx/xcolit.hxx
index 49e1ff4ee976..db92241bf3d9 100644
--- a/svx/inc/svx/xcolit.hxx
+++ b/svx/inc/svx/xcolit.hxx
@@ -34,7 +34,7 @@
 
 #include <svx/xit.hxx>
 
-class XColorTable;
+class XColorList;
 
 //-----------------
 // class XColorItem
@@ -60,7 +60,7 @@ public:
     virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
     virtual SvStream&       Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
 
-    const Color&    GetColorValue(const XColorTable* pTable = 0) const;
+    const Color&    GetColorValue(const XColorList* pTable = 0) const;
     void            SetColorValue(const Color& rNew) { aColor = rNew; Detach(); }
 };
 
diff --git a/svx/inc/svx/xit.hxx b/svx/inc/svx/xit.hxx
index 8824b9021b0a..30ef1c8469eb 100644
--- a/svx/inc/svx/xit.hxx
+++ b/svx/inc/svx/xit.hxx
@@ -35,7 +35,6 @@
 
 /************************************************************************/
 
-class XColorTable;
 class SfxItemPool;
 class NameOrIndex;
 class XPropertyList;
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index d1047f78ccb9..26306346f2ff 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -300,17 +300,17 @@ public:
 };
 
 // ------------------
-// class XColorTable
+// class XColorList
 // ------------------
 
-class SVX_DLLPUBLIC XColorTable : public XPropertyList
+class SVX_DLLPUBLIC XColorList : public XPropertyList
 {
 public:
-    explicit        XColorTable(
+    explicit        XColorList(
                         const String& rPath,
                         XOutdevItemPool* pXPool = NULL
                     );
-    virtual         ~XColorTable();
+    virtual         ~XColorList();
 
     using XPropertyList::Replace;
     using XPropertyList::Remove;
@@ -326,7 +326,7 @@ public:
     virtual sal_Bool    CreateBitmapsForUI();
     virtual Bitmap*     CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 
-    static XColorTable& GetStdColorTable();
+    static XColorList& GetStdColorTable();
 };
 
 // -------------------
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index fc4a443ff4f8..ae88d8bb17e7 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -593,7 +593,7 @@ sal_Bool SvxBmpMask::NeedsColorTable() const
 
 //-------------------------------------------------------------------------
 
-void SvxBmpMask::SetColorTable( const XColorTable* pTable )
+void SvxBmpMask::SetColorTable( const XColorList* pTable )
 {
     if ( pTable && ( pTable != pColTab ) )
     {
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 1d6404c03dcc..89df8873216e 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -976,7 +976,7 @@ XOBitmap SvxBitmapCtl::GetXBitmap()
 
 // Fills the Listbox with color and strings
 
-void ColorLB::Fill( const XColorTable* pColorTab )
+void ColorLB::Fill( const XColorList* pColorTab )
 {
     long nCount = pColorTab->Count();
     XColorEntry* pEntry;
@@ -1007,7 +1007,7 @@ void ColorLB::Modify( XColorEntry* pEntry, sal_uInt16 nPos, Bitmap*  )
 
 // Fills the Listbox with color and strings
 
-void FillAttrLB::Fill( const XColorTable* pColorTab )
+void FillAttrLB::Fill( const XColorList* pColorTab )
 {
     long nCount = pColorTab->Count();
     XColorEntry* pEntry;
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 6708f3b5cca0..3584163a823a 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -844,7 +844,7 @@ IMPL_LINK( SvxFontWorkDialog, ColorSelectHdl_Impl, void *, EMPTYARG )
     return 0;
 }
 
-void SvxFontWorkDialog::SetColorTable(const XColorTable* pTable)
+void SvxFontWorkDialog::SetColorTable(const XColorList* pTable)
 {
     if ( pTable && pTable != pColorTable )
     {
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index 50b2b9561621..09852a13fd3f 100644
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -60,7 +60,7 @@ SvxColorTableItem::SvxColorTableItem()
 
 // -----------------------------------------------------------------------
 
-SvxColorTableItem::SvxColorTableItem( XColorTable* pTable, sal_uInt16 nW ) :
+SvxColorTableItem::SvxColorTableItem( XColorList* pTable, sal_uInt16 nW ) :
     SfxPoolItem( nW ),
     pColorTable( pTable )
 {
@@ -125,7 +125,7 @@ bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt
     sal_Int64 aValue = 0;
     if ( rVal >>= aValue )
     {
-        pColorTable = (XColorTable *)(sal_uLong)aValue;
+        pColorTable = (XColorList*)(sal_uLong)aValue;
         return true;
     }
 
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index c8d87094c447..68ed040f9f04 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -762,7 +762,7 @@ bool SdrModel::IsUndoEnabled() const
 void SdrModel::ImpCreateTables()
 {
     // der Writer hat seinen eigenen ColorTable
-    if (!bExtColorTable) pColorTable=new XColorTable(aTablePath,(XOutdevItemPool*)pItemPool);
+    if (!bExtColorTable) pColorTable = new XColorList( aTablePath, (XOutdevItemPool*)pItemPool );
     pDashList    =new XDashList    (aTablePath,(XOutdevItemPool*)pItemPool);
     pLineEndList =new XLineEndList (aTablePath,(XOutdevItemPool*)pItemPool);
     pHatchList   =new XHatchList   (aTablePath,(XOutdevItemPool*)pItemPool);
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 1b5ed3ec5505..db9dcd90e079 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -830,7 +830,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
 {
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
     const SfxPoolItem* pItem = NULL;
-    XColorTable* pColorTable = NULL;
+    XColorList* pColorTable = NULL;
     sal_Bool bKillTable = sal_False;
     const Size aSize12( 13, 13 );
 
@@ -840,7 +840,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
 
     if ( !pColorTable )
     {
-        pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
+        pColorTable = new XColorList( SvtPathOptions().GetPalettePath() );
         bKillTable = sal_True;
     }
 
@@ -1011,7 +1011,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co
     {
         if (( nSID == SID_COLOR_TABLE ) && ( pState->ISA( SvxColorTableItem )))
         {
-            XColorTable* pColorTable = pState ? ((SvxColorTableItem *)pState)->GetColorTable() : NULL;
+            XColorList* pColorTable = pState ? ((SvxColorTableItem *)pState)->GetColorTable() : NULL;
 
             if ( pColorTable )
             {
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index a6451a7a66dc..6f039f11b631 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -49,7 +49,7 @@ using namespace ::cppu;
 class SvxUnoColorTable : public WeakImplHelper2< container::XNameContainer, lang::XServiceInfo >
 {
 private:
-    XColorTable*    pTable;
+    XColorList*     pTable;
 
 public:
     SvxUnoColorTable() throw();
@@ -88,7 +88,7 @@ public:
 
 SvxUnoColorTable::SvxUnoColorTable() throw()
 {
-    pTable = new XColorTable( SvtPathOptions().GetPalettePath() );
+    pTable = new XColorList( SvtPathOptions().GetPalettePath() );
 }
 
 SvxUnoColorTable::~SvxUnoColorTable() throw()
@@ -178,7 +178,7 @@ uno::Any SAL_CALL SvxUnoColorTable::getByName( const  OUString& aName )
     if( nIndex == -1 )
         throw container::NoSuchElementException();
 
-    XColorEntry* pEntry = ((XColorTable*)pTable)->GetColor( nIndex );
+    XColorEntry* pEntry = ((XColorList*)pTable)->GetColor( nIndex );
     return uno::Any( (sal_Int32) pEntry->GetColor().GetRGBColor() );
 }
 
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index afe1eccb83d3..49a64224419a 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -440,11 +440,11 @@ SvStream& XColorItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 
 /*************************************************************************
 |*
-|*    const XColor& XColorItem::GetColorValue(const XColorTable* pTable) const
+|*    const XColor& XColorItem::GetColorValue(const XColorList* pTable) const
 |*
 \************************************************************************/
 
-const Color& XColorItem::GetColorValue(const XColorTable* pTable) const
+const Color& XColorItem::GetColorValue(const XColorList* pTable) const
 {
     if (!IsIndex())
         return aColor;
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index 9beb9b9a8545..599c14319624 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -59,11 +59,11 @@ static char const aChckXML[]    = { '<', '?', 'x', 'm', 'l' };      // = 6.0
 
 /*************************************************************************
 |*
-|* XColorTable::XColorTable()
+|* XColorList::XColorList()
 |*
 *************************************************************************/
 
-XColorTable::XColorTable(
+XColorList::XColorList(
     const String& rPath,
     XOutdevItemPool* pInPool
 ) :
@@ -75,40 +75,40 @@ XColorTable::XColorTable(
 
 /************************************************************************/
 
-XColorTable::~XColorTable()
+XColorList::~XColorList()
 {
 }
 
-XColorTable& XColorTable::GetStdColorTable()
+XColorList& XColorList::GetStdColorTable()
 {
-    static XColorTable aTable(SvtPathOptions().GetPalettePath());
+    static XColorList aTable(SvtPathOptions().GetPalettePath());
     return aTable;
 }
 
 /************************************************************************/
 
-XColorEntry* XColorTable::Replace(long nIndex, XColorEntry* pEntry )
+XColorEntry* XColorList::Replace(long nIndex, XColorEntry* pEntry )
 {
     return (XColorEntry*)XPropertyList::Replace( pEntry, nIndex );
 }
 
 /************************************************************************/
 
-XColorEntry* XColorTable::Remove(long nIndex)
+XColorEntry* XColorList::Remove(long nIndex)
 {
     return (XColorEntry*) XPropertyList::Remove(nIndex);
 }
 
 /************************************************************************/
 
-XColorEntry* XColorTable::GetColor(long nIndex) const
+XColorEntry* XColorList::GetColor(long nIndex) const
 {
     return (XColorEntry*) XPropertyList::Get(nIndex, 0);
 }
 
 /************************************************************************/
 
-sal_Bool XColorTable::Load()
+sal_Bool XColorList::Load()
 {
     if( bListDirty )
     {
@@ -138,7 +138,7 @@ sal_Bool XColorTable::Load()
 
 /************************************************************************/
 
-sal_Bool XColorTable::Save()
+sal_Bool XColorList::Save()
 {
     INetURLObject aURL( aPath );
 
@@ -159,7 +159,7 @@ sal_Bool XColorTable::Save()
 
 /************************************************************************/
 
-sal_Bool XColorTable::Create()
+sal_Bool XColorList::Create()
 {
     XubString aStr;
     xub_StrLen nLen;
@@ -451,14 +451,14 @@ sal_Bool XColorTable::Create()
 
 /************************************************************************/
 
-sal_Bool XColorTable::CreateBitmapsForUI()
+sal_Bool XColorList::CreateBitmapsForUI()
 {
     return( sal_False );
 }
 
 /************************************************************************/
 
-Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
+Bitmap* XColorList::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
 {
     return( NULL );
 }
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index ca010e5dfb65..f594f758d80e 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -77,8 +77,8 @@ SwDrawDocument::SwDrawDocument( SwDoc* pD ) :
         SetObjectShell( pDocSh );
         SvxColorTableItem* pColItem = ( SvxColorTableItem* )
                                 ( pDocSh->GetItem( SID_COLOR_TABLE ) );
-        XColorTable *pXCol = pColItem ? pColItem->GetColorTable() :
-                                        &XColorTable::GetStdColorTable();
+        XColorList *pXCol = pColItem ? pColItem->GetColorTable() :
+                                        &XColorList::GetStdColorTable();
         SetColorTable( pXCol );
 
         if ( !pColItem )
@@ -93,7 +93,7 @@ SwDrawDocument::SwDrawDocument( SwDoc* pD ) :
         SetObjectShell( pDocSh );
     }
     else
-        SetColorTable( &XColorTable::GetStdColorTable() );
+        SetColorTable( &XColorList::GetStdColorTable() );
 
     // copy all the default values to the SdrModel
     SfxItemPool* pSdrPool = pD->GetAttrPool().GetSecondaryPool();
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 9ae96955dee5..47799963fac4 100755
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -976,7 +976,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
             case SID_GET_COLORTABLE:
             {
                 SvxColorTableItem* pColItem = (SvxColorTableItem*)GetItem(SID_COLOR_TABLE);
-                XColorTable* pTable = pColItem->GetColorTable();
+                XColorList* pTable = pColItem->GetColorTable();
                 rReq.SetReturnValue(OfaPtrItem(SID_GET_COLORTABLE, pTable));
             }
             break;
diff --git a/sw/source/ui/app/docshdrw.cxx b/sw/source/ui/app/docshdrw.cxx
index 73e0b0c4342c..b72cb3fe71bf 100644
--- a/sw/source/ui/app/docshdrw.cxx
+++ b/sw/source/ui/app/docshdrw.cxx
@@ -64,7 +64,7 @@ void  SwDocShell::InitDraw()
         rOutliner.SetHyphenator( xHyphenator );
     }
     else
-        PutItem( SvxColorTableItem( &XColorTable::GetStdColorTable(), SID_COLOR_TABLE ));
+        PutItem( SvxColorTableItem( &XColorList::GetStdColorTable(), SID_COLOR_TABLE ));
 }
 
 
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index f1cde365ba55..a480ac5c2f0c 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -432,9 +432,9 @@ SwDocShell::SwDocShell( SwDoc *pD, SfxObjectCreateMode eMode ):
     // when only DocInfo is read for the Explorer, the Item is not there
     if(pColItem)
     {
-        XColorTable* pTable = pColItem->GetColorTable();
+        XColorList* pTable = pColItem->GetColorTable();
         // when a new Table was created, it has to be deleted as well.
-        if(pTable  != &XColorTable::GetStdColorTable())
+        if(pTable  != &XColorList::GetStdColorTable())
             delete pTable;
     }
 
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 331863f35bfe..8a2956aac6a4 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1984,7 +1984,7 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet&  )
     aDeletedColorLB.InsertEntry(sAuthor);
     aChangedColorLB.InsertEntry(sAuthor);
 
-    XColorTable& rColorTbl = XColorTable::GetStdColorTable();
+    XColorList& rColorTbl = XColorList::GetStdColorTable();
     sal_uInt16 i;
     for( i = 0; i < rColorTbl.Count(); ++i )
     {
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 010b8e8407c5..cb5a56fb7171 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -547,7 +547,7 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
     // Fill the color listbox
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
     const SfxPoolItem*  pItem       = NULL;
-    XColorTable*        pColorTable = NULL;
+    XColorList*         pColorTable = NULL;
     if ( pDocSh )
     {
         pItem = pDocSh->GetItem( SID_COLOR_TABLE );
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index ae011c4ed296..5e2de384f9f6 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -40,7 +40,7 @@
 #include <tools/ref.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/drawitem.hxx>
-#include <svx/xtable.hxx>               // XColorTable
+#include <svx/xtable.hxx>               // XColorList
 #include <sal/macros.h>
 #include <vcl/field.hxx>
 #include <vcl/svapp.hxx>
@@ -232,7 +232,7 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet)
     // Separator Color
     SfxObjectShell*     pDocSh      = SfxObjectShell::Current();
     const SfxPoolItem*  pColorItem  = NULL;
-    XColorTable*        pColorTable = NULL;
+    XColorList*         pColorTable = NULL;
 
     OSL_ENSURE( pDocSh, "DocShell not found!" );
 
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 10f12eee823f..0f6de4bb4df2 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -148,7 +148,7 @@ SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) :
 
     aDisplayCB.SetClickHdl(LINK(this, SwTextGridPage, DisplayGridHdl));
 
-    XColorTable& rColorTbl = XColorTable::GetStdColorTable();
+    XColorList& rColorTbl = XColorList::GetStdColorTable();
     aColorLB.InsertAutomaticEntryColor( Color( COL_AUTO ) );
     for( sal_uInt16 i = 0; i < rColorTbl.Count(); ++i )
     {
diff --git a/sw/source/ui/shells/drawdlg.cxx b/sw/source/ui/shells/drawdlg.cxx
index 63b75a1acb1d..82069bf044c4 100644
--- a/sw/source/ui/shells/drawdlg.cxx
+++ b/sw/source/ui/shells/drawdlg.cxx
@@ -101,7 +101,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
             OSL_ENSURE(pDlg, "Dialogdiet fail!");
             const SvxColorTableItem* pColorItem = (const SvxColorTableItem*)
                                     GetView().GetDocShell()->GetItem(SID_COLOR_TABLE);
-            if(pColorItem->GetColorTable() == &XColorTable::GetStdColorTable())
+            if(pColorItem->GetColorTable() == &XColorList::GetStdColorTable())
                 pDlg->DontDeleteColorTable();
             if (pDlg->Execute() == RET_OK)
             {
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index 3ee2bdbf733c..f8000b63c821 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -464,7 +464,7 @@ void SwDrawShell::GetFormTextState(SfxItemSet& rSet)
     else
     {
         if ( pDlg )
-            pDlg->SetColorTable(&XColorTable::GetStdColorTable());
+            pDlg->SetColorTable(&XColorList::GetStdColorTable());
 
         pDrView->GetAttributes( rSet );
     }
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index 20c5f0707644..6d54195846d2 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -304,7 +304,7 @@ void SwDrawTextShell::GetFormTextState(SfxItemSet& rSet)
     else
     {
         if ( pDlg )
-            pDlg->SetColorTable(&XColorTable::GetStdColorTable());
+            pDlg->SetColorTable(&XColorList::GetStdColorTable());
 
         pDrView->GetAttributes( rSet );
     }