summaryrefslogtreecommitdiff
path: root/cui/source/inc
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/inc')
-rw-r--r--cui/source/inc/border.hxx1
-rw-r--r--cui/source/inc/cuitabarea.hxx34
-rw-r--r--cui/source/inc/cuitabline.hxx14
-rw-r--r--cui/source/inc/sdrcelldlg.hxx4
-rw-r--r--cui/source/inc/treeopt.hxx6
5 files changed, 29 insertions, 30 deletions
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index a9e634a1e22c..f0c6a0dd888a 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -37,7 +37,6 @@
// forward ---------------------------------------------------------------
class SvxBorderLine;
-class XColorTable;
#include <svx/flagsdef.hxx>
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index e9d66bb36f7b..224b667f2d09 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -39,8 +39,8 @@ private:
SdrModel* mpDrawModel;
// const SdrView* mpView;
- XColorTable* mpColorTab;
- XColorTable* mpNewColorTab;
+ XColorList* mpColorTab;
+ XColorList* mpNewColorTab;
XGradientList* mpGradientList;
XGradientList* mpNewGradientList;
XHatchList* mpHatchingList;
@@ -76,10 +76,10 @@ 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)
{ mpNewGradientList = pGrdLst; }
@@ -243,7 +243,7 @@ private:
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
XGradientList* pGradientList;
XHatchList* pHatchingList;
XBitmapList* pBitmapList;
@@ -302,7 +302,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)
@@ -350,7 +350,7 @@ private:
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
ChangeType* pnColorTableState;
sal_uInt16 nPageType; //add CHINA001
sal_uInt16 nDlgType; //add CHINA001
@@ -382,7 +382,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; }
//CHINA001 void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
//CHINA001 void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } //add CHINA001
@@ -432,7 +432,7 @@ private:
const SfxItemSet& rOutAttrs;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
XGradientList* pGradientList;
ChangeType* pnGradientListState;
@@ -473,7 +473,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; }
@@ -519,7 +519,7 @@ private:
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
XHatchList* pHatchingList;
ChangeType* pnHatchingListState;
@@ -563,7 +563,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; }
@@ -611,7 +611,7 @@ private:
const SfxItemSet& rOutAttrs;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
XBitmapList* pBitmapList;
ChangeType* pnBitmapListState;
@@ -657,7 +657,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; }
@@ -723,7 +723,7 @@ private:
const SfxItemSet& rOutAttrs;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
ChangeType* pnColorTableState;
sal_uInt16* pPageType;
@@ -779,7 +779,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 828dd7527196..163418cc3cec 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -39,8 +39,8 @@ private:
const SfxItemSet& rOutAttrs;
- XColorTable* pColorTab;
- XColorTable* mpNewColorTab;
+ XColorList* pColorTab;
+ XColorList* mpNewColorTab;
XDashList* pDashList;
XDashList* pNewDashList;
XLineEndList* pLineEndList;
@@ -84,9 +84,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; }
};
/*************************************************************************
@@ -166,7 +166,7 @@ private:
XLineAttrSetItem aXLineAttr;
SfxItemSet& rXLSet;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
XDashList* pDashList;
XLineEndList* pLineEndList;
@@ -231,7 +231,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 2c740da184ba..fd17127ab3d4 100644
--- a/cui/source/inc/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
@@ -27,7 +27,7 @@
#include <sfx2/tabdlg.hxx>
-class XColorTable;
+class XColorList;
class XGradientList;
class XHatchList;
class XBitmapList;
@@ -38,7 +38,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 6274fe2b70c5..ae85d9456204 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -43,7 +43,7 @@ CreateTabPage GetSSOCreator( void );
class SfxModule;
class SfxShell;
class SfxItemSet;
-class XColorTable;
+class XColorList;
class OfaOptionsTreeListBox : public SvTreeListBox
{
using SvListView::Collapse;
@@ -197,7 +197,7 @@ private:
// for the ColorTabPage
SfxItemSet* pColorPageItemSet;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
sal_uInt16 nChangeType;
sal_uInt16 nUnknownType;
sal_uInt16 nUnknownPos;
@@ -269,7 +269,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);