From a8a1afac4d1b476562ec60ef244ef15d6258dde0 Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Tue, 21 Jun 2011 07:29:15 -0700 Subject: Remove nDummy parameter from XPropertyList::Remove() --- svx/inc/svx/xtable.hxx | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'svx/inc') diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx index 163666c86cc1..913a7665e195 100644 --- a/svx/inc/svx/xtable.hxx +++ b/svx/inc/svx/xtable.hxx @@ -217,9 +217,11 @@ public: sal_Bool Insert(long nIndex, XPropertyEntry* pEntry); XPropertyEntry* Replace(long nIndex, XPropertyEntry* pEntry); XPropertyEntry* Remove(long nIndex); - XPropertyEntry* Get( long nIndex, sal_uInt16 nDummy ) const; + // Note: Get(long) & Get( String& ) are ambiguous + XPropertyEntry* Get( long nIndex, sal_uInt16 nDummy ) const; long Get(const String& rName); + Bitmap* GetBitmap( long nIndex ) const; const String& GetName() const { return aName; } @@ -252,9 +254,9 @@ protected: XPropertyEntryList_impl aList; List* pBmpList; - sal_Bool bListDirty; - sal_Bool bBitmapsDirty; - sal_Bool bOwnPool; + sal_Bool bListDirty; + sal_Bool bBitmapsDirty; + sal_Bool bOwnPool; XPropertyList( const String& rPath, @@ -270,24 +272,26 @@ public: void Insert( XPropertyEntry* pEntry, long nIndex = LIST_APPEND ); XPropertyEntry* Replace( XPropertyEntry* pEntry, long nIndex ); - XPropertyEntry* Remove( long nIndex, sal_uInt16 nDummy ); - XPropertyEntry* Get( long nIndex, sal_uInt16 nDummy ) const; + XPropertyEntry* Remove( long nIndex ); + // Note: Get(long) & Get( String& ) are ambiguous + XPropertyEntry* Get( long nIndex, sal_uInt16 nDummy ) const; long Get(const String& rName); + Bitmap* GetBitmap( long nIndex ) const; const String& GetName() const { return aName; } void SetName( const String& rString ); const String& GetPath() const { return aPath; } void SetPath( const String& rString ) { aPath = rString; } - sal_Bool IsDirty() const { return bListDirty && bBitmapsDirty; } + sal_Bool IsDirty() const { return bListDirty && bBitmapsDirty; } void SetDirty( sal_Bool bDirty = sal_True ) { bListDirty = bDirty; bBitmapsDirty = bDirty; } - virtual sal_Bool Load() = 0; - virtual sal_Bool Save() = 0; - virtual sal_Bool Create() = 0; - virtual sal_Bool CreateBitmapsForUI() = 0; + virtual sal_Bool Load() = 0; + virtual sal_Bool Save() = 0; + virtual sal_Bool Create() = 0; + virtual sal_Bool CreateBitmapsForUI() = 0; virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ) = 0; }; -- cgit