[Libreoffice-commits] .: svx/inc svx/source
Joseph Powers
jpowers at kemper.freedesktop.org
Tue Jun 21 07:29:51 PDT 2011
svx/inc/svx/xtable.hxx | 26 +++++++++++++++-----------
svx/source/unodraw/XPropertyTable.cxx | 2 +-
svx/source/xoutdev/xtabbtmp.cxx | 2 +-
svx/source/xoutdev/xtabcolr.cxx | 2 +-
svx/source/xoutdev/xtabdash.cxx | 2 +-
svx/source/xoutdev/xtabgrdt.cxx | 2 +-
svx/source/xoutdev/xtabhtch.cxx | 2 +-
svx/source/xoutdev/xtable.cxx | 2 +-
svx/source/xoutdev/xtablend.cxx | 2 +-
9 files changed, 23 insertions(+), 19 deletions(-)
New commits:
commit 7b8b3a9dab6da4cbc1cbced2defe79455c8f3cfe
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Jun 21 07:29:15 2011 -0700
Remove nDummy parameter from XPropertyList::Remove()
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index 5e5d4c4..a8df5a7 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;
};
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index a7baeee..574b45d 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -171,7 +171,7 @@ void SAL_CALL SvxUnoXPropertyTable::removeByName( const OUString& Name )
if( pEntry && pEntry->GetName() == aInternalName )
{
if( mpList )
- delete mpList->Remove( i, 0 );
+ delete mpList->Remove( i );
else
delete mpTable->Remove( i );
return;
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index 2510ff6..207ab10 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -175,7 +175,7 @@ XBitmapEntry* XBitmapList::Replace(XBitmapEntry* pEntry, long nIndex )
XBitmapEntry* XBitmapList::Remove(long nIndex)
{
- return (XBitmapEntry*) XPropertyList::Remove(nIndex, 0);
+ return (XBitmapEntry*) XPropertyList::Remove(nIndex);
}
/************************************************************************/
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index e65ccbf..4958dfd 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -493,7 +493,7 @@ XColorEntry* XColorList::Replace(XColorEntry* pEntry, long nIndex )
XColorEntry* XColorList::Remove(long nIndex)
{
- return (XColorEntry*) XPropertyList::Remove(nIndex, 0);
+ return (XColorEntry*) XPropertyList::Remove(nIndex);
}
/************************************************************************/
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index b0f3422..5c405a1 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -263,7 +263,7 @@ XDashEntry* XDashList::Replace(XDashEntry* pEntry, long nIndex )
XDashEntry* XDashList::Remove(long nIndex)
{
- return (XDashEntry*) XPropertyList::Remove(nIndex, 0);
+ return (XDashEntry*) XPropertyList::Remove(nIndex);
}
XDashEntry* XDashList::GetDash(long nIndex) const
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 41dc11a..0e048b1 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -249,7 +249,7 @@ XGradientEntry* XGradientList::Replace(XGradientEntry* pEntry, long nIndex )
XGradientEntry* XGradientList::Remove(long nIndex)
{
- return( (XGradientEntry*) XPropertyList::Remove( nIndex, 0 ) );
+ return( (XGradientEntry*) XPropertyList::Remove( nIndex ) );
}
XGradientEntry* XGradientList::GetGradient(long nIndex) const
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index 8e3ece3..89970d4 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -257,7 +257,7 @@ XHatchEntry* XHatchList::Replace(XHatchEntry* pEntry, long nIndex )
XHatchEntry* XHatchList::Remove(long nIndex)
{
- return (XHatchEntry*) XPropertyList::Remove(nIndex, 0);
+ return (XHatchEntry*) XPropertyList::Remove(nIndex);
}
XHatchEntry* XHatchList::GetHatch(long nIndex) const
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index 9e17863..e04aa6e 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -493,7 +493,7 @@ XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex )
|*
*************************************************************************/
-XPropertyEntry* XPropertyList::Remove( long nIndex, sal_uInt16 /*nDummy*/)
+XPropertyEntry* XPropertyList::Remove( long nIndex )
{
if( pBmpList && !bBitmapsDirty )
{
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index cf7ea0b..f40f8d3 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -270,7 +270,7 @@ XLineEndEntry* XLineEndList::Replace(XLineEndEntry* pEntry, long nIndex )
XLineEndEntry* XLineEndList::Remove(long nIndex)
{
- return (XLineEndEntry*) XPropertyList::Remove(nIndex, 0);
+ return (XLineEndEntry*) XPropertyList::Remove(nIndex);
}
XLineEndEntry* XLineEndList::GetLineEnd(long nIndex) const
More information about the Libreoffice-commits
mailing list