diff options
author | Joseph Powers <jpowers27@cox.net> | 2011-08-29 06:29:06 -0700 |
---|---|---|
committer | Joseph Powers <jpowers27@cox.net> | 2011-08-29 06:29:36 -0700 |
commit | bbbc20bd5f4ca5ff726667869b7b7537606b2a77 (patch) | |
tree | 05014a5c013e955f86e90de2c81ddc05cf77e5a8 /svx | |
parent | Rebase XColorTable from XPropertyTable to XPropertyList (diff) | |
download | core-bbbc20bd5f4ca5ff726667869b7b7537606b2a77.tar.gz core-bbbc20bd5f4ca5ff726667869b7b7537606b2a77.zip |
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 'svx')
-rw-r--r-- | svx/inc/svx/bmpmask.hxx | 4 | ||||
-rw-r--r-- | svx/inc/svx/colrctrl.hxx | 12 | ||||
-rw-r--r-- | svx/inc/svx/dlgctrl.hxx | 6 | ||||
-rw-r--r-- | svx/inc/svx/drawitem.hxx | 10 | ||||
-rw-r--r-- | svx/inc/svx/fontwork.hxx | 4 | ||||
-rw-r--r-- | svx/inc/svx/svdmodel.hxx | 8 | ||||
-rw-r--r-- | svx/inc/svx/xattr.hxx | 2 | ||||
-rw-r--r-- | svx/inc/svx/xcolit.hxx | 4 | ||||
-rw-r--r-- | svx/inc/svx/xit.hxx | 1 | ||||
-rw-r--r-- | svx/inc/svx/xtable.hxx | 10 | ||||
-rw-r--r-- | svx/source/dialog/_bmpmask.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/dlgctrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/fontwork.cxx | 2 | ||||
-rw-r--r-- | svx/source/items/drawitem.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 6 | ||||
-rw-r--r-- | svx/source/unodraw/unoctabl.cxx | 6 | ||||
-rw-r--r-- | svx/source/xoutdev/xattr.cxx | 4 | ||||
-rw-r--r-- | svx/source/xoutdev/xtabcolr.cxx | 26 |
19 files changed, 57 insertions, 60 deletions
diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx index 3236078794ac..6848337a85ef 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 9d91a424b444..9470c78657b6 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 0ccda5df85f8..7fc7d8cca346 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 42fbfd2bcd35..6264ccbbd27b 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 86d29f6184bc..bd67fd103c6c 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 d4a30a3f4e19..77c799508939 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 97bfff4336ac..be117e6b14c6 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 49e1ff4ee976..db92241bf3d9 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 8824b9021b0a..30ef1c8469eb 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 d1047f78ccb9..26306346f2ff 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 fc4a443ff4f8..ae88d8bb17e7 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 1d6404c03dcc..89df8873216e 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 6708f3b5cca0..3584163a823a 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 50b2b9561621..09852a13fd3f 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 c8d87094c447..68ed040f9f04 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 1b5ed3ec5505..db9dcd90e079 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 a6451a7a66dc..6f039f11b631 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 afe1eccb83d3..49a64224419a 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 9beb9b9a8545..599c14319624 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 ); } |