remove mempool

we've been using the normal memory allocator instead of the sal slab
allocator ever since
commit bc6a5d8e79e7d0e7d75ac107aa8e6aa275e434e9
Date:   Wed Nov 15 16:52:44 2017 +0530
Disable custom allocator

Change-Id: I3383962cedb85d56fbec695398901f6ff7057651
Reviewed-on: https://gerrit.libreoffice.org/58577
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

15 files changed, 0 insertions, 76 deletions

diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 9f554ff9c347..eb7c63d3174c 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -29,7 +29,6 @@
 #include <tools/color.hxx>
 #include <tools/datetime.hxx>
 #include <tools/link.hxx>
-#include <tools/mempool.hxx>
 #include <unotools/options.hxx>
 #include "global.hxx"
 #include "bigrange.hxx"
@@ -111,8 +110,6 @@ protected:
 
 public:
 
-    DECL_FIXEDMEMPOOL_NEWDEL( ScChangeActionLinkEntry )
-
     ScChangeActionLinkEntry(
             ScChangeActionLinkEntry** ppPrevP,
             ScChangeAction* pActionP )
@@ -684,9 +681,6 @@ protected:
     using ScChangeAction::GetRefString;
 
 public:
-
-    DECL_FIXEDMEMPOOL_NEWDEL( ScChangeActionContent )
-
     ScChangeActionContent( const ScRange& rRange );
 
     ScChangeActionContent(
@@ -797,8 +791,6 @@ enum ScChangeTrackMsgType
 
 struct ScChangeTrackMsgInfo
 {
-    DECL_FIXEDMEMPOOL_NEWDEL( ScChangeTrackMsgInfo )
-
     ScChangeTrackMsgType    eMsgType;
     sal_uLong                   nStartAction;
     sal_uLong                   nEndAction;
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index cd7fd4895aae..5d8f10a8de4e 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -22,7 +22,6 @@
 
 #include <string.h>
 
-#include <tools/mempool.hxx>
 #include "scdllapi.h"
 #include "global.hxx"
 #include "refdata.hxx"
@@ -142,7 +141,6 @@ public:
 private:
                 ~ScRawToken() {}                //! only delete via Delete()
 public:
-                DECL_FIXEDMEMPOOL_NEWDEL( ScRawToken );
     formula::StackVar    GetType()   const       { return eType; }
     OpCode      GetOpCode() const       { return eOp; }
     void        NewOpCode( OpCode e )   { eOp = e; }
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 8091a00198f5..d0842e8e0a3e 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -167,8 +167,6 @@ public:
 
     enum CompareState { NotEqual = 0, EqualInvariant, EqualRelativeRef };
 
-    DECL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
-
     ScAddress       aPos;
 
                     virtual ~ScFormulaCell() override;
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 2da16066e49e..6ee0607737ab 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -25,7 +25,6 @@
 
 #include <formula/opcode.hxx>
 #include "refdata.hxx"
-#include <tools/mempool.hxx>
 #include "scdllapi.h"
 #include <formula/token.hxx>
 #include "calcmacros.hxx"
@@ -75,8 +74,6 @@ public:
     virtual bool                TextEqual( const formula::FormulaToken& rToken ) const override;
     virtual bool                operator==( const formula::FormulaToken& rToken ) const override;
     virtual FormulaToken*       Clone() const override { return new ScSingleRefToken(*this); }
-
-    DECL_FIXEDMEMPOOL_NEWDEL( ScSingleRefToken );
 };
 
 class ScDoubleRefToken : public formula::FormulaToken
@@ -95,8 +92,6 @@ public:
     virtual bool                TextEqual( const formula::FormulaToken& rToken ) const override;
     virtual bool                operator==( const formula::FormulaToken& rToken ) const override;
     virtual FormulaToken*       Clone() const override { return new ScDoubleRefToken(*this); }
-
-    DECL_FIXEDMEMPOOL_NEWDEL( ScDoubleRefToken );
 };
 
 class ScMatrixToken : public formula::FormulaToken
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 53e82c367d47..72925d6c3352 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -81,8 +81,6 @@
 
 using namespace formula;
 
-IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
-
 #define DEBUG_CALCULATION 0
 #if DEBUG_CALCULATION
 static bool bDebugCalculationActive = false;                // Set to true for global active init,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index e7aec8766811..d431dcb3c53e 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -101,7 +101,6 @@ class SharedStringPool;
 class ScTokenStack
 {
 public:
-    DECL_FIXEDMEMPOOL_NEWDEL( ScTokenStack )
     const formula::FormulaToken* pPointer[ MAXSTACK ];
 };
 
@@ -151,8 +150,6 @@ class ScInterpreter
     friend class ScChiSqDistFunction;
 
 public:
-    DECL_FIXEDMEMPOOL_NEWDEL( ScInterpreter )
-
     static SC_DLLPUBLIC void SetGlobalConfig(const ScCalcConfig& rConfig);
     static SC_DLLPUBLIC const ScCalcConfig& GetGlobalConfig();
 
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index bd22f2a5381d..840e5905af9a 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -50,8 +50,6 @@
 #include <memory>
 #include <boost/property_tree/json_parser.hpp>
 
-IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionLinkEntry )
-
 ScChangeAction::ScChangeAction( ScChangeActionType eTypeP, const ScRange& rRange )
         :
         aBigRange( rRange ),
@@ -1282,9 +1280,6 @@ bool ScChangeActionMove::Reject( ScDocument* pDoc )
     return true;
 }
 
-//  ScChangeActionContent
-IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionContent )
-
 ScChangeActionContent::ScChangeActionContent( const ScRange& rRange ) :
     ScChangeAction(SC_CAT_CONTENT, rRange),
     pNextContent(nullptr),
@@ -2052,9 +2047,6 @@ bool ScChangeActionReject::Reject(ScDocument* /*pDoc*/)
     return false;
 }
 
-//  ScChangeTrack
-IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeTrackMsgInfo )
-
 const SCROW ScChangeTrack::nContentRowsPerSlot = InitContentRowsPerSlot();
 const SCSIZE ScChangeTrack::nContentSlots =
     MAXROWCOUNT / InitContentRowsPerSlot() + 2;
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 52155b79a4df..2e2b1dc7b265 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -73,9 +73,6 @@
 
 static const sal_uInt64 n2power48 = SAL_CONST_UINT64( 281474976710656); // 2^48
 
-IMPL_FIXEDMEMPOOL_NEWDEL( ScTokenStack )
-IMPL_FIXEDMEMPOOL_NEWDEL( ScInterpreter )
-
 ScCalcConfig *ScInterpreter::mpGlobalConfig = nullptr;
 
 using namespace formula;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 46e67efac0d4..1e41800cb5d7 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -22,7 +22,6 @@
 #include <functional>
 
 #include <string.h>
-#include <tools/mempool.hxx>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
 #include <sfx2/docfile.hxx>
@@ -206,13 +205,6 @@ namespace
 
 } // namespace
 
-// ScRawToken size is OpCode + StackVar + MAXSTRLEN+1 + ~20 ~= 1049
-IMPL_FIXEDMEMPOOL_NEWDEL( ScRawToken )
-
-// Need a whole bunch of ScSingleRefToken
-IMPL_FIXEDMEMPOOL_NEWDEL( ScSingleRefToken )
-// Need quite a lot of ScDoubleRefToken
-IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleRefToken )
 
 // --- class ScRawToken -----------------------------------------------------
 
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 0805149cd7a3..f0c4b5e83e08 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -133,8 +133,6 @@ namespace {
  */
 class XclListColor
 {
-    DECL_FIXEDMEMPOOL_NEWDEL( XclListColor )
-
 private:
     Color               maColor;        /// The color value of this palette entry.
     sal_uInt32          mnColorId;      /// Unique color ID for color reduction.
@@ -159,8 +157,6 @@ public:
     void                Merge( const XclListColor& rColor );
 };
 
-IMPL_FIXEDMEMPOOL_NEWDEL( XclListColor )
-
 XclListColor::XclListColor( const Color& rColor, sal_uInt32 nColorId ) :
     maColor( rColor ),
     mnColorId( nColorId ),
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 9f777e4c8f35..a2ce68c04669 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -606,8 +606,6 @@ void XclExpSingleCellBase::WriteBody( XclExpStream& rStrm )
     WriteContents( rStrm );
 }
 
-IMPL_FIXEDMEMPOOL_NEWDEL( XclExpNumberCell )
-
 XclExpNumberCell::XclExpNumberCell(
         const XclExpRoot& rRoot, const XclAddress& rXclPos,
         const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId, double fValue ) :
@@ -650,8 +648,6 @@ void XclExpNumberCell::WriteContents( XclExpStream& rStrm )
     rStrm << mfValue;
 }
 
-IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBooleanCell )
-
 XclExpBooleanCell::XclExpBooleanCell(
         const XclExpRoot& rRoot, const XclAddress& rXclPos,
         const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId, bool bValue ) :
@@ -681,8 +677,6 @@ void XclExpBooleanCell::WriteContents( XclExpStream& rStrm )
     rStrm << sal_uInt16( mbValue ? 1 : 0 ) << EXC_BOOLERR_BOOL;
 }
 
-IMPL_FIXEDMEMPOOL_NEWDEL( XclExpLabelCell )
-
 XclExpLabelCell::XclExpLabelCell(
         const XclExpRoot& rRoot, const XclAddress& rXclPos,
         const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId, const OUString& rStr ) :
@@ -806,8 +800,6 @@ void XclExpLabelCell::WriteContents( XclExpStream& rStrm )
     }
 }
 
-IMPL_FIXEDMEMPOOL_NEWDEL( XclExpFormulaCell )
-
 XclExpFormulaCell::XclExpFormulaCell(
         const XclExpRoot& rRoot, const XclAddress& rXclPos,
         const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId,
@@ -1302,8 +1294,6 @@ void XclExpMultiCellBase::RemoveUnusedXFIndexes( const ScfUInt16Vec& rXFIndexes
     // The Save() function will skip all XF indexes equal to EXC_XF_NOTFOUND.
 }
 
-IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBlankCell )
-
 XclExpBlankCell::XclExpBlankCell( const XclAddress& rXclPos, const XclExpMultiXFId& rXFId ) :
     XclExpMultiCellBase( EXC_ID3_BLANK, EXC_ID_MULBLANK, 0, rXclPos )
 {
@@ -1350,8 +1340,6 @@ void XclExpBlankCell::WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress
             FSEND );
 }
 
-IMPL_FIXEDMEMPOOL_NEWDEL( XclExpRkCell )
-
 XclExpRkCell::XclExpRkCell(
         const XclExpRoot& rRoot, const XclAddress& rXclPos,
         const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId, sal_Int32 nRkValue ) :
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 785857dc0ffa..ef3b3f5668c9 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -1678,8 +1678,6 @@ ScStyleSheet* XclImpXFBuffer::CreateStyleSheet( sal_uInt16 nXFIndex )
 
 // Buffer for XF indexes in cells =============================================
 
-IMPL_FIXEDMEMPOOL_NEWDEL( XclImpXFRange )
-
 bool XclImpXFRange::Expand( SCROW nScRow, const XclImpXFIndex& rXFIndex )
 {
     if( maXFIndex != rXFIndex )
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index 81df0c6daed4..9386587b7280 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_XESTYLE_HXX
 
 #include <map>
-#include <tools/mempool.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/nfkeytab.hxx>
 #include <editeng/svxfont.hxx>
diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx
index 70fd2d14e2de..bf5456e947fd 100644
--- a/sc/source/filter/inc/xetable.hxx
+++ b/sc/source/filter/inc/xetable.hxx
@@ -23,7 +23,6 @@
 #include "xltable.hxx"
 
 #include <vector>
-#include <tools/mempool.hxx>
 #include "xladdress.hxx"
 #include "xerecord.hxx"
 #include "xestring.hxx"
@@ -361,8 +360,6 @@ private:
 /** Represents a NUMBER record that describes a cell with a double value. */
 class XclExpNumberCell : public XclExpSingleCellBase
 {
-    DECL_FIXEDMEMPOOL_NEWDEL( XclExpNumberCell )
-
 public:
     explicit            XclExpNumberCell( const XclExpRoot& rRoot, const XclAddress& rXclPos,
                             const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId,
@@ -379,8 +376,6 @@ private:
 /** Represents a BOOLERR record that describes a cell with a Boolean value. */
 class XclExpBooleanCell : public XclExpSingleCellBase
 {
-    DECL_FIXEDMEMPOOL_NEWDEL( XclExpBooleanCell )
-
 public:
     explicit            XclExpBooleanCell( const XclExpRoot& rRoot, const XclAddress& rXclPos,
                             const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId,
@@ -405,8 +400,6 @@ class EditTextObject;
  */
 class XclExpLabelCell : public XclExpSingleCellBase
 {
-    DECL_FIXEDMEMPOOL_NEWDEL( XclExpLabelCell )
-
 public:
     /** Constructs the record from an unformatted Calc string cell. */
     explicit            XclExpLabelCell( const XclExpRoot& rRoot, const XclAddress& rXclPos,
@@ -440,8 +433,6 @@ class ScFormulaCell;
 /** Represents a FORMULA record that describes a cell with a formula. */
 class XclExpFormulaCell : public XclExpSingleCellBase
 {
-    DECL_FIXEDMEMPOOL_NEWDEL( XclExpFormulaCell )
-
 public:
     explicit            XclExpFormulaCell( const XclExpRoot& rRoot, const XclAddress& rXclPos,
                             const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId,
@@ -532,8 +523,6 @@ private:
 /** Represents a BLANK or MULBLANK record that describes empty but formatted cells. */
 class XclExpBlankCell : public XclExpMultiCellBase
 {
-    DECL_FIXEDMEMPOOL_NEWDEL( XclExpBlankCell )
-
 public:
     explicit            XclExpBlankCell( const XclAddress& rXclPos, const XclExpMultiXFId& rXFId );
 
@@ -557,8 +546,6 @@ private:
 /** Represents an RK or MULRK record that describes cells with a compressed double values. */
 class XclExpRkCell : public XclExpMultiCellBase
 {
-    DECL_FIXEDMEMPOOL_NEWDEL( XclExpRkCell )
-
 public:
     explicit            XclExpRkCell( const XclExpRoot& rRoot, const XclAddress& rXclPos,
                             const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId,
diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx
index 68fec485b95d..3f37b9e5dfda 100644
--- a/sc/source/filter/inc/xistyle.hxx
+++ b/sc/source/filter/inc/xistyle.hxx
@@ -22,7 +22,6 @@
 
 #include <vector>
 #include <memory>
-#include <tools/mempool.hxx>
 #include <rangelst.hxx>
 #include <patattr.hxx>
 #include "xladdress.hxx"
@@ -524,8 +523,6 @@ private:
 /** Contains an (encoded) XF index for a range of rows in a single column. */
 class XclImpXFRange
 {
-    DECL_FIXEDMEMPOOL_NEWDEL( XclImpXFRange )
-
 public:
     SCROW               mnScRow1;       /// The first row of an equal-formatted range.
     SCROW               mnScRow2;       /// The last row of an equal-formatted range.