[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sw
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Fri Jan 20 03:19:08 PST 2012
binfilter/bf_sc/source/core/data/sc_cell.cxx | 12 +---
binfilter/bf_sc/source/core/data/sc_cell2.cxx | 3 -
binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx | 11 +---
binfilter/bf_sc/source/core/tool/sc_interpr1.cxx | 6 +-
binfilter/bf_sc/source/core/tool/sc_token.cxx | 22 +++-----
binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx | 58 +++++++++++-----------
binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx | 2
binfilter/bf_sw/source/core/text/sw_txtinit.cxx | 10 +--
8 files changed, 55 insertions(+), 69 deletions(-)
New commits:
commit bee87efffce9405cbb47c46b1b1b06ca5b89209f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 20 11:46:18 2012 +0100
Mempool size args are unused.
diff --git a/binfilter/bf_sc/source/core/data/sc_cell.cxx b/binfilter/bf_sc/source/core/data/sc_cell.cxx
index 8ccfe99..503eafd 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell.cxx
@@ -79,14 +79,10 @@ namespace binfilter {
#ifdef USE_MEMPOOL
// MemPools auf 4k Boundaries - 64 Bytes ausrichten
-/*N*/ const USHORT nMemPoolValueCell = (0x8000 - 64) / sizeof(ScValueCell);
-/*N*/ const USHORT nMemPoolFormulaCell = (0x8000 - 64) / sizeof(ScFormulaCell);
-/*N*/ const USHORT nMemPoolStringCell = (0x4000 - 64) / sizeof(ScStringCell);
-/*N*/ const USHORT nMemPoolNoteCell = (0x1000 - 64) / sizeof(ScNoteCell);
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScValueCell, nMemPoolValueCell, nMemPoolValueCell )
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell, nMemPoolFormulaCell, nMemPoolFormulaCell )
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScStringCell, nMemPoolStringCell, nMemPoolStringCell )
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScNoteCell, nMemPoolNoteCell, nMemPoolNoteCell )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScValueCell )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScStringCell )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScNoteCell )
#endif
#ifdef _MSC_VER
diff --git a/binfilter/bf_sc/source/core/data/sc_cell2.cxx b/binfilter/bf_sc/source/core/data/sc_cell2.cxx
index 06844cb..e381e29 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell2.cxx
@@ -53,8 +53,7 @@ namespace binfilter {
#endif
#ifdef USE_MEMPOOL
-const USHORT nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScEditCell, nMemPoolEditCell, nMemPoolEditCell )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScEditCell )
#endif
#ifdef _MSC_VER
diff --git a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
index ce2fd90..ed20bb9 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
@@ -58,11 +58,9 @@ namespace binfilter {
/*N*/ DECLARE_STACK( ScChangeActionStack, ScChangeAction* )
-const USHORT nMemPoolChangeActionCellListEntry = (0x2000 - 64) / sizeof(ScChangeActionCellListEntry);
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionCellListEntry, nMemPoolChangeActionCellListEntry, nMemPoolChangeActionCellListEntry )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionCellListEntry )
-const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActionLinkEntry);
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionLinkEntry, nMemPoolChangeActionLinkEntry, nMemPoolChangeActionLinkEntry )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionLinkEntry )
// loaded MSB > eigenes => inkompatibel
#define SC_CHGTRACK_FILEFORMAT_FIRST 0x0001
@@ -1340,8 +1338,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
// --- ScChangeActionContent -----------------------------------------------
-const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeActionContent);
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionContent, nMemPoolChangeActionContent, nMemPoolChangeActionContent )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionContent )
/*N*/ ScChangeActionContent::ScChangeActionContent( SvStream& rStrm,
@@ -1999,7 +1996,7 @@ const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeAction
// --- ScChangeTrack -------------------------------------------------------
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeTrackMsgInfo, 16, 16 )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeTrackMsgInfo )
const USHORT ScChangeTrack::nContentRowsPerSlot = InitContentRowsPerSlot();
const USHORT ScChangeTrack::nContentSlots =
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
index 9eb51bd..f8622b9 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
@@ -73,9 +73,9 @@ namespace binfilter {
/*N*/ #pragma code_seg("SCSTATICS")
/*N*/ #endif
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScTokenStack, 8, 4 )
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScErrorStack, 8, 4 )
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScInterpreter, 32, 16 )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScTokenStack )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScErrorStack )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScInterpreter )
/*N*/ #ifdef _MSC_VER
/*N*/ #pragma code_seg()
diff --git a/binfilter/bf_sc/source/core/tool/sc_token.cxx b/binfilter/bf_sc/source/core/tool/sc_token.cxx
index e3f2d88..c7c1422 100644
--- a/binfilter/bf_sc/source/core/tool/sc_token.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_token.cxx
@@ -53,32 +53,26 @@ namespace binfilter {
// ImpTokenIterator wird je Interpreter angelegt, mehrfache auch durch
// SubCode via ScTokenIterator Push/Pop moeglich
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ImpTokenIterator, 32, 16 )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ImpTokenIterator )
// Align MemPools on 4k boundaries - 64 bytes (4k is a MUST for OS/2)
// Since RawTokens are temporary for the compiler, don't align on 4k and waste memory.
// ScRawToken size is FixMembers + MAXSTRLEN ~= 264
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScRawToken, 8, 4 )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScRawToken )
// Some ScDoubleRawToken, FixMembers + sizeof(double) ~= 16
-/*N*/ const USHORT nMemPoolDoubleRawToken = 0x0400 / sizeof(ScDoubleRawToken);
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleRawToken, nMemPoolDoubleRawToken, nMemPoolDoubleRawToken )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleRawToken )
// Need a whole bunch of ScSingleRefToken
-/*N*/ const USHORT nMemPoolSingleRefToken = (0x4000 - 64) / sizeof(ScSingleRefToken);
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScSingleRefToken, nMemPoolSingleRefToken, nMemPoolSingleRefToken )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScSingleRefToken )
// Need a lot of ScDoubleToken
-/*N*/ const USHORT nMemPoolDoubleToken = (0x3000 - 64) / sizeof(ScDoubleToken);
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleToken, nMemPoolDoubleToken, nMemPoolDoubleToken )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleToken )
// Need a lot of ScByteToken
-/*N*/ const USHORT nMemPoolByteToken = (0x3000 - 64) / sizeof(ScByteToken);
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScByteToken, nMemPoolByteToken, nMemPoolByteToken )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScByteToken )
// Need quite a lot of ScDoubleRefToken
-/*N*/ const USHORT nMemPoolDoubleRefToken = (0x2000 - 64) / sizeof(ScDoubleRefToken);
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleRefToken, nMemPoolDoubleRefToken, nMemPoolDoubleRefToken )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleRefToken )
// Need several ScStringToken
-/*N*/ const USHORT nMemPoolStringToken = (0x1000 - 64) / sizeof(ScStringToken);
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScStringToken, nMemPoolStringToken, nMemPoolStringToken )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScStringToken )
// --- helpers --------------------------------------------------------------
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx b/binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx
index 44d1f46..1e3747e 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx
@@ -72,35 +72,35 @@ using namespace ::comphelper;
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( 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( SwFrmFmt, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwFlyFrmFmt, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwDrawFrmFmt, 10, 10 )
-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( 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( SwFrmFmt )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwFlyFrmFmt )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwDrawFrmFmt )
+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 )
#ifndef PROFILE
diff --git a/binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx b/binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx
index 06a5c64..7649dd4 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx
@@ -43,7 +43,7 @@ namespace binfilter {
/*N*/ SV_IMPL_PTRARR( SwUnoCrsrTbl, SwUnoCrsrPtr )
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( SwUnoCrsr, 10, 10 )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( SwUnoCrsr )
/*N*/ SwUnoCrsr::SwUnoCrsr( const SwPosition &rPos, SwPaM* pRing )
/*N*/ : SwCursor( rPos, pRing ), SwModify( 0 ),
diff --git a/binfilter/bf_sw/source/core/text/sw_txtinit.cxx b/binfilter/bf_sw/source/core/text/sw_txtinit.cxx
index 7505353..8c8fd72 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtinit.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtinit.cxx
@@ -54,11 +54,11 @@ namespace binfilter {
#endif
#endif
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtLine, 50, 50 )
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( SwParaPortion, 50, 50 ) //Absaetze
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( SwLineLayout, 150, 150 ) //Zeilen
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( SwHolePortion, 150, 150 ) //z.B. Blanks am Zeilenende
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtPortion, 200, 100 ) //Attributwechsel
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtLine )
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( SwParaPortion ) //Absaetze
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( SwLineLayout ) //Zeilen
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( SwHolePortion ) //z.B. Blanks am Zeilenende
+/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtPortion ) //Attributwechsel
#ifndef PROFILE
#ifdef _MSC_VER
More information about the Libreoffice-commits
mailing list