summaryrefslogtreecommitdiff
path: root/cui/source/options
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/options')
-rw-r--r--cui/source/options/optchart.cxx4
-rw-r--r--cui/source/options/optchart.hxx4
-rw-r--r--cui/source/options/optcolor.cxx2
-rw-r--r--cui/source/options/treeopt.cxx4
4 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 1d29a272a08c..d920d5267d61 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -73,7 +73,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 )
@@ -159,7 +159,7 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol )
{
pColorEntry = pColorTab->GetColor( i );
if( pColorEntry && pColorEntry->GetColor() == rCol )
- return SAL_STATIC_CAST( XPropertyTable*, pColorTab )->Get( pColorEntry->GetName() );
+ return SAL_STATIC_CAST( XPropertyList*, pColorTab )->Get( pColorEntry->GetName() );
}
}
return -1L;
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 300ad6c93294..54b01d0f218a 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -35,7 +35,7 @@
#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
#endif
-// header for XColorTable
+// header for XColorList
#include <svx/xtable.hxx>
#include "cfgchart.hxx"
@@ -61,7 +61,7 @@ private:
SvxChartOptions* pChartOptions;
SvxChartColorTableItem* pColorConfig;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
DECL_LINK( ResetToDefaults, void * );
DECL_LINK( ListClickedHdl, ChartColorLB * );
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index c84c2f7e1ab2..733322821399 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -945,7 +945,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
}
}
- XColorTable aColorTable( SvtPathOptions().GetPalettePath() );
+ XColorList aColorTable( SvtPathOptions().GetPalettePath() );
aColorBoxes[0]->InsertAutomaticEntry();
for( sal_Int32 i = 0; i < aColorTable.Count(); i++ )
{
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 074e5d5f6c2e..ab0ad2fbc810 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1205,7 +1205,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::GetStdColorList();
rColPage.SetColorTable( pColorTab );
rColPage.SetPageType( &nUnknownType );
@@ -2640,7 +2640,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() &&