summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--formula/source/core/api/token.cxx11
-rw-r--r--sc/source/core/data/cell.cxx13
-rw-r--r--sc/source/core/data/cell2.cxx3
-rw-r--r--sc/source/core/data/table3.cxx3
-rw-r--r--sc/source/core/tool/chgtrack.cxx11
-rw-r--r--sc/source/core/tool/interpr1.cxx4
-rw-r--r--sc/source/core/tool/token.cxx11
-rw-r--r--sc/source/filter/excel/xestyle.cxx2
-rw-r--r--sc/source/filter/excel/xetable.cxx12
-rw-r--r--sc/source/filter/excel/xistyle.cxx2
-rw-r--r--sw/source/core/bastyp/swtypes.cxx56
-rw-r--r--sw/source/core/crsr/unocrsr.cxx2
-rw-r--r--sw/source/core/layout/atrfrm.cxx6
-rw-r--r--sw/source/core/text/txtinit.cxx10
-rw-r--r--tools/inc/tools/mempool.hxx21
-rw-r--r--tools/source/memtools/mempool.cxx3
-rw-r--r--tools/workben/mempooltest.cxx2
17 files changed, 75 insertions, 97 deletions
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index ca0186e3f688..3a4f63269a16 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -45,19 +45,16 @@ namespace formula
using namespace com::sun::star;
// ImpTokenIterator wird je Interpreter angelegt, mehrfache auch durch
// SubCode via FormulaTokenIterator Push/Pop moeglich
-IMPL_FIXEDMEMPOOL_NEWDEL( ImpTokenIterator, 32, 16 )
+IMPL_FIXEDMEMPOOL_NEWDEL( ImpTokenIterator )
// Align MemPools on 4k boundaries - 64 bytes (4k is a MUST for OS/2)
// Need a lot of FormulaDoubleToken
-const sal_uInt16 nMemPoolDoubleToken = (0x3000 - 64) / sizeof(FormulaDoubleToken);
-IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaDoubleToken, nMemPoolDoubleToken, nMemPoolDoubleToken )
+IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaDoubleToken )
// Need a lot of FormulaByteToken
-const sal_uInt16 nMemPoolByteToken = (0x3000 - 64) / sizeof(FormulaByteToken);
-IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaByteToken, nMemPoolByteToken, nMemPoolByteToken )
+IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaByteToken )
// Need several FormulaStringToken
-const sal_uInt16 nMemPoolStringToken = (0x1000 - 64) / sizeof(FormulaStringToken);
-IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken, nMemPoolStringToken, nMemPoolStringToken )
+IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken )
// --- helpers --------------------------------------------------------------
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 )
{
diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx
index 6a2119a14486..27f687d10912 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -59,34 +59,34 @@ using namespace com::sun::star;
String aEmptyStr; // Konstante Strings
String aDotStr('.'); // Konstante Strings
-IMPL_FIXEDMEMPOOL_NEWDEL( SwAttrSet, 25, 25 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwStartNode, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwEndNode, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBox, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwUndoDelete, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwUndoInsert, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwPaM, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwCursor, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwShellCrsr, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtNode, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwpHints, 25, 25 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwFntObj, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwFontObj, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwBorderAttrs, 100, 100 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwCellFrm, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwRowFrm, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwColumnFrm, 40, 40 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwSectionFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTabFrm, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwPageFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwBodyFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwHeaderFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwFooterFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtFrm, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableFmt, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableLineFmt, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBoxFmt, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( _SwCursor_SavePos, 20, 20 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwAttrSet )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwStartNode )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwEndNode )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBox )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwUndoDelete )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwUndoInsert )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwPaM )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwCursor )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwShellCrsr )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtNode )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwpHints )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwFntObj )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwFontObj )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwBorderAttrs )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwCellFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwRowFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwColumnFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwSectionFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTabFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwPageFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwBodyFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwHeaderFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwFooterFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTableFmt )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTableLineFmt )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBoxFmt )
+IMPL_FIXEDMEMPOOL_NEWDEL( _SwCursor_SavePos )
Size GetGraphicSizeTwip( const Graphic& rGraphic, OutputDevice* pOutDev )
diff --git a/sw/source/core/crsr/unocrsr.cxx b/sw/source/core/crsr/unocrsr.cxx
index 00d95c0d582a..36ea67f4c736 100644
--- a/sw/source/core/crsr/unocrsr.cxx
+++ b/sw/source/core/crsr/unocrsr.cxx
@@ -36,7 +36,7 @@
SV_IMPL_PTRARR( SwUnoCrsrTbl, SwUnoCrsrPtr )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwUnoCrsr, 10, 10 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwUnoCrsr )
SwUnoCrsr::SwUnoCrsr( const SwPosition &rPos, SwPaM* pRing )
: SwCursor( rPos, pRing, false ), SwModify( 0 ),
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 70fb124ef51f..49a66be6a70e 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2462,7 +2462,7 @@ SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* ) const
// Implementierung teilweise inline im hxx
TYPEINIT1( SwFrmFmt, SwFmt );
-IMPL_FIXEDMEMPOOL_NEWDEL_DLL( SwFrmFmt, 20, 20 )
+IMPL_FIXEDMEMPOOL_NEWDEL_DLL( SwFrmFmt )
void SwFrmFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
{
@@ -2690,7 +2690,7 @@ String SwFrmFmt::GetDescription() const
// Implementierung teilweise inline im hxx
TYPEINIT1( SwFlyFrmFmt, SwFrmFmt );
-IMPL_FIXEDMEMPOOL_NEWDEL( SwFlyFrmFmt, 10, 10 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwFlyFrmFmt )
SwFlyFrmFmt::~SwFlyFrmFmt()
{
@@ -3130,7 +3130,7 @@ SwHandleAnchorNodeChg::~SwHandleAnchorNodeChg()
// Implementierung teilweise inline im hxx
TYPEINIT1( SwDrawFrmFmt, SwFrmFmt );
-IMPL_FIXEDMEMPOOL_NEWDEL( SwDrawFrmFmt, 10, 10 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwDrawFrmFmt )
SwDrawFrmFmt::~SwDrawFrmFmt()
{
diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx
index de79a5af36e2..96eecc946e13 100644
--- a/sw/source/core/text/txtinit.cxx
+++ b/sw/source/core/text/txtinit.cxx
@@ -53,11 +53,11 @@ long SwTxtFrm::nMinPrtLine = 0;
SwContourCache *pContourCache = 0;
SwDropCapCache *pDropCapCache = 0;
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtLine, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwParaPortion, 50, 50 ) //Absaetze
-IMPL_FIXEDMEMPOOL_NEWDEL( SwLineLayout, 150, 150 ) //Zeilen
-IMPL_FIXEDMEMPOOL_NEWDEL( SwHolePortion, 150, 150 ) //z.B. Blanks am Zeilenende
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtPortion, 200, 100 ) //Attributwechsel
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtLine )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwParaPortion ) //Absaetze
+IMPL_FIXEDMEMPOOL_NEWDEL( SwLineLayout ) //Zeilen
+IMPL_FIXEDMEMPOOL_NEWDEL( SwHolePortion ) //z.B. Blanks am Zeilenende
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtPortion ) //Attributwechsel
/*************************************************************************
* _TextInit(), _TextFinit()
diff --git a/tools/inc/tools/mempool.hxx b/tools/inc/tools/mempool.hxx
index 0d8187882416..419941bb169e 100644
--- a/tools/inc/tools/mempool.hxx
+++ b/tools/inc/tools/mempool.hxx
@@ -28,6 +28,9 @@
#ifndef _SVMEMPOOL_HXX
#define _SVMEMPOOL_HXX
+#include "sal/config.h"
+
+#include "sal/macros.h"
#include "tools/toolsdllapi.h"
#include "tools/solar.h"
@@ -44,9 +47,7 @@ class TOOLS_DLLPUBLIC FixedMemPool
public:
FixedMemPool( char const * pTypeName,
- sal_uInt16 nTypeSize,
- sal_uInt16 nInitSize = 512,
- sal_uInt16 nGrowSize = 256 );
+ sal_uInt16 nTypeSize );
~FixedMemPool();
void* Alloc();
@@ -100,11 +101,8 @@ IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool )
DECL_FIXEDMEMPOOL_NEW_INLINE( Class, aPool ) \
DECL_FIXEDMEMPOOL_DEL_INLINE( Class, aPool )
-#define IMPL_FIXEDMEMPOOL_STRING(x) IMPL_FIXEDMEMPOOL_MAKESTRING(x)
-#define IMPL_FIXEDMEMPOOL_MAKESTRING(x) #x
-
-#define IMPL_FIXEDMEMPOOL_NEWDEL( Class, InitSize, GrowSize) \
- FixedMemPool Class::aPool( IMPL_FIXEDMEMPOOL_STRING( Class ), sizeof( Class ), (InitSize), (GrowSize) );
+#define IMPL_FIXEDMEMPOOL_NEWDEL( Class ) \
+ FixedMemPool Class::aPool( SAL_STRINGIFY( Class ), sizeof( Class ) );
#define DECL_FIXEDMEMPOOL_NEWDEL_DLL( Class ) \
private: \
@@ -113,16 +111,13 @@ IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool )
DECL_FIXEDMEMPOOL_NEW_DECL(); \
DECL_FIXEDMEMPOOL_DEL_DECL();
-#define IMPL_FIXEDMEMPOOL_NEWDEL_DLL( Class, InitSize, GrowSize) \
- FixedMemPool Class::aPool( IMPL_FIXEDMEMPOOL_STRING( Class ), sizeof( Class ), (InitSize), (GrowSize) ); \
+#define IMPL_FIXEDMEMPOOL_NEWDEL_DLL( Class ) \
+ FixedMemPool Class::aPool( SAL_STRINGIFY( Class ), sizeof( Class ) ); \
DECL_FIXEDMEMPOOL_NEW_IMPL( Class ) \
IMPL_FIXEDMEMPOOL_NEW_BODY( Class, aPool ) \
DECL_FIXEDMEMPOOL_DEL_IMPL( Class ) \
IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool )
-#define INIT_FIXEDMEMPOOL_NEWDEL_DLL( Class, aPool, InitSize, GrowSize ) \
- aPool( IMPL_FIXEDMEMPOOL_STRING( Class ), sizeof( Class ), (InitSize), (GrowSize) )
-
#endif // _SVMEMPOOL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/memtools/mempool.cxx b/tools/source/memtools/mempool.cxx
index 091d38d357b1..3d730deeb606 100644
--- a/tools/source/memtools/mempool.cxx
+++ b/tools/source/memtools/mempool.cxx
@@ -39,8 +39,7 @@
|*
*************************************************************************/
-FixedMemPool::FixedMemPool (
- char const * pTypeName, sal_uInt16 nTypeSize, sal_uInt16, sal_uInt16)
+FixedMemPool::FixedMemPool(char const * pTypeName, sal_uInt16 nTypeSize)
: m_pTypeName (pTypeName)
{
char name[RTL_CACHE_NAME_LENGTH + 1];
diff --git a/tools/workben/mempooltest.cxx b/tools/workben/mempooltest.cxx
index e99e2175d372..c5ee73960b0f 100644
--- a/tools/workben/mempooltest.cxx
+++ b/tools/workben/mempooltest.cxx
@@ -8,7 +8,7 @@ struct MempoolTest
DECL_FIXEDMEMPOOL_NEWDEL(MempoolTest);
};
-IMPL_FIXEDMEMPOOL_NEWDEL(MempoolTest, 0, 0);
+IMPL_FIXEDMEMPOOL_NEWDEL(MempoolTest);
int main()
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 01:52:07 +0000