[Libreoffice-commits] .: 2 commits - chart2/source cui/source editeng/inc extensions/source reportdesign/source sc/inc sc/source sd/inc sd/source svx/inc svx/source sw/source
Joseph Powers
jpowers at kemper.freedesktop.org
Mon Aug 29 06:33:24 PDT 2011
chart2/source/controller/dialogs/dlg_View3D.cxx | 2
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 2
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx | 2
chart2/source/controller/drawinglayer/ViewElementListProvider.cxx | 2
chart2/source/controller/inc/ViewElementListProvider.hxx | 2
chart2/source/controller/inc/dlg_View3D.hxx | 4
chart2/source/controller/main/ShapeController.cxx | 2
chart2/source/inc/chartview/DrawModelWrapper.hxx | 2
chart2/source/view/main/DrawModelWrapper.cxx | 2
cui/source/inc/border.hxx | 1
cui/source/inc/cuitabarea.hxx | 36 -
cui/source/inc/cuitabline.hxx | 14
cui/source/inc/sdrcelldlg.hxx | 4
cui/source/inc/treeopt.hxx | 6
cui/source/options/optchart.cxx | 4
cui/source/options/optchart.hxx | 4
cui/source/options/optcolor.cxx | 2
cui/source/options/treeopt.cxx | 4
cui/source/tabpages/backgrnd.cxx | 4
cui/source/tabpages/border.cxx | 6
cui/source/tabpages/chardlg.cxx | 10
cui/source/tabpages/numpages.cxx | 4
cui/source/tabpages/tpcolor.cxx | 8
editeng/inc/editeng/itemtype.hxx | 1
extensions/source/propctrlr/standardcontrol.cxx | 4
reportdesign/source/ui/dlg/Condition.cxx | 2
reportdesign/source/ui/misc/UITools.cxx | 6
sc/inc/document.hxx | 6
sc/source/core/data/documen9.cxx | 4
sc/source/core/data/drwlayer.cxx | 4
sc/source/ui/dbgui/scendlg.cxx | 2
sc/source/ui/docshell/docsh2.cxx | 2
sc/source/ui/docshell/docsh4.cxx | 2
sc/source/ui/drawfunc/drawsh.cxx | 2
sc/source/ui/drawfunc/drawsh4.cxx | 2
sc/source/ui/drawfunc/drtxtob2.cxx | 2
sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 6
sc/source/ui/optdlg/opredlin.cxx | 2
sc/source/ui/optdlg/tpview.cxx | 4
sd/inc/sdabstdlg.hxx | 4
sd/source/ui/animations/CustomAnimationDialog.cxx | 8
sd/source/ui/dlg/copydlg.cxx | 2
sd/source/ui/dlg/sddlgfact.cxx | 2
sd/source/ui/dlg/sddlgfact.hxx | 2
sd/source/ui/docshell/docshel3.cxx | 2
sd/source/ui/inc/celltempl.hxx | 4
sd/source/ui/inc/copydlg.hxx | 6
sd/source/ui/inc/dlgpage.hxx | 4
sd/source/ui/inc/prltempl.hxx | 4
sd/source/ui/inc/tabtempl.hxx | 4
sd/source/ui/inc/tpaction.hxx | 2
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 2
svx/inc/svx/XPropertyTable.hxx | 2
svx/inc/svx/bmpmask.hxx | 4
svx/inc/svx/colrctrl.hxx | 12
svx/inc/svx/dlgctrl.hxx | 6
svx/inc/svx/drawitem.hxx | 10
svx/inc/svx/fontwork.hxx | 4
svx/inc/svx/svdmodel.hxx | 8
svx/inc/svx/xattr.hxx | 2
svx/inc/svx/xcolit.hxx | 4
svx/inc/svx/xit.hxx | 1
svx/inc/svx/xtable.hxx | 28 -
svx/source/dialog/_bmpmask.cxx | 2
svx/source/dialog/dlgctrl.cxx | 4
svx/source/dialog/fontwork.cxx | 2
svx/source/items/drawitem.cxx | 4
svx/source/svdraw/svdmodel.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 6
svx/source/unodraw/XPropertyTable.cxx | 6
svx/source/unodraw/unoctabl.cxx | 8
svx/source/xoutdev/xattr.cxx | 4
svx/source/xoutdev/xtabcolr.cxx | 228 +++++-----
sw/source/core/draw/drawdoc.cxx | 6
sw/source/ui/app/docsh2.cxx | 2
sw/source/ui/app/docshdrw.cxx | 2
sw/source/ui/app/docshini.cxx | 4
sw/source/ui/config/optpage.cxx | 2
sw/source/ui/frmdlg/column.cxx | 2
sw/source/ui/misc/pgfnote.cxx | 4
sw/source/ui/misc/pggrid.cxx | 2
sw/source/ui/shells/drawdlg.cxx | 2
sw/source/ui/shells/drawsh.cxx | 2
sw/source/ui/shells/drwtxtsh.cxx | 2
84 files changed, 303 insertions(+), 298 deletions(-)
New commits:
commit bbbc20bd5f4ca5ff726667869b7b7537606b2a77
Author: Joseph Powers <jpowers27 at cox.net>
Date: Mon Aug 29 06:29:06 2011 -0700
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.
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index b852d56..0ddb6c1 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 e6548b5..0621e18 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 71c16c6..990ece9 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 bf1096a..0f209a8 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 b6e2b79..ef1ced6 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 d9e82e9..699916f 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 f633c99..9f67c4b 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 8a39c3d..f2ae17d 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 938ba9e..44f2f37 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 2d8572e..7766ec9 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 eee2bc1..897916b 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 3952b9f..31481a5 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 d830d92..5760c58 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 fcf2e8b..178786e 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 a9809be..0279a35 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 1b457dd..1b2d528 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 bb7cd15..f873484 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 3673960..de22b1f 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 f3db1a8..86eb222 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 98aeae8..aa6466e 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 517ae4c..33309de 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 42cde8c..4a47004 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 01dc8e0..0a49fa9 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 abf1dae..a54be72 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 75b61bd..6f5c934 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 2825cba..aad4c9b 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 6fafee3..abde2bc 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 6ca827a..97ed45e 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 191ed19..86bc767 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 e5cac4b..9ef0e33 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 a018b19..5e1cbc3 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 4242124..f94bc36 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 356b6b5..5fe6de5 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 2843d15..836d472 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 75b1747..6f021d8 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 d85ac90..4278cc9 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 5fb8d60..961eef0 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 6d8ac20..a93122b 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 016a665..88cbb2e 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 efae95e..02a9b7d 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 a10db78..cdd455a 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 427ec46..2fb53f0 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 09bdd0d..57683a9 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 f5aa8d9..4b6f4b7 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 b587e4f..c853a6c 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 b0164ee..ca2b373 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 e45744e..17da615 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 4dc7837..40b931a 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 b186f20..3d50270 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 b7e46f6..fccf3f7 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 58f701d..f3fd62d 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 8ade950..b09c4c4 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 3236078..6848337 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 9d91a42..9470c78 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 0ccda5d..7fc7d8c 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 42fbfd2..6264ccb 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 86d29f6..bd67fd1 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 d4a30a3..77c7995 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 97bfff4..be117e6 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 49e1ff4..db92241 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 8824b90..30ef1c8 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 d1047f7..2630634 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 fc4a443..ae88d8b 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 1d6404c..89df887 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 6708f3b..3584163 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 50b2b95..09852a1 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 c8d8709..68ed040 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 1b5ed3e..db9dcd9 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 a6451a7..6f039f1 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 afe1ecc..49a6422 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 9beb9b9..599c143 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 ca010e5..f594f75 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 9ae9695..4779996 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 73e0b0c..b72cb3f 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 f1cde36..a480ac5 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 331863f..8a2956a 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 010b8e8..cb5a56f 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 ae011c4..5e2de38 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 10f12ee..0f6de4b 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 63b75a1..82069bf 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 3ee2bdb..f8000b6 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 20c5f07..6d54195 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 );
}
commit 7d7f4769b0375f64f43fe7fbc6a1129f53bbdf51
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Aug 28 21:21:35 2011 -0700
Rebase XColorTable from XPropertyTable to XPropertyList
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 68a4fad..a9809be 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -170,7 +170,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/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 5215fad..01dc8e0 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -515,7 +515,7 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
ConvertColorValues (aAktuellColor, CM_RGB);
pEntry = new XColorEntry( aAktuellColor, aName );
- pColorTab->Insert( pColorTab->Count(), pEntry );
+ pColorTab->Insert( pEntry, pColorTab->Count() );
aLbColor.Append( pEntry );
aValSetColorTable.InsertItem( aValSetColorTable.GetItemCount() + 1,
@@ -689,7 +689,7 @@ IMPL_LINK( SvxColorTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
{
pEntry = pColorTab->Remove( i + 1 );
DBG_ASSERT( pEntry, "ColorEntry nicht vorhanden (2) !" );
- pColorTab->Insert( i, pEntry );
+ pColorTab->Insert( pEntry, i );
}
// Listbox und ValueSet aktualisieren
diff --git a/svx/inc/svx/XPropertyTable.hxx b/svx/inc/svx/XPropertyTable.hxx
index d348f89..c7b57ec 100644
--- a/svx/inc/svx/XPropertyTable.hxx
+++ b/svx/inc/svx/XPropertyTable.hxx
@@ -35,7 +35,7 @@
// FIXME: should have a single factory method with an enumeration here [!]
-::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SvxUnoXColorTable_createInstance( XPropertyTable* pTable ) throw();
+::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw();
::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SvxUnoXLineEndTable_createInstance( XPropertyList* pList ) throw();
::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SvxUnoXDashTable_createInstance( XPropertyList* pList ) throw();
::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SvxUnoXHatchTable_createInstance( XPropertyList* pList ) throw();
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index c1819af..d1047f7 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -88,8 +88,10 @@ class XColorEntry : public XPropertyEntry
Color aColor;
public:
- XColorEntry(const Color& rColor, const String& rName) :
- XPropertyEntry(rName), aColor(rColor) {}
+ XColorEntry(const Color& rColor, const String& rName)
+ : XPropertyEntry(rName)
+ , aColor(rColor)
+ {}
void SetColor(const Color& rColor) { aColor = rColor; }
Color& GetColor() { return aColor; }
@@ -244,11 +246,12 @@ public:
// class XPropertyList
// --------------------
-typedef ::std::vector< XPropertyEntry* > XPropertyEntryList_impl;
-typedef ::std::vector< Bitmap* > BitmapList_impl;
class SVX_DLLPUBLIC XPropertyList
{
protected:
+ typedef ::std::vector< XPropertyEntry* > XPropertyEntryList_impl;
+ typedef ::std::vector< Bitmap* > BitmapList_impl;
+
String aName; // not persistent
String aPath;
XOutdevItemPool* pXPool;
@@ -300,7 +303,7 @@ public:
// class XColorTable
// ------------------
-class SVX_DLLPUBLIC XColorTable : public XPropertyTable
+class SVX_DLLPUBLIC XColorTable : public XPropertyList
{
public:
explicit XColorTable(
@@ -309,11 +312,12 @@ public:
);
virtual ~XColorTable();
- using XPropertyTable::Replace;
+ using XPropertyList::Replace;
+ using XPropertyList::Remove;
+ using XPropertyList::Get;
+
XColorEntry* Replace(long nIndex, XColorEntry* pEntry );
- using XPropertyTable::Remove;
XColorEntry* Remove(long nIndex);
- using XPropertyTable::Get;
XColorEntry* GetColor(long nIndex) const;
virtual sal_Bool Load();
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 4c88786..fc152e7 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -295,7 +295,7 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::hasElements( )
class SvxUnoXColorTable : public SvxUnoXPropertyTable
{
public:
- SvxUnoXColorTable( XPropertyTable* pTable ) throw() : SvxUnoXPropertyTable( XATTR_LINECOLOR, pTable ) {};
+ SvxUnoXColorTable( XPropertyList* pList ) throw() : SvxUnoXPropertyTable( XATTR_LINECOLOR, pList ) {};
// SvxUnoXPropertyTable
virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw();
@@ -309,9 +309,9 @@ public:
virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException);
};
-uno::Reference< uno::XInterface > SAL_CALL SvxUnoXColorTable_createInstance( XPropertyTable* pTable ) throw()
+uno::Reference< uno::XInterface > SAL_CALL SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw()
{
- return (OWeakObject*) new SvxUnoXColorTable( pTable );
+ return (OWeakObject*) new SvxUnoXColorTable( pList );
}
// SvxUnoXPropertyTable
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 21b2206..a6451a7 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -140,7 +140,7 @@ void SAL_CALL SvxUnoColorTable::insertByName( const OUString& aName, const uno::
if( pTable )
{
XColorEntry* pEntry = new XColorEntry( Color( (ColorData)nColor ), aName );
- pTable->Insert( pTable->Count(), pEntry );
+ pTable->Insert( pEntry, pTable->Count() );
}
}
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index 4bb6812..9beb9b9 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -67,7 +67,7 @@ XColorTable::XColorTable(
const String& rPath,
XOutdevItemPool* pInPool
) :
- XPropertyTable( rPath, pInPool )
+ XPropertyList( rPath, pInPool )
{
// ColorTable braucht keine eigene BmpTable
// pBmpTable = new Table( nInitSize, nReSize );
@@ -89,30 +89,30 @@ XColorTable& XColorTable::GetStdColorTable()
XColorEntry* XColorTable::Replace(long nIndex, XColorEntry* pEntry )
{
- return (XColorEntry*) XPropertyTable::Replace(nIndex, pEntry);
+ return (XColorEntry*)XPropertyList::Replace( pEntry, nIndex );
}
/************************************************************************/
XColorEntry* XColorTable::Remove(long nIndex)
{
- return (XColorEntry*) XPropertyTable::Remove(nIndex);
+ return (XColorEntry*) XPropertyList::Remove(nIndex);
}
/************************************************************************/
XColorEntry* XColorTable::GetColor(long nIndex) const
{
- return (XColorEntry*) XPropertyTable::Get(nIndex, 0);
+ return (XColorEntry*) XPropertyList::Get(nIndex, 0);
}
/************************************************************************/
sal_Bool XColorTable::Load()
{
- if( bTableDirty )
+ if( bListDirty )
{
- bTableDirty = sal_False;
+ bListDirty = sal_False;
INetURLObject aURL( aPath );
@@ -127,7 +127,10 @@ sal_Bool XColorTable::Load()
if( !aURL.getExtension().getLength() )
aURL.setExtension( rtl::OUString( pszExtColor, 3 ) );
- uno::Reference< container::XNameContainer > xTable( SvxUnoXColorTable_createInstance( this ), uno::UNO_QUERY );
+ uno::Reference< container::XNameContainer > xTable(
+ SvxUnoXColorTable_createInstance( this ),
+ uno::UNO_QUERY
+ );
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
return( sal_False );
@@ -213,232 +216,235 @@ sal_Bool XColorTable::Create()
for( sal_uInt16 n = 0; n < 16; ++n )
{
- Insert( n, new XColorEntry( Color( aColTab[n] ),
- String( ResId( aResId[ n ], rRes )) ) );
+ Insert( new XColorEntry(
+ Color( aColTab[n] ),
+ String( ResId( aResId[ n ], rRes ) )
+ ),
+ n
+ );
}
aStr = SVX_RESSTR( RID_SVXSTR_GREY );
aStr.AppendAscii(" 80%");
nLen = aStr.Len() - 3;
- Insert(16, new XColorEntry( Color( 51, 51, 51 ), aStr ) );
+ Insert( new XColorEntry( Color( 51, 51, 51 ), aStr ), 16 );
aStr.SetChar(nLen, sal_Unicode('7'));
- Insert(17, new XColorEntry( Color( 76, 76, 76 ), aStr ) );
+ Insert( new XColorEntry( Color( 76, 76, 76 ), aStr ), 17 );
aStr.SetChar(nLen, sal_Unicode('6'));
- Insert(18, new XColorEntry( Color(102,102,102 ), aStr ) );
+ Insert( new XColorEntry( Color(102,102,102 ), aStr ), 18 );
aStr.SetChar(nLen, sal_Unicode('4'));
- Insert(19, new XColorEntry( Color(153,153,153 ), aStr ) );
+ Insert( new XColorEntry( Color(153,153,153 ), aStr ), 19 );
aStr.SetChar(nLen, sal_Unicode('3'));
- Insert(20, new XColorEntry( Color(179,179,179 ), aStr ) );
+ Insert( new XColorEntry( Color(179,179,179 ), aStr ), 20 );
aStr.SetChar(nLen, sal_Unicode('2'));
- Insert(21, new XColorEntry( Color(204,204,204 ), aStr ) );
+ Insert( new XColorEntry( Color(204,204,204 ), aStr ), 21 );
// BM: new 15%
aStr.SetChar(nLen, sal_Unicode('1'));
aStr.SetChar(nLen + 1, sal_Unicode('5'));
- Insert(22, new XColorEntry( Color(217,217,217 ), aStr ) );
+ Insert( new XColorEntry( Color(217,217,217 ), aStr ), 22 );
aStr.SetChar(nLen + 1, sal_Unicode('0'));
- Insert(23, new XColorEntry( Color(230,230,230 ), aStr ) );
- Insert(24, new XColorEntry( Color(230,230,255 ), SVX_RESSTR( RID_SVXSTR_BLUEGREY ) ) );
+ Insert( new XColorEntry( Color(230,230,230 ), aStr ), 23 );
+ Insert( new XColorEntry( Color(230,230,255 ), SVX_RESSTR( RID_SVXSTR_BLUEGREY ) ), 24 );
aStr = SVX_RESSTR( RID_SVXSTR_RED );
aStr.AppendAscii(" 1");
nLen = aStr.Len() - 1;
- Insert(25, new XColorEntry( Color(255, 51,102 ), aStr ) );
+ Insert( new XColorEntry( Color(255, 51,102 ), aStr ), 25 );
aStr.SetChar(nLen, sal_Unicode('2'));
- Insert(26, new XColorEntry( Color(220, 35, 0 ), aStr ) );
+ Insert( new XColorEntry( Color(220, 35, 0 ), aStr ), 26 );
aStr.SetChar(nLen, sal_Unicode('3'));
- Insert(27, new XColorEntry( Color(184, 71, 0 ), aStr ) );
+ Insert( new XColorEntry( Color(184, 71, 0 ), aStr ), 27 );
aStr.SetChar(nLen, sal_Unicode('4'));
- Insert(28, new XColorEntry( Color(255, 51, 51 ), aStr ) );
+ Insert( new XColorEntry( Color(255, 51, 51 ), aStr ), 28 );
aStr.SetChar(nLen, sal_Unicode('5'));
- Insert(29, new XColorEntry( Color(235, 97, 61 ), aStr ) );
+ Insert( new XColorEntry( Color(235, 97, 61 ), aStr ), 29 );
aStr.SetChar(nLen, sal_Unicode('6'));
- Insert(30, new XColorEntry( Color(184, 71, 71 ), aStr ) );
+ Insert( new XColorEntry( Color(184, 71, 71 ), aStr ), 30 );
aStr.SetChar(nLen, sal_Unicode('7'));
- Insert(31, new XColorEntry( Color(184, 0, 71 ), aStr ) );
+ Insert( new XColorEntry( Color(184, 0, 71 ), aStr ), 31 );
aStr.SetChar(nLen, sal_Unicode('8'));
- Insert(32, new XColorEntry( Color(153, 40, 76 ), aStr ) );
+ Insert( new XColorEntry( Color(153, 40, 76 ), aStr ), 32 );
aStr = SVX_RESSTR( RID_SVXSTR_MAGENTA );
aStr.AppendAscii(" 1");
nLen = aStr.Len() - 1;
- Insert(33, new XColorEntry( Color(148, 0,107 ), aStr ) );
+ Insert( new XColorEntry( Color(148, 0,107 ), aStr ), 33 );
aStr.SetChar(nLen, sal_Unicode('2'));
- Insert(34, new XColorEntry( Color(148, 71,107 ), aStr ) );
+ Insert( new XColorEntry( Color(148, 71,107 ), aStr ), 34 );
aStr.SetChar(nLen, sal_Unicode('3'));
- Insert(35, new XColorEntry( Color(148, 71,148 ), aStr ) );
+ Insert( new XColorEntry( Color(148, 71,148 ), aStr ), 35 );
aStr.SetChar(nLen, sal_Unicode('4'));
- Insert(36, new XColorEntry( Color(153,102,204 ), aStr ) );
+ Insert( new XColorEntry( Color(153,102,204 ), aStr ), 36 );
aStr.SetChar(nLen, sal_Unicode('5'));
- Insert(37, new XColorEntry( Color(107, 71,148 ), aStr ) );
+ Insert( new XColorEntry( Color(107, 71,148 ), aStr ), 37 );
aStr.SetChar(nLen, sal_Unicode('6'));
- Insert(38, new XColorEntry( Color(107, 35,148 ), aStr ) );
+ Insert( new XColorEntry( Color(107, 35,148 ), aStr ), 38 );
aStr.SetChar(nLen, sal_Unicode('7'));
- Insert(39, new XColorEntry( Color(107, 0,148 ), aStr ) );
+ Insert( new XColorEntry( Color(107, 0,148 ), aStr ), 39 );
aStr.SetChar(nLen, sal_Unicode('8'));
- Insert(40, new XColorEntry( Color( 94, 17,166 ), aStr ) );
+ Insert( new XColorEntry( Color( 94, 17,166 ), aStr ), 40 );
aStr = SVX_RESSTR( RID_SVXSTR_BLUE );
aStr.AppendAscii(" 1");
nLen = aStr.Len() - 1;
- Insert(41, new XColorEntry( Color( 40, 0,153 ), aStr ) );
+ Insert( new XColorEntry( Color( 40, 0,153 ), aStr ), 41 );
aStr.SetChar(nLen, sal_Unicode('2'));
- Insert(42, new XColorEntry( Color( 71, 0,184 ), aStr ) );
+ Insert( new XColorEntry( Color( 71, 0,184 ), aStr ), 42 );
aStr.SetChar(nLen, sal_Unicode('3'));
- Insert(43, new XColorEntry( Color( 35, 0,220 ), aStr ) );
+ Insert( new XColorEntry( Color( 35, 0,220 ), aStr ), 43 );
aStr.SetChar(nLen, sal_Unicode('4'));
- Insert(44, new XColorEntry( Color( 35, 35,220 ), aStr ) );
+ Insert( new XColorEntry( Color( 35, 35,220 ), aStr ), 44 );
aStr.SetChar(nLen, sal_Unicode('5'));
- Insert(45, new XColorEntry( Color( 0, 71,255 ), aStr ) );
+ Insert( new XColorEntry( Color( 0, 71,255 ), aStr ), 45 );
aStr.SetChar(nLen, sal_Unicode('6'));
- Insert(46, new XColorEntry( Color( 0,153,255 ), aStr ) );
+ Insert( new XColorEntry( Color( 0,153,255 ), aStr ), 46 );
aStr.SetChar(nLen, sal_Unicode('7'));
- Insert(47, new XColorEntry( Color( 0,184,255 ), aStr ) );
+ Insert( new XColorEntry( Color( 0,184,255 ), aStr ), 47 );
aStr.SetChar(nLen, sal_Unicode('8'));
- Insert(48, new XColorEntry( Color(153,204,255 ), aStr ) );
- //Insert(48, new XColorEntry( Color( 46,215,255 ), aStr ) );
+ Insert( new XColorEntry( Color(153,204,255 ), aStr ), 48 );
aStr = SVX_RESSTR( RID_SVXSTR_CYAN );
aStr.AppendAscii(" 1");
nLen = aStr.Len() - 1;
- Insert(49, new XColorEntry( Color( 0,220,255 ), aStr ) );
+ Insert( new XColorEntry( Color( 0,220,255 ), aStr ), 49 );
aStr.SetChar(nLen, sal_Unicode('2'));
- Insert(50, new XColorEntry( Color( 0,204,204 ), aStr ) );
+ Insert( new XColorEntry( Color( 0,204,204 ), aStr ), 50 );
aStr.SetChar(nLen, sal_Unicode('3'));
- Insert(51, new XColorEntry( Color( 35,184,220 ), aStr ) );
+ Insert( new XColorEntry( Color( 35,184,220 ), aStr ), 51 );
aStr.SetChar(nLen, sal_Unicode('4'));
- Insert(52, new XColorEntry( Color( 71,184,184 ), aStr ) );
+ Insert( new XColorEntry( Color( 71,184,184 ), aStr ), 52 );
aStr.SetChar(nLen, sal_Unicode('5'));
- Insert(53, new XColorEntry( Color( 51,163,163 ), aStr ) );
+ Insert( new XColorEntry( Color( 51,163,163 ), aStr ), 53 );
aStr.SetChar(nLen, sal_Unicode('6'));
- Insert(54, new XColorEntry( Color( 25,138,138 ), aStr ) );
+ Insert( new XColorEntry( Color( 25,138,138 ), aStr ), 54 );
aStr.SetChar(nLen, sal_Unicode('7'));
- Insert(55, new XColorEntry( Color( 0,107,107 ), aStr ) );
+ Insert( new XColorEntry( Color( 0,107,107 ), aStr ), 55 );
aStr.SetChar(nLen, sal_Unicode('8'));
- Insert(56, new XColorEntry( Color( 0, 74, 74 ), aStr ) );
+ Insert( new XColorEntry( Color( 0, 74, 74 ), aStr ), 56 );
aStr = SVX_RESSTR( RID_SVXSTR_GREEN );
aStr.AppendAscii(" 1");
nLen = aStr.Len() - 1;
- Insert(57, new XColorEntry( Color( 53, 94, 0 ), aStr ) );
+ Insert( new XColorEntry( Color( 53, 94, 0 ), aStr ), 57 );
aStr.SetChar(nLen, sal_Unicode('2'));
- Insert(58, new XColorEntry( Color( 92,133, 38 ), aStr ) );
+ Insert( new XColorEntry( Color( 92,133, 38 ), aStr ), 58 );
aStr.SetChar(nLen, sal_Unicode('3'));
- Insert(59, new XColorEntry( Color(125,166, 71 ), aStr ) );
+ Insert( new XColorEntry( Color(125,166, 71 ), aStr ), 59 );
aStr.SetChar(nLen, sal_Unicode('4'));
- Insert(60, new XColorEntry( Color(148,189, 94 ), aStr ) );
+ Insert( new XColorEntry( Color(148,189, 94 ), aStr ), 60 );
aStr.SetChar(nLen, sal_Unicode('5'));
- Insert(61, new XColorEntry( Color( 0,174, 0 ), aStr ) );
+ Insert( new XColorEntry( Color( 0,174, 0 ), aStr ), 61 );
aStr.SetChar(nLen, sal_Unicode('6'));
- Insert(62, new XColorEntry( Color( 51,204,102 ), aStr ) );
+ Insert( new XColorEntry( Color( 51,204,102 ), aStr ), 62 );
aStr.SetChar(nLen, sal_Unicode('7'));
- Insert(63, new XColorEntry( Color( 61,235, 61 ), aStr ) );
+ Insert( new XColorEntry( Color( 61,235, 61 ), aStr ), 63 );
aStr.SetChar(nLen, sal_Unicode('8'));
- Insert(64, new XColorEntry( Color( 35,255, 35 ), aStr ) );
+ Insert( new XColorEntry( Color( 35,255, 35 ), aStr ), 64 );
aStr = SVX_RESSTR( RID_SVXSTR_YELLOW );
aStr.AppendAscii(" 1");
nLen = aStr.Len() - 1;
- Insert(65, new XColorEntry( Color(230,255, 0 ), aStr ) );
+ Insert( new XColorEntry( Color(230,255, 0 ), aStr ), 65 );
aStr.SetChar(nLen, sal_Unicode('2'));
- Insert(66, new XColorEntry( Color(255,255,153 ), aStr ) );
+ Insert( new XColorEntry( Color(255,255,153 ), aStr ), 66 );
aStr.SetChar(nLen, sal_Unicode('3'));
- Insert(67, new XColorEntry( Color(255,255,102 ), aStr ) );
+ Insert( new XColorEntry( Color(255,255,102 ), aStr ), 67 );
aStr.SetChar(nLen, sal_Unicode('4'));
- Insert(68, new XColorEntry( Color(230,230, 76 ), aStr ) );
+ Insert( new XColorEntry( Color(230,230, 76 ), aStr ), 68 );
aStr.SetChar(nLen, sal_Unicode('5'));
- Insert(69, new XColorEntry( Color(204,204, 0 ), aStr ) );
+ Insert( new XColorEntry( Color(204,204, 0 ), aStr ), 69 );
aStr.SetChar(nLen, sal_Unicode('6'));
- Insert(70, new XColorEntry( Color(179,179, 0 ), aStr ) );
+ Insert( new XColorEntry( Color(179,179, 0 ), aStr ), 70 );
aStr.SetChar(nLen, sal_Unicode('7'));
- Insert(71, new XColorEntry( Color(128,128, 25 ), aStr ) );
+ Insert( new XColorEntry( Color(128,128, 25 ), aStr ), 71 );
aStr.SetChar(nLen, sal_Unicode('8'));
- Insert(72, new XColorEntry( Color(102,102, 0 ), aStr ) );
+ Insert( new XColorEntry( Color(102,102, 0 ), aStr ), 72 );
aStr = SVX_RESSTR( RID_SVXSTR_BROWN );
aStr.AppendAscii(" 1");
nLen = aStr.Len() - 1;
- Insert(73, new XColorEntry( Color( 76, 25, 0 ), aStr ) );
+ Insert( new XColorEntry( Color( 76, 25, 0 ), aStr ), 73 );
aStr.SetChar(nLen, sal_Unicode('2'));
- Insert(74, new XColorEntry( Color(102, 51, 0 ), aStr ) );
+ Insert( new XColorEntry( Color(102, 51, 0 ), aStr ), 74 );
aStr.SetChar(nLen, sal_Unicode('3'));
- Insert(75, new XColorEntry( Color(128, 76, 25 ), aStr ) );
+ Insert( new XColorEntry( Color(128, 76, 25 ), aStr ), 75 );
aStr.SetChar(nLen, sal_Unicode('4'));
- Insert(76, new XColorEntry( Color(153,102, 51 ), aStr ) );
+ Insert( new XColorEntry( Color(153,102, 51 ), aStr ), 76 );
aStr = SVX_RESSTR( RID_SVXSTR_ORANGE );
aStr.AppendAscii(" 1");
nLen = aStr.Len() - 1;
- Insert(77, new XColorEntry( Color(204,102, 51 ), aStr ) );
+ Insert( new XColorEntry( Color(204,102, 51 ), aStr ), 77 );
aStr.SetChar(nLen, sal_Unicode('2'));
- Insert(78, new XColorEntry( Color(255,102, 51 ), aStr ) );
+ Insert( new XColorEntry( Color(255,102, 51 ), aStr ), 78 );
aStr.SetChar(nLen, sal_Unicode('3'));
- Insert(79, new XColorEntry( Color(255,153,102 ), aStr ) );
+ Insert( new XColorEntry( Color(255,153,102 ), aStr ), 79 );
aStr.SetChar(nLen, sal_Unicode('4'));
- Insert(80, new XColorEntry( Color(255,204,153 ), aStr ) );
+ Insert( new XColorEntry( Color(255,204,153 ), aStr ), 80 );
// new chart colors
aStr = SVX_RESSTR( RID_SVXSTR_VIOLET );
- Insert( 81, new XColorEntry( Color( 0x99, 0x99, 0xff ), aStr ) );
+ Insert( new XColorEntry( Color( 0x99, 0x99, 0xff ), aStr ), 81 );
aStr = SVX_RESSTR( RID_SVXSTR_BORDEAUX );
- Insert( 82, new XColorEntry( Color( 0x99, 0x33, 0x66 ), aStr ) );
+ Insert( new XColorEntry( Color( 0x99, 0x33, 0x66 ), aStr ), 82 );
aStr = SVX_RESSTR( RID_SVXSTR_PALE_YELLOW );
- Insert( 83, new XColorEntry( Color( 0xff, 0xff, 0xcc ), aStr ) );
+ Insert( new XColorEntry( Color( 0xff, 0xff, 0xcc ), aStr ), 83 );
aStr = SVX_RESSTR( RID_SVXSTR_PALE_GREEN );
- Insert( 84, new XColorEntry( Color( 0xcc, 0xff, 0xff ), aStr ) );
+ Insert( new XColorEntry( Color( 0xcc, 0xff, 0xff ), aStr ), 84 );
aStr = SVX_RESSTR( RID_SVXSTR_DKVIOLET );
- Insert( 85, new XColorEntry( Color( 0x66, 0x00, 0x66 ), aStr ) );
+ Insert( new XColorEntry( Color( 0x66, 0x00, 0x66 ), aStr ), 85 );
aStr = SVX_RESSTR( RID_SVXSTR_SALMON );
- Insert( 86, new XColorEntry( Color( 0xff, 0x80, 0x80 ), aStr ) );
+ Insert( new XColorEntry( Color( 0xff, 0x80, 0x80 ), aStr ), 86 );
aStr = SVX_RESSTR( RID_SVXSTR_SEABLUE );
- Insert( 87, new XColorEntry( Color( 0x00, 0x66, 0xcc ), aStr ) );
+ Insert( new XColorEntry( Color( 0x00, 0x66, 0xcc ), aStr ), 87 );
// Sun colors
aStr = SVX_RESSTR( RID_SVXSTR_COLOR_SUN );
aStr.AppendAscii(" 1");
nLen = aStr.Len() - 1;
- Insert( 88, new XColorEntry( Color( 0x33, 0x33, 0x66 ), aStr ) );
+ Insert( new XColorEntry( Color( 0x33, 0x33, 0x66 ), aStr ), 88 );
aStr.SetChar(nLen, sal_Unicode('2'));
- Insert( 89, new XColorEntry( Color( 0x66, 0x66, 0x99 ), aStr ) );
+ Insert( new XColorEntry( Color( 0x66, 0x66, 0x99 ), aStr ), 89 );
aStr.SetChar(nLen, sal_Unicode('3'));
- Insert( 90, new XColorEntry( Color( 0x99, 0x99, 0xcc ), aStr ) );
+ Insert( new XColorEntry( Color( 0x99, 0x99, 0xcc ), aStr ), 90 );
aStr.SetChar(nLen, sal_Unicode('4'));
- Insert( 91, new XColorEntry( Color( 0xcc, 0xcc, 0xff ), aStr ) );
+ Insert( new XColorEntry( Color( 0xcc, 0xcc, 0xff ), aStr ), 91 );
// Chart default colors
aStr = SVX_RESSTR( RID_SVXSTR_COLOR_CHART );
aStr.AppendAscii(" 1");
nLen = aStr.Len() - 1;
- Insert( 92, new XColorEntry( Color( 0x00, 0x45, 0x86 ), aStr ) );
+ Insert( new XColorEntry( Color( 0x00, 0x45, 0x86 ), aStr ), 92 );
aStr.SetChar(nLen, sal_Unicode('2'));
- Insert( 93, new XColorEntry( Color( 0xff, 0x42, 0x0e ), aStr ) );
+ Insert( new XColorEntry( Color( 0xff, 0x42, 0x0e ), aStr ), 93 );
aStr.SetChar(nLen, sal_Unicode('3'));
- Insert( 94, new XColorEntry( Color( 0xff, 0xd3, 0x20 ), aStr ) );
+ Insert( new XColorEntry( Color( 0xff, 0xd3, 0x20 ), aStr ), 94 );
aStr.SetChar(nLen, sal_Unicode('4'));
- Insert( 95, new XColorEntry( Color( 0x57, 0x9d, 0x1c ), aStr ) );
+ Insert( new XColorEntry( Color( 0x57, 0x9d, 0x1c ), aStr ), 95 );
aStr.SetChar(nLen, sal_Unicode('5'));
- Insert( 96, new XColorEntry( Color( 0x7e, 0x00, 0x21 ), aStr ) );
+ Insert( new XColorEntry( Color( 0x7e, 0x00, 0x21 ), aStr ), 96 );
aStr.SetChar(nLen, sal_Unicode('6'));
- Insert( 97, new XColorEntry( Color( 0x83, 0xca, 0xff ), aStr ) );
+ Insert( new XColorEntry( Color( 0x83, 0xca, 0xff ), aStr ), 97 );
aStr.SetChar(nLen, sal_Unicode('7'));
- Insert( 98, new XColorEntry( Color( 0x31, 0x40, 0x04 ), aStr ) );
+ Insert( new XColorEntry( Color( 0x31, 0x40, 0x04 ), aStr ), 98 );
aStr.SetChar(nLen, sal_Unicode('8'));
- Insert( 99, new XColorEntry( Color( 0xae, 0xcf, 0x00 ), aStr ) );
+ Insert( new XColorEntry( Color( 0xae, 0xcf, 0x00 ), aStr ), 99 );
aStr.SetChar(nLen, sal_Unicode('9'));
- Insert( 100, new XColorEntry( Color( 0x4b, 0x1f, 0x6f ), aStr ) );
+ Insert( new XColorEntry( Color( 0x4b, 0x1f, 0x6f ), aStr ), 100 );
aStr.SetChar(nLen, sal_Unicode('1'));
aStr.AppendAscii("0");
nLen = aStr.Len() - 1;
- Insert( 101, new XColorEntry( Color( 0xff, 0x95, 0x0e ), aStr ) );
+ Insert( new XColorEntry( Color( 0xff, 0x95, 0x0e ), aStr ), 101 );
aStr.SetChar(nLen, sal_Unicode('1'));
- Insert( 102, new XColorEntry( Color( 0xc5, 0x00, 0x0b ), aStr ) );
+ Insert( new XColorEntry( Color( 0xc5, 0x00, 0x0b ), aStr ), 102 );
aStr.SetChar(nLen, sal_Unicode('2'));
- Insert( 103, new XColorEntry( Color( 0x00, 0x84, 0xd1 ), aStr ) );
+ Insert( new XColorEntry( Color( 0x00, 0x84, 0xd1 ), aStr ), 103 );
return( Count() == 104 );
}
More information about the Libreoffice-commits
mailing list