summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorJoseph Powers <jpowers27@cox.net>2011-08-29 06:29:06 -0700
committerJoseph Powers <jpowers27@cox.net>2011-08-29 06:29:36 -0700
commitbbbc20bd5f4ca5ff726667869b7b7537606b2a77 (patch)
tree05014a5c013e955f86e90de2c81ddc05cf77e5a8 /sc
parent7d7f4769b0375f64f43fe7fbc6a1129f53bbdf51 (diff)
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.
Diffstat (limited to 'sc')
-rw-r--r--sc/inc/document.hxx6
-rw-r--r--sc/source/core/data/documen9.cxx4
-rw-r--r--sc/source/core/data/drwlayer.cxx4
-rw-r--r--sc/source/ui/dbgui/scendlg.cxx2
-rw-r--r--sc/source/ui/docshell/docsh2.cxx2
-rw-r--r--sc/source/ui/docshell/docsh4.cxx2
-rw-r--r--sc/source/ui/drawfunc/drawsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/drawsh4.cxx2
-rw-r--r--sc/source/ui/drawfunc/drtxtob2.cxx2
-rw-r--r--sc/source/ui/miscdlgs/tabbgcolordlg.cxx6
-rw-r--r--sc/source/ui/optdlg/opredlin.cxx2
-rw-r--r--sc/source/ui/optdlg/tpview.cxx4
12 files changed, 19 insertions, 19 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 6ca827a9ae23..97ed45e9a5e6 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -80,7 +80,7 @@ namespace sfx2 {
class SvxSearchItem;
class SvxShadowItem;
class Window;
-class XColorTable;
+class XColorList;
struct ScAttrEntry;
class ScAutoFormatData;
@@ -235,7 +235,7 @@ private:
SfxPrinter* pPrinter;
VirtualDevice* pVirtualDevice_100th_mm;
ScDrawLayer* pDrawLayer; // SdrModel
- XColorTable* pColorTable;
+ XColorList* pColorTable;
ScConditionalFormatList* pCondFormList; // conditional formats
ScValidationDataList* pValidationList; // validity
SvNumberFormatterIndexTable* pFormatExchangeList; // for application of number formats
@@ -434,7 +434,7 @@ public:
void GetDocStat( ScDocStat& rDocStat );
SC_DLLPUBLIC void InitDrawLayer( SfxObjectShell* pDocShell = NULL );
- XColorTable* GetColorTable();
+ XColorList* GetColorTable();
SC_DLLPUBLIC sfx2::LinkManager* GetLinkManager() const;
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 191ed190406e..86bc7677f762 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -83,7 +83,7 @@ void ScDocument::BeginDrawUndo()
pDrawLayer->BeginCalcUndo();
}
-XColorTable* ScDocument::GetColorTable()
+XColorList* ScDocument::GetColorTable()
{
if (pDrawLayer)
return pDrawLayer->GetColorTable();
@@ -92,7 +92,7 @@ XColorTable* ScDocument::GetColorTable()
if (!pColorTable)
{
SvtPathOptions aPathOpt;
- pColorTable = new XColorTable( aPathOpt.GetPalettePath() );
+ pColorTable = new XColorList( aPathOpt.GetPalettePath() );
}
return pColorTable;
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index e5cac4b258cc..9ef0e337bef5 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -242,11 +242,11 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) :
// set color table
SvxColorTableItem* pColItem = (SvxColorTableItem*) pObjSh->GetItem( SID_COLOR_TABLE );
- XColorTable* pXCol = pColItem ? pColItem->GetColorTable() : &XColorTable::GetStdColorTable();
+ XColorList* pXCol = pColItem ? pColItem->GetColorTable() : &XColorList::GetStdColorTable();
SetColorTable( pXCol );
}
else
- SetColorTable( &XColorTable::GetStdColorTable() );
+ SetColorTable( &XColorList::GetStdColorTable() );
SetSwapGraphics(sal_True);
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index a018b1943d4f..5e1cbc3121e5 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -83,7 +83,7 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, sal_Bo
const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE );
if ( pItem )
{
- XColorTable* pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
+ XColorList* pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
if (pColorTable)
{
aLbColor.SetUpdateMode( false );
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index 42421248b44c..f94bc36acffc 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -144,7 +144,7 @@ void ScDocShell::InitItems()
else
{
// always use global color table instead of local copy
- PutItem( SvxColorTableItem( &XColorTable::GetStdColorTable(), SID_COLOR_TABLE ) );
+ PutItem( SvxColorTableItem( &XColorList::GetStdColorTable(), SID_COLOR_TABLE ) );
}
if ( !aDocument.GetForbiddenCharacters().is() ||
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 356b6b52de10..5fe6de5ffafd 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -591,7 +591,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
{
// passende ColorTable ist per PutItem gesetzt worden
SvxColorTableItem* pColItem = (SvxColorTableItem*)GetItem(SID_COLOR_TABLE);
- XColorTable* pTable = pColItem->GetColorTable();
+ XColorList* pTable = pColItem->GetColorTable();
rReq.SetReturnValue(OfaPtrItem(SID_GET_COLORTABLE, pTable));
}
break;
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 2843d151141b..836d47201712 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -422,7 +422,7 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, sal_uInt16 nTabPage )
// (see SwDrawShell::ExecDrawDlg)
const SvxColorTableItem* pColorItem =
static_cast<const SvxColorTableItem*>( pViewData->GetSfxDocShell()->GetItem(SID_COLOR_TABLE) );
- if (pColorItem->GetColorTable() == &XColorTable::GetStdColorTable())
+ if (pColorItem->GetColorTable() == &XColorList::GetStdColorTable())
pDlg->DontDeleteColorTable();
if ( nTabPage != 0xffff )
diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx
index 75b1747dc3be..6f021d82b776 100644
--- a/sc/source/ui/drawfunc/drawsh4.cxx
+++ b/sc/source/ui/drawfunc/drawsh4.cxx
@@ -93,7 +93,7 @@ void ScDrawShell::GetFormTextState(SfxItemSet& rSet)
if ( pDocSh )
{
const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE );
- XColorTable* pColorTable = NULL;
+ XColorList* pColorTable = NULL;
if ( pItem )
pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx
index d85ac90fa677..4278cc976992 100644
--- a/sc/source/ui/drawfunc/drtxtob2.cxx
+++ b/sc/source/ui/drawfunc/drtxtob2.cxx
@@ -276,7 +276,7 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet)
if ( pDocSh )
{
const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE );
- XColorTable* pColorTable = NULL;
+ XColorList* pColorTable = NULL;
if ( pItem )
pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index 5fb8d609bc6f..961eef00e616 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -93,8 +93,8 @@ void ScTabBgColorDlg::FillColorValueSets_Impl()
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
const SfxPoolItem* pItem = NULL;
- XColorTable* pColorTable = NULL;
- ::boost::scoped_ptr<XColorTable> pOwnColorTable; // locally instantiated in case the doc shell doesn't have one.
+ XColorList* pColorTable = NULL;
+ ::boost::scoped_ptr<XColorList> pOwnColorTable; // locally instantiated in case the doc shell doesn't have one.
const Size aSize15x15 = Size( 15, 15 );
sal_uInt16 nSelectedItem = 0;
@@ -105,7 +105,7 @@ void ScTabBgColorDlg::FillColorValueSets_Impl()
pColorTable = ( (SvxColorTableItem*)pItem )->GetColorTable();
if ( !pColorTable )
{
- pOwnColorTable.reset(new XColorTable(SvtPathOptions().GetPalettePath()));
+ pOwnColorTable.reset(new XColorList(SvtPathOptions().GetPalettePath()));
pColorTable = pOwnColorTable.get();
}
if ( pColorTable )
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index 6d8ac204b2eb..a93122bb4b55 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -169,7 +169,7 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ )
aInsertColorLB.SetUpdateMode( false);
aRemoveColorLB.SetUpdateMode( false);
- XColorTable& rColorTbl = XColorTable::GetStdColorTable();
+ XColorList& rColorTbl = XColorList::GetStdColorTable();
for( sal_uInt16 i = 0; i < rColorTbl.Count(); ++i )
{
XColorEntry* pEntry = rColorTbl.GetColor( i );
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 016a6658cefd..88cbb2e97070 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -337,7 +337,7 @@ void ScTpContentOptions::InitGridOpt()
// there might be another DocShell here
pDocSh = PTR_CAST(ScDocShell, pDocSh);
- XColorTable* pColorTable = NULL;
+ XColorList* pColorTable = NULL;
if ( pDocSh )
{
@@ -347,7 +347,7 @@ void ScTpContentOptions::InitGridOpt()
pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
}
else
- pColorTable = &XColorTable::GetStdColorTable();
+ pColorTable = &XColorList::GetStdColorTable();
if ( !pColorTable )
return;