[Libreoffice-commits] .: svx/inc svx/source
Joseph Powers
jpowers at kemper.freedesktop.org
Wed Jun 22 21:01:35 PDT 2011
svx/inc/svx/xtable.hxx | 170 ++++++++++++++++++++++------------------
svx/source/xoutdev/xtabbtmp.cxx | 14 +--
svx/source/xoutdev/xtabcolr.cxx | 13 +--
svx/source/xoutdev/xtabdash.cxx | 15 +--
svx/source/xoutdev/xtabgrdt.cxx | 15 +--
svx/source/xoutdev/xtabhtch.cxx | 20 ++--
svx/source/xoutdev/xtable.cxx | 24 +++--
svx/source/xoutdev/xtablend.cxx | 20 ++--
8 files changed, 161 insertions(+), 130 deletions(-)
New commits:
commit 14e4996e9be620e0e550c227eb76cc6fa179bbb0
Author: Joseph Powers <jpowers27 at cox.net>
Date: Wed Jun 22 21:01:25 2011 -0700
Cleanup up some unused parameters
The xxxList classes no longer need nInitSize & nReSize. THe xxxTable ones
still do; however, this could be fixed by a future Table cleanup project.
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index bd82070..5bcebc2 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -202,10 +202,12 @@ protected:
sal_Bool bBitmapsDirty;
sal_Bool bOwnPool;
- XPropertyTable( const String& rPath,
- XOutdevItemPool* pXPool = NULL,
- sal_uInt16 nInitSize = 16,
- sal_uInt16 nReSize = 16 );
+ XPropertyTable(
+ const String& rPath,
+ XOutdevItemPool* pXPool = NULL,
+ sal_uInt16 nInitSize = 16,
+ sal_uInt16 nReSize = 16
+ );
XPropertyTable( SvStream& rIn );
void Clear();
@@ -303,24 +305,24 @@ public:
class SVX_DLLPUBLIC XColorTable : public XPropertyTable
{
public:
- explicit XColorTable( const String& rPath,
- XOutdevItemPool* pXPool = NULL,
- sal_uInt16 nInitSize = 16,
- sal_uInt16 nReSize = 16 );
+ explicit XColorTable(
+ const String& rPath,
+ XOutdevItemPool* pXPool = NULL
+ );
virtual ~XColorTable();
using XPropertyTable::Replace;
- XColorEntry* Replace(long nIndex, XColorEntry* pEntry );
+ XColorEntry* Replace(long nIndex, XColorEntry* pEntry );
using XPropertyTable::Remove;
- XColorEntry* Remove(long nIndex);
+ XColorEntry* Remove(long nIndex);
using XPropertyTable::Get;
- XColorEntry* GetColor(long nIndex) const;
+ XColorEntry* GetColor(long nIndex) const;
virtual sal_Bool Load();
virtual sal_Bool Save();
virtual sal_Bool Create();
virtual sal_Bool CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
+ virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
static XColorTable& GetStdColorTable();
};
@@ -332,24 +334,24 @@ public:
class XColorList : public XPropertyList
{
public:
- explicit XColorList( const String& rPath,
- XOutdevItemPool* pXPool = NULL,
- sal_uInt16 nInitSize = 16,
- sal_uInt16 nReSize = 16 );
+ explicit XColorList(
+ const String& rPath,
+ XOutdevItemPool* pXPool = NULL
+ );
virtual ~XColorList();
using XPropertyList::Replace;
- XColorEntry* Replace(XColorEntry* pEntry, long nIndex );
+ XColorEntry* Replace(XColorEntry* pEntry, long nIndex );
using XPropertyList::Remove;
- XColorEntry* Remove(long nIndex);
+ XColorEntry* Remove(long nIndex);
using XPropertyList::Get;
- XColorEntry* GetColor(long nIndex) const;
+ XColorEntry* GetColor(long nIndex) const;
virtual sal_Bool Load();
virtual sal_Bool Save();
virtual sal_Bool Create();
virtual sal_Bool CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
+ virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
};
// --------------------
@@ -359,18 +361,20 @@ public:
class XLineEndTable : public XPropertyTable
{
public:
- explicit XLineEndTable( const String& rPath,
- XOutdevItemPool* pXPool = NULL,
- sal_uInt16 nInitSize = 16,
- sal_uInt16 nReSize = 16 );
+ explicit XLineEndTable(
+ const String& rPath,
+ XOutdevItemPool* pXPool = NULL,
+ sal_uInt16 nInitSize = 16,
+ sal_uInt16 nReSize = 16
+ );
virtual ~XLineEndTable();
using XPropertyTable::Replace;
- XLineEndEntry* Replace(long nIndex, XLineEndEntry* pEntry );
+ XLineEndEntry* Replace(long nIndex, XLineEndEntry* pEntry );
using XPropertyTable::Remove;
- XLineEndEntry* Remove(long nIndex);
+ XLineEndEntry* Remove(long nIndex);
using XPropertyTable::Get;
- XLineEndEntry* GetLineEnd(long nIndex) const;
+ XLineEndEntry* GetLineEnd(long nIndex) const;
virtual sal_Bool Load();
virtual sal_Bool Save();
@@ -393,8 +397,11 @@ private:
void impDestroy();
public:
- explicit XLineEndList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16);
- virtual ~XLineEndList();
+ explicit XLineEndList(
+ const String& rPath,
+ XOutdevItemPool* pXPool = 0
+ );
+ virtual ~XLineEndList();
using XPropertyList::Replace;
XLineEndEntry* Replace(XLineEndEntry* pEntry, long nIndex);
@@ -417,10 +424,12 @@ public:
class XDashTable : public XPropertyTable
{
public:
- explicit XDashTable( const String& rPath,
- XOutdevItemPool* pXPool = NULL,
- sal_uInt16 nInitSize = 16,
- sal_uInt16 nReSize = 16 );
+ explicit XDashTable(
+ const String& rPath,
+ XOutdevItemPool* pXPool = NULL,
+ sal_uInt16 nInitSize = 16,
+ sal_uInt16 nReSize = 16
+ );
virtual ~XDashTable();
using XPropertyTable::Replace;
@@ -451,21 +460,24 @@ private:
void impDestroy();
public:
- explicit XDashList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16);
- virtual ~XDashList();
+ explicit XDashList(
+ const String& rPath,
+ XOutdevItemPool* pXPool = 0
+ );
+ virtual ~XDashList();
using XPropertyList::Replace;
- XDashEntry* Replace(XDashEntry* pEntry, long nIndex);
+ XDashEntry* Replace(XDashEntry* pEntry, long nIndex);
using XPropertyList::Remove;
- XDashEntry* Remove(long nIndex);
+ XDashEntry* Remove(long nIndex);
using XPropertyList::Get;
- XDashEntry* GetDash(long nIndex) const;
+ XDashEntry* GetDash(long nIndex) const;
- virtual sal_Bool Load();
- virtual sal_Bool Save();
- virtual sal_Bool Create();
- virtual sal_Bool CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
+ virtual sal_Bool Load();
+ virtual sal_Bool Save();
+ virtual sal_Bool Create();
+ virtual sal_Bool CreateBitmapsForUI();
+ virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
};
// --------------------
@@ -475,10 +487,12 @@ public:
class XHatchTable : public XPropertyTable
{
public:
- explicit XHatchTable( const String& rPath,
- XOutdevItemPool* pXPool = NULL,
- sal_uInt16 nInitSize = 16,
- sal_uInt16 nReSize = 16 );
+ explicit XHatchTable(
+ const String& rPath,
+ XOutdevItemPool* pXPool = NULL,
+ sal_uInt16 nInitSize = 16,
+ sal_uInt16 nReSize = 16
+ );
virtual ~XHatchTable();
using XPropertyTable::Replace;
@@ -509,7 +523,10 @@ private:
void impDestroy();
public:
- explicit XHatchList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16);
+ explicit XHatchList(
+ const String& rPath,
+ XOutdevItemPool* pXPool = 0
+ );
~XHatchList();
using XPropertyList::Replace;
@@ -533,10 +550,12 @@ public:
class XGradientTable : public XPropertyTable
{
public:
- explicit XGradientTable( const String& rPath,
- XOutdevItemPool* pXPool = NULL,
- sal_uInt16 nInitSize = 16,
- sal_uInt16 nReSize = 16 );
+ explicit XGradientTable(
+ const String& rPath,
+ XOutdevItemPool* pXPool = NULL,
+ sal_uInt16 nInitSize = 16,
+ sal_uInt16 nReSize = 16
+ );
virtual ~XGradientTable();
using XPropertyTable::Replace;
@@ -550,7 +569,7 @@ public:
virtual sal_Bool Save();
virtual sal_Bool Create();
virtual sal_Bool CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
+ virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
};
// -------------------
@@ -567,21 +586,24 @@ private:
void impDestroy();
public:
- explicit XGradientList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16);
- virtual ~XGradientList();
+ explicit XGradientList(
+ const String& rPath,
+ XOutdevItemPool* pXPool = 0
+ );
+ virtual ~XGradientList();
using XPropertyList::Replace;
- XGradientEntry* Replace(XGradientEntry* pEntry, long nIndex);
+ XGradientEntry* Replace(XGradientEntry* pEntry, long nIndex);
using XPropertyList::Remove;
- XGradientEntry* Remove(long nIndex);
+ XGradientEntry* Remove(long nIndex);
using XPropertyList::Get;
- XGradientEntry* GetGradient(long nIndex) const;
+ XGradientEntry* GetGradient(long nIndex) const;
- virtual sal_Bool Load();
- virtual sal_Bool Save();
- virtual sal_Bool Create();
- virtual sal_Bool CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
+ virtual sal_Bool Load();
+ virtual sal_Bool Save();
+ virtual sal_Bool Create();
+ virtual sal_Bool CreateBitmapsForUI();
+ virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
};
// ---------------------
@@ -591,10 +613,12 @@ public:
class XBitmapTable : public XPropertyTable
{
public:
- explicit XBitmapTable( const String& rPath,
- XOutdevItemPool* pXPool = NULL,
- sal_uInt16 nInitSize = 16,
- sal_uInt16 nReSize = 16 );
+ explicit XBitmapTable(
+ const String& rPath,
+ XOutdevItemPool* pXPool = NULL,
+ sal_uInt16 nInitSize = 16,
+ sal_uInt16 nReSize = 16
+ );
virtual ~XBitmapTable();
using XPropertyTable::Replace;
@@ -608,7 +632,7 @@ public:
virtual sal_Bool Save();
virtual sal_Bool Create();
virtual sal_Bool CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
+ virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
};
// -------------------
@@ -618,10 +642,10 @@ public:
class SVX_DLLPUBLIC XBitmapList : public XPropertyList
{
public:
- explicit XBitmapList( const String& rPath,
- XOutdevItemPool* pXPool = NULL,
- sal_uInt16 nInitSize = 16,
- sal_uInt16 nReSize = 16 );
+ explicit XBitmapList(
+ const String& rPath,
+ XOutdevItemPool* pXPool = NULL
+ );
virtual ~XBitmapList();
using XPropertyList::Replace;
@@ -635,7 +659,7 @@ public:
virtual sal_Bool Save();
virtual sal_Bool Create();
virtual sal_Bool CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
+ virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
};
#endif // _XTABLE_HXX
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index 207ab10..396a8d4 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -68,10 +68,12 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
|*
*************************************************************************/
-XBitmapTable::XBitmapTable( const String& rPath,
- XOutdevItemPool* pInPool,
- sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
- XPropertyTable( rPath, pInPool, nInitSize, nReSize)
+XBitmapTable::XBitmapTable(
+ const String& rPath,
+ XOutdevItemPool* pInPool,
+ sal_uInt16 nInitSize,
+ sal_uInt16 nReSize
+) : XPropertyTable( rPath, pInPool, nInitSize, nReSize )
{
pBmpTable = new Table( nInitSize, nReSize );
}
@@ -150,9 +152,7 @@ Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
XBitmapList::XBitmapList(
const String& rPath,
- XOutdevItemPool* pInPool,
- sal_uInt16 /* nInitSize */,
- sal_uInt16 /* nReSize */
+ XOutdevItemPool* pInPool
) : XPropertyList( rPath, pInPool )
{
// pBmpList = new List( nInitSize, nReSize );
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index 4958dfd..0a9b25f 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -63,10 +63,11 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
|*
*************************************************************************/
-XColorTable::XColorTable( const String& rPath,
- XOutdevItemPool* pInPool,
- sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
- XPropertyTable( rPath, pInPool, nInitSize, nReSize)
+XColorTable::XColorTable(
+ const String& rPath,
+ XOutdevItemPool* pInPool
+) :
+ XPropertyTable( rPath, pInPool )
{
// ColorTable braucht keine eigene BmpTable
// pBmpTable = new Table( nInitSize, nReSize );
@@ -468,9 +469,7 @@ Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
XColorList::XColorList(
const String& rPath,
- XOutdevItemPool* pInPool,
- sal_uInt16 /* nInitSize */,
- sal_uInt16 /* nReSize */
+ XOutdevItemPool* pInPool
) : XPropertyList( rPath, pInPool )
{
// pBmpList = new List( nInitSize, nReSize );
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 9571ee4..f5c0d1a 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -83,10 +83,13 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
|*
*************************************************************************/
-XDashTable::XDashTable( const String& rPath,
- XOutdevItemPool* pInPool,
- sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
- XPropertyTable( rPath, pInPool, nInitSize, nReSize)
+XDashTable::XDashTable(
+ const String& rPath,
+ XOutdevItemPool* pInPool,
+ sal_uInt16 nInitSize,
+ sal_uInt16 nReSize
+) :
+ XPropertyTable( rPath, pInPool, nInitSize, nReSize )
{
pBmpTable = new Table( nInitSize, nReSize );
}
@@ -242,9 +245,7 @@ void XDashList::impDestroy()
XDashList::XDashList(
const String& rPath,
- XOutdevItemPool* pInPool,
- sal_uInt16 /* nInitSize */,
- sal_uInt16 /* nReSize */
+ XOutdevItemPool* pInPool
) : XPropertyList( rPath, pInPool ),
mpData(0)
{
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 868fce0..e954671 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -79,10 +79,13 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
|*
*************************************************************************/
-XGradientTable::XGradientTable( const String& rPath,
- XOutdevItemPool* pInPool,
- sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
- XPropertyTable( rPath, pInPool, nInitSize, nReSize)
+XGradientTable::XGradientTable(
+ const String& rPath,
+ XOutdevItemPool* pInPool,
+ sal_uInt16 nInitSize,
+ sal_uInt16 nReSize
+) :
+ XPropertyTable( rPath, pInPool, nInitSize, nReSize )
{
pBmpTable = new Table( nInitSize, nReSize );
}
@@ -224,9 +227,7 @@ void XGradientList::impDestroy()
XGradientList::XGradientList(
const String& rPath,
- XOutdevItemPool* pInPool,
- sal_uInt16 /* nInitSize */,
- sal_uInt16 /* nReSize */
+ XOutdevItemPool* pInPool
) : XPropertyList( rPath, pInPool ),
mpData(0)
{
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index f88f012..864e325 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -77,10 +77,14 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
|*
*************************************************************************/
-XHatchTable::XHatchTable( const String& rPath,
- XOutdevItemPool* pInPool,
- sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
- XPropertyTable( rPath, pInPool, nInitSize, nReSize)
+XHatchTable::XHatchTable(
+ const String& rPath,
+ XOutdevItemPool* pInPool,
+ sal_uInt16
+ nInitSize,
+ sal_uInt16 nReSize
+)
+ : XPropertyTable( rPath, pInPool, nInitSize, nReSize )
{
pBmpTable = new Table( nInitSize, nReSize );
}
@@ -232,11 +236,9 @@ void XHatchList::impDestroy()
XHatchList::XHatchList(
const String& rPath,
- XOutdevItemPool* pInPool,
- sal_uInt16 /* nInitSize */,
- sal_uInt16 /* nReSize */
-) : XPropertyList( rPath, pInPool ),
- mpData(0)
+ XOutdevItemPool* pInPool
+) : XPropertyList( rPath, pInPool )
+ , mpData(0)
{
pBmpList = new BitmapList_impl();
}
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index 3964b49..e525179 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -56,17 +56,19 @@ Color RGB_Color( ColorData nColorName )
|*
*************************************************************************/
-XPropertyTable::XPropertyTable( const String& rPath,
- XOutdevItemPool* pInPool,
- sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
- aName ( pszStandard, 8 ),
- aPath ( rPath ),
- pXPool ( pInPool ),
- aTable ( nInitSize, nReSize ),
- pBmpTable ( NULL ),
- bTableDirty ( sal_True ),
- bBitmapsDirty ( sal_True ),
- bOwnPool ( sal_False )
+XPropertyTable::XPropertyTable(
+ const String& rPath,
+ XOutdevItemPool* pInPool,
+ sal_uInt16 nInitSize,
+ sal_uInt16 nReSize
+) : aName ( pszStandard, 8 )
+ , aPath ( rPath )
+ , pXPool ( pInPool )
+ , aTable ( nInitSize, nReSize )
+ , pBmpTable ( NULL )
+ , bTableDirty ( sal_True )
+ , bBitmapsDirty ( sal_True )
+ , bOwnPool ( sal_False )
{
if( !pXPool )
{
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index 6326eee..b1ec41a 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -90,10 +90,13 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
|*
*************************************************************************/
-XLineEndTable::XLineEndTable( const String& rPath,
- XOutdevItemPool* pInPool,
- sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
- XPropertyTable( rPath, pInPool, nInitSize, nReSize)
+XLineEndTable::XLineEndTable(
+ const String& rPath,
+ XOutdevItemPool* pInPool,
+ sal_uInt16 nInitSize,
+ sal_uInt16 nReSize
+)
+ : XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
pBmpTable = new Table( nInitSize, nReSize );
}
@@ -249,11 +252,10 @@ void XLineEndList::impDestroy()
XLineEndList::XLineEndList(
const String& rPath,
- XOutdevItemPool* _pXPool,
- sal_uInt16 /* nInitSize */,
- sal_uInt16 /* nReSize */
-) : XPropertyList( rPath, _pXPool ),
- mpData(0)
+ XOutdevItemPool* _pXPool
+)
+ : XPropertyList( rPath, _pXPool )
+ , mpData(0)
{
pBmpList = new BitmapList_impl();
}
More information about the Libreoffice-commits
mailing list