Mempool size args are unused.

9 files changed, 24 insertions, 37 deletions

diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 155f4bdb8df2..2f3df26edcbf 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -71,15 +71,10 @@ const sal_uInt16 MAXRECURSION = 400;
 // STATIC DATA -----------------------------------------------------------
 
 #ifdef USE_MEMPOOL
-// MemPools auf 4k Boundaries  - 64 Bytes ausrichten
-const sal_uInt16 nMemPoolValueCell = (0x8000 - 64) / sizeof(ScValueCell);
-const sal_uInt16 nMemPoolFormulaCell = (0x8000 - 64) / sizeof(ScFormulaCell);
-const sal_uInt16 nMemPoolStringCell = (0x4000 - 64) / sizeof(ScStringCell);
-const sal_uInt16 nMemPoolNoteCell = (0x1000 - 64) / sizeof(ScNoteCell);
-IMPL_FIXEDMEMPOOL_NEWDEL( ScValueCell,   nMemPoolValueCell, nMemPoolValueCell )
-IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell, nMemPoolFormulaCell, nMemPoolFormulaCell )
-IMPL_FIXEDMEMPOOL_NEWDEL( ScStringCell,  nMemPoolStringCell, nMemPoolStringCell )
-IMPL_FIXEDMEMPOOL_NEWDEL( ScNoteCell,    nMemPoolNoteCell, nMemPoolNoteCell )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScValueCell )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScStringCell )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScNoteCell )
 #endif
 
 // ============================================================================
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index e06d466fb270..117d31df7dc0 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -59,8 +59,7 @@ using namespace formula;
 // STATIC DATA -----------------------------------------------------------
 
 #ifdef USE_MEMPOOL
-const sal_uInt16 nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
-IMPL_FIXEDMEMPOOL_NEWDEL( ScEditCell, nMemPoolEditCell, nMemPoolEditCell )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScEditCell )
 #endif
 
 // ============================================================================
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 5525888f5ca1..550d610d0386 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -211,8 +211,7 @@ struct ScSortInfo
     SCCOLROW        nOrg;
     DECL_FIXEDMEMPOOL_NEWDEL( ScSortInfo );
 };
-const sal_uInt16 nMemPoolSortInfo = (0x8000 - 64) / sizeof(ScSortInfo);
-IMPL_FIXEDMEMPOOL_NEWDEL( ScSortInfo, nMemPoolSortInfo, nMemPoolSortInfo )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScSortInfo )
 
 // END OF STATIC DATA -----------------------------------------------------
 
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index d38d0ce42ef4..fb70fef3d4f7 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -55,11 +55,9 @@
 #define SC_CHGTRACK_CXX
 #include "chgtrack.hxx"
 
-const sal_uInt16 nMemPoolChangeActionCellListEntry = (0x2000 - 64) / sizeof(ScChangeActionCellListEntry);
-IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionCellListEntry, nMemPoolChangeActionCellListEntry, nMemPoolChangeActionCellListEntry )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionCellListEntry )
 
-const sal_uInt16 nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActionLinkEntry);
-IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionLinkEntry, nMemPoolChangeActionLinkEntry, nMemPoolChangeActionLinkEntry )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionLinkEntry )
 
 // loaded MSB > eigenes => inkompatibel
 #define SC_CHGTRACK_FILEFORMAT_FIRST    0x0001
@@ -1252,8 +1250,7 @@ sal_Bool ScChangeActionMove::Reject( ScDocument* pDoc )
 
 // --- ScChangeActionContent -----------------------------------------------
 
-const sal_uInt16 nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeActionContent);
-IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionContent, nMemPoolChangeActionContent, nMemPoolChangeActionContent )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionContent )
 
 ScChangeActionContent::ScChangeActionContent( const sal_uLong nActionNumber,
             const ScChangeActionState eStateP, const sal_uLong nRejectingNumber,
@@ -2031,7 +2028,7 @@ ScChangeActionReject::ScChangeActionReject(const sal_uLong nActionNumber, const
 
 // --- ScChangeTrack -------------------------------------------------------
 
-IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeTrackMsgInfo, 16, 16 )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeTrackMsgInfo )
 
 const SCROW ScChangeTrack::nContentRowsPerSlot = InitContentRowsPerSlot();
 const SCSIZE ScChangeTrack::nContentSlots =
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index fc6c0a2b0aad..ac4886cb6e3e 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -79,8 +79,8 @@
 
 static const sal_uInt64 n2power48 = SAL_CONST_UINT64( 281474976710656); // 2^48
 
-IMPL_FIXEDMEMPOOL_NEWDEL( ScTokenStack, 8, 4 )
-IMPL_FIXEDMEMPOOL_NEWDEL( ScInterpreter, 32, 16 )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScTokenStack )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScInterpreter )
 
 ScTokenStack* ScInterpreter::pGlobalStack = NULL;
 bool ScInterpreter::bGlobalStackInUse = false;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 133324feb71a..0bbb3d6cc07b 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -112,17 +112,14 @@ namespace
 
 // Since RawTokens are temporary for the compiler, don't align on 4k and waste memory.
 // ScRawToken size is FixMembers + MAXSTRLEN + ~4 ~= 1036
-IMPL_FIXEDMEMPOOL_NEWDEL( ScRawToken, 8, 4 )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScRawToken )
 // Some ScDoubleRawToken, FixMembers + sizeof(double) ~= 16
-const sal_uInt16 nMemPoolDoubleRawToken = 0x0400 / sizeof(ScDoubleRawToken);
-IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleRawToken, nMemPoolDoubleRawToken, nMemPoolDoubleRawToken )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleRawToken )
 
 // Need a whole bunch of ScSingleRefToken
-const sal_uInt16 nMemPoolSingleRefToken = (0x4000 - 64) / sizeof(ScSingleRefToken);
-IMPL_FIXEDMEMPOOL_NEWDEL( ScSingleRefToken, nMemPoolSingleRefToken, nMemPoolSingleRefToken )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScSingleRefToken )
 // Need quite a lot of ScDoubleRefToken
-const sal_uInt16 nMemPoolDoubleRefToken = (0x2000 - 64) / sizeof(ScDoubleRefToken);
-IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleRefToken, nMemPoolDoubleRefToken, nMemPoolDoubleRefToken )
+IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleRefToken )
 
 // --- helpers --------------------------------------------------------------
 
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 11757bba24e7..1d7f190b7d28 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -158,7 +158,7 @@ public:
     void                Merge( const XclListColor& rColor );
 };
 
-IMPL_FIXEDMEMPOOL_NEWDEL( XclListColor, 100, 100 )
+IMPL_FIXEDMEMPOOL_NEWDEL( XclListColor )
 
 XclListColor::XclListColor( const Color& rColor, sal_uInt32 nColorId ) :
     maColor( rColor ),
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 257118825cae..d35699006140 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -570,7 +570,7 @@ void XclExpSingleCellBase::WriteBody( XclExpStream& rStrm )
 
 // ----------------------------------------------------------------------------
 
-IMPL_FIXEDMEMPOOL_NEWDEL( XclExpNumberCell, 256, 256 )
+IMPL_FIXEDMEMPOOL_NEWDEL( XclExpNumberCell )
 
 XclExpNumberCell::XclExpNumberCell(
         const XclExpRoot& rRoot, const XclAddress& rXclPos,
@@ -616,7 +616,7 @@ void XclExpNumberCell::WriteContents( XclExpStream& rStrm )
 
 // ----------------------------------------------------------------------------
 
-IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBooleanCell, 256, 256 )
+IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBooleanCell )
 
 XclExpBooleanCell::XclExpBooleanCell(
         const XclExpRoot rRoot, const XclAddress& rXclPos,
@@ -647,7 +647,7 @@ void XclExpBooleanCell::WriteContents( XclExpStream& rStrm )
     rStrm << sal_uInt16( mbValue ? 1 : 0 ) << EXC_BOOLERR_BOOL;
 }
 
-IMPL_FIXEDMEMPOOL_NEWDEL( XclExpLabelCell, 256, 256 )
+IMPL_FIXEDMEMPOOL_NEWDEL( XclExpLabelCell )
 
 XclExpLabelCell::XclExpLabelCell(
         const XclExpRoot& rRoot, const XclAddress& rXclPos,
@@ -757,7 +757,7 @@ void XclExpLabelCell::WriteContents( XclExpStream& rStrm )
 
 // ----------------------------------------------------------------------------
 
-IMPL_FIXEDMEMPOOL_NEWDEL( XclExpFormulaCell, 256, 256 )
+IMPL_FIXEDMEMPOOL_NEWDEL( XclExpFormulaCell )
 
 XclExpFormulaCell::XclExpFormulaCell(
         const XclExpRoot& rRoot, const XclAddress& rXclPos,
@@ -1194,7 +1194,7 @@ void XclExpMultiCellBase::RemoveUnusedXFIndexes( const ScfUInt16Vec& rXFIndexes
 
 // ----------------------------------------------------------------------------
 
-IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBlankCell, 256, 256 )
+IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBlankCell )
 
 XclExpBlankCell::XclExpBlankCell( const XclAddress& rXclPos, const XclExpMultiXFId& rXFId ) :
     XclExpMultiCellBase( EXC_ID3_BLANK, EXC_ID_MULBLANK, 0, rXclPos )
@@ -1244,7 +1244,7 @@ void XclExpBlankCell::WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress
 
 // ----------------------------------------------------------------------------
 
-IMPL_FIXEDMEMPOOL_NEWDEL( XclExpRkCell, 256, 256 )
+IMPL_FIXEDMEMPOOL_NEWDEL( XclExpRkCell )
 
 XclExpRkCell::XclExpRkCell(
         const XclExpRoot& rRoot, const XclAddress& rXclPos,
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 21310951bd31..53a75d0ddcc9 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -1588,7 +1588,7 @@ ScStyleSheet* XclImpXFBuffer::CreateStyleSheet( sal_uInt16 nXFIndex )
 
 // Buffer for XF indexes in cells =============================================
 
-IMPL_FIXEDMEMPOOL_NEWDEL( XclImpXFRange, 100, 500 )
+IMPL_FIXEDMEMPOOL_NEWDEL( XclImpXFRange )
 
 bool XclImpXFRange::Expand( SCROW nScRow, const XclImpXFIndex& rXFIndex )
 {