summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/inc/border.hxx1
-rw-r--r--cui/source/inc/cuitabarea.hxx36
-rw-r--r--cui/source/inc/cuitabline.hxx14
-rw-r--r--cui/source/inc/sdrcelldlg.hxx4
-rw-r--r--cui/source/inc/treeopt.hxx6
-rw-r--r--cui/source/options/optchart.cxx2
-rw-r--r--cui/source/options/optchart.hxx4
-rw-r--r--cui/source/options/optcolor.cxx2
-rw-r--r--cui/source/options/treeopt.cxx4
-rw-r--r--cui/source/tabpages/backgrnd.cxx4
-rw-r--r--cui/source/tabpages/border.cxx6
-rw-r--r--cui/source/tabpages/chardlg.cxx10
-rw-r--r--cui/source/tabpages/numpages.cxx4
-rw-r--r--cui/source/tabpages/tpcolor.cxx4
14 files changed, 50 insertions, 51 deletions
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 2d8572ed4ab8..7766ec92fcd2 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -45,7 +45,6 @@ namespace editeng
{
class SvxBorderLine;
}
-class XColorTable;
#include <svx/flagsdef.hxx>
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index eee2bc172dfa..897916b6b829 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -43,8 +43,8 @@ class SvxAreaTabDialog : public SfxTabDialog
private:
SdrModel* mpDrawModel;
- XColorTable* mpColorTab;
- XColorTable* mpNewColorTab;
+ XColorList* mpColorTab;
+ XColorList* mpNewColorTab;
XGradientList* mpGradientList;
XGradientList* mpNewGradientList;
XHatchList* mpHatchingList;
@@ -80,12 +80,12 @@ public:
const SdrView* pSdrView = NULL );
~SvxAreaTabDialog();
- void SetNewColorTable( XColorTable* pColTab )
+ void SetNewColorTable( XColorList* pColTab )
{ mpNewColorTab = pColTab; }
- XColorTable* GetNewColorTable() const { return mpNewColorTab; }
- const XColorTable* GetColorTable() const { return mpColorTab; }
+ XColorList* GetNewColorTable() const { return mpNewColorTab; }
+ const XColorList* GetColorTable() const { return mpColorTab; }
- void SetNewGradientList( XGradientList* pGrdLst)
+ void SetNewGradientList( XGradientList* pGrdLst)
{ mpNewGradientList = pGrdLst; }
XGradientList* GetNewGradientList() const
{ return mpNewGradientList; }
@@ -243,7 +243,7 @@ private:
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
XGradientList* pGradientList;
XHatchList* pHatchingList;
XBitmapList* pBitmapList;
@@ -298,7 +298,7 @@ public:
virtual int DeactivatePage( SfxItemSet* pSet );
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
- void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+ void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
void SetGradientList( XGradientList* pGrdLst)
{ pGradientList = pGrdLst; }
void SetHatchingList( XHatchList* pHtchLst)
@@ -343,7 +343,7 @@ private:
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
ChangeType* pnColorTableState;
sal_uInt16 nPageType;
sal_uInt16 nDlgType;
@@ -375,7 +375,7 @@ public:
virtual int DeactivatePage( SfxItemSet* pSet );
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
- void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+ void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }
void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
@@ -423,7 +423,7 @@ private:
const SfxItemSet& rOutAttrs;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
XGradientList* pGradientList;
ChangeType* pnGradientListState;
@@ -464,7 +464,7 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet );
virtual int DeactivatePage( SfxItemSet* pSet );
- void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+ void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
void SetGradientList( XGradientList* pGrdLst)
{ pGradientList = pGrdLst; }
@@ -510,7 +510,7 @@ private:
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
XHatchList* pHatchingList;
ChangeType* pnHatchingListState;
@@ -554,7 +554,7 @@ public:
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
- void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+ void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
void SetHatchingList( XHatchList* pHtchLst)
{ pHatchingList = pHtchLst; }
@@ -602,7 +602,7 @@ private:
const SfxItemSet& rOutAttrs;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
XBitmapList* pBitmapList;
ChangeType* pnBitmapListState;
@@ -648,7 +648,7 @@ public:
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
- void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+ void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
void SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; }
void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
@@ -714,7 +714,7 @@ private:
const SfxItemSet& rOutAttrs;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
ChangeType* pnColorTableState;
sal_uInt16* pPageType;
@@ -770,7 +770,7 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet );
virtual int DeactivatePage( SfxItemSet* pSet );
- void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+ void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 3952b9f3a2aa..31481a571114 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -46,8 +46,8 @@ private:
const SfxItemSet& rOutAttrs;
- XColorTable* pColorTab;
- XColorTable* mpNewColorTab;
+ XColorList* pColorTab;
+ XColorList* mpNewColorTab;
XDashList* pDashList;
XDashList* pNewDashList;
XLineEndList* pLineEndList;
@@ -91,9 +91,9 @@ public:
XLineEndList* GetNewLineEndList() const { return pNewLineEndList; }
const XLineEndList* GetLineEndList() const { return pLineEndList; }
- void SetNewColorTable( XColorTable* pColTab ) { mpNewColorTab = pColTab; }
- XColorTable* GetNewColorTable() const { return mpNewColorTab; }
- const XColorTable* GetColorTable() const { return pColorTab; }
+ void SetNewColorTable( XColorList* pColTab ) { mpNewColorTab = pColTab; }
+ XColorList* GetNewColorTable() const { return mpNewColorTab; }
+ const XColorList* GetColorTable() const { return pColorTab; }
};
/*************************************************************************
@@ -172,7 +172,7 @@ private:
XLineAttrSetItem aXLineAttr;
SfxItemSet& rXLSet;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
XDashList* pDashList;
XLineEndList* pLineEndList;
@@ -232,7 +232,7 @@ public:
virtual void FillUserData();
- void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
+ void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
void SetDashList( XDashList* pDshLst ) { pDashList = pDshLst; }
void SetLineEndList( XLineEndList* pLneEndLst) { pLineEndList = pLneEndLst; }
void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index d830d92d2744..5760c58c8b6e 100644
--- a/cui/source/inc/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
@@ -32,7 +32,7 @@
#include <sfx2/tabdlg.hxx>
-class XColorTable;
+class XColorList;
class XGradientList;
class XHatchList;
class XBitmapList;
@@ -43,7 +43,7 @@ class SvxFormatCellsDialog : public SfxTabDialog
private:
const SfxItemSet& mrOutAttrs;
- XColorTable* mpColorTab;
+ XColorList* mpColorTab;
XGradientList* mpGradientList;
XHatchList* mpHatchingList;
XBitmapList* mpBitmapList;
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index fcf2e8b34944..178786e0be4a 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -47,7 +47,7 @@ CreateTabPage GetSSOCreator( void );
class SfxModule;
class SfxShell;
class SfxItemSet;
-class XColorTable;
+class XColorList;
class OfaOptionsTreeListBox : public SvTreeListBox
{
using SvListView::Collapse;
@@ -200,7 +200,7 @@ private:
// for the ColorTabPage
SfxItemSet* pColorPageItemSet;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
sal_uInt16 nChangeType;
sal_uInt16 nUnknownType;
sal_uInt16 nUnknownPos;
@@ -272,7 +272,7 @@ public:
void ApplyItemSets();
sal_uInt16 GetColorChanged() const { return nChangeType; }
- XColorTable* GetColorTable() { return pColorTab; }
+ XColorList* GetColorTable() { return pColorTab; }
// helper functions to call the language settings TabPage from the SpellDialog
static void ApplyLanguageOptions(const SfxItemSet& rSet);
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index a9809be47f63..0279a352b6df 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -81,7 +81,7 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage( Window* pParent, const SfxItemSe
aValSetColorBox.Show();
pChartOptions = new SvxChartOptions;
- pColorTab = new XColorTable( SvtPathOptions().GetPalettePath() );
+ pColorTab = new XColorList( SvtPathOptions().GetPalettePath() );
const SfxPoolItem* pItem = NULL;
if ( rInAttrs.GetItemState( SID_SCH_EDITOPTIONS, sal_False, &pItem ) == SFX_ITEM_SET )
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 1b457dd64385..1b2d528e59df 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -38,7 +38,7 @@
#include <svx/dlgctrl.hxx>
// header for PushButton
#include <vcl/button.hxx>
-// header for XColorTable
+// header for XColorList
#include <svx/xtable.hxx>
#include "cfgchart.hxx"
@@ -67,7 +67,7 @@ private:
SvxChartOptions* pChartOptions;
SvxChartColorTableItem* pColorConfig;
- XColorTable* pColorTab;
+ XColorList* pColorTab;
DECL_LINK( ResetToDefaults, void * );
DECL_LINK( AddChartColor, void * );
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index bb7cd1506b4d..f8734841a9e5 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -953,7 +953,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
}
}
- XColorTable aColorTable( SvtPathOptions().GetPalettePath() );
+ XColorList aColorTable( SvtPathOptions().GetPalettePath() );
for( sal_Int32 i = 0; i < aColorTable.Count(); i++ )
{
XColorEntry* pEntry = aColorTable.GetColor(i);
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 3673960c57c6..de22b1f8cebd 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1166,7 +1166,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG )
if ( SfxViewFrame::Current() && SfxViewFrame::Current()->GetDispatcher() )
pPtr = (const OfaPtrItem*)SfxViewFrame::Current()->
GetDispatcher()->Execute( SID_GET_COLORTABLE, SFX_CALLMODE_SYNCHRON );
- pColorTab = pPtr ? (XColorTable*)pPtr->GetValue() : &XColorTable::GetStdColorTable();
+ pColorTab = pPtr ? (XColorList*)pPtr->GetValue() : &XColorList::GetStdColorTable();
rColPage.SetColorTable( pColorTab );
rColPage.SetPageType( &nUnknownType );
@@ -2617,7 +2617,7 @@ short OfaTreeOptionsDialog::Execute()
const OfaPtrItem* pPtr = (const OfaPtrItem*)SfxViewFrame::Current()->GetDispatcher()->Execute( SID_GET_COLORTABLE, SFX_CALLMODE_SYNCHRON );
if( pPtr )
{
- XColorTable* _pColorTab = (XColorTable*)pPtr->GetValue();
+ XColorList* _pColorTab = (XColorList*)pPtr->GetValue();
if( _pColorTab &&
_pColorTab->GetPath() == GetColorTable()->GetPath() &&
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index f3db1a861b48..86eb2220cf1e 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1133,7 +1133,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
const SfxPoolItem* pItem = NULL;
- XColorTable* pColorTable = NULL;
+ XColorList* pColorTable = NULL;
const Size aSize15x15 = Size( 15, 15 );
bool bOwn = false;
@@ -1143,7 +1143,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
if ( !pColorTable )
{
bOwn = true;
- pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
+ pColorTable = new XColorList( SvtPathOptions().GetPalettePath() );
}
if ( pColorTable )
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 98aeae83afcb..aa6466e4fa04 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -40,7 +40,7 @@
#define LINESTYLE_HTML_MAX 5
-#include <svx/xtable.hxx> // XColorTable
+#include <svx/xtable.hxx> // XColorList
#include <svx/drawitem.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/shaditem.hxx>
@@ -274,10 +274,10 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
FillValueSets();
FillLineListBox_Impl();
- // ColorBox aus der XColorTable fuellen.
+ // ColorBox aus der XColorList fuellen.
SfxObjectShell* pDocSh = SfxObjectShell::Current();
const SfxPoolItem* pItem = NULL;
- XColorTable* pColorTable = NULL;
+ XColorList* pColorTable = NULL;
DBG_ASSERT( pDocSh, "DocShell not found!" );
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 517ae4c0bfcc..33309de97100 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -47,7 +47,7 @@
#include "chardlg.hrc"
-#include <svx/xtable.hxx> // XColorTable
+#include <svx/xtable.hxx> // XColorList
#include "chardlg.hxx"
#include "editeng/fontitem.hxx"
#include <editeng/postitem.hxx>
@@ -458,7 +458,7 @@ void SvxCharNamePage::Initialize()
// fill the color box
SfxObjectShell* pDocSh = SfxObjectShell::Current();
//DBG_ASSERT( pDocSh, "DocShell not found!" );
- XColorTable* pColorTable = NULL;
+ XColorList* pColorTable = NULL;
bool bKillTable = false;
const SfxPoolItem* pItem = NULL;
@@ -471,7 +471,7 @@ void SvxCharNamePage::Initialize()
if ( !pColorTable )
{
- pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
+ pColorTable = new XColorList( SvtPathOptions().GetPalettePath() );
bKillTable = true;
}
@@ -1527,7 +1527,7 @@ void SvxCharEffectsPage::Initialize()
// fill the color box
SfxObjectShell* pDocSh = SfxObjectShell::Current();
DBG_ASSERT( pDocSh, "DocShell not found!" );
- XColorTable* pColorTable = NULL;
+ XColorList* pColorTable = NULL;
bool bKillTable = false;
if ( pDocSh )
@@ -1539,7 +1539,7 @@ void SvxCharEffectsPage::Initialize()
if ( !pColorTable )
{
- pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
+ pColorTable = new XColorList( SvtPathOptions().GetPalettePath() );
bKillTable = true;
}
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 42cde8c17fb2..4a47004c8b11 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1342,7 +1342,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
DBG_ASSERT( pDocSh, "DocShell not found!" );
- XColorTable* pColorTable = NULL;
+ XColorList* pColorTable = NULL;
bool bKillTable = false;
if ( pDocSh )
{
@@ -1353,7 +1353,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
if ( !pColorTable )
{
- pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
+ pColorTable = new XColorList( SvtPathOptions().GetPalettePath() );
bKillTable = true;
}
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 01dc8e08ce18..0a49fa99118c 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -756,12 +756,12 @@ IMPL_LINK( SvxColorTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
aPathURL.removeFinalSlash();
// Tabelle speichern
- XColorTable* pColTab = new XColorTable( aPathURL.GetMainURL( INetURLObject::NO_DECODE ), pXPool );
+ XColorList* pColTab = new XColorList( aPathURL.GetMainURL( INetURLObject::NO_DECODE ), pXPool );
pColTab->SetName( aURL.getName() ); // XXX
if( pColTab->Load() )
{
// Pruefen, ob Tabelle geloescht werden darf:
- const XColorTable *pTempTable = 0;
+ const XColorList *pTempTable = 0;
SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( DLGWIN );
SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( DLGWIN );
if( pArea )