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>

35 files changed, 1 insertions, 148 deletions

diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 3675aa9489df..326db11d2a30 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -169,7 +169,6 @@ public:
     SAL_DLLPRIVATE void SetXObject(css::uno::Reference<css::uno::XInterface> const& xObject)
             { m_wXObject = xObject; }
 
-    DECL_FIXEDMEMPOOL_NEWDEL_DLL(SwFrameFormat)
     void RegisterToFormat( SwFormat& rFormat );
 
     // Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
@@ -245,7 +244,6 @@ public:
     const Point & GetLastFlyFramePrtRectPos() const       { return m_aLastFlyFramePrtRectPos; }
     void SetLastFlyFramePrtRectPos( const Point &rPoint ) { m_aLastFlyFramePrtRectPos = rPoint; }
 
-    DECL_FIXEDMEMPOOL_NEWDEL(SwFlyFrameFormat)
     SwFlyDrawContact* GetOrCreateContact();
 };
 
@@ -400,8 +398,6 @@ public:
     void PosAttrSet() { mbPosAttrSet = true; }
 
     virtual OUString GetDescription() const override;
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwDrawFrameFormat);
 };
 
 namespace sw {
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx
index 0d66f9c3ead2..c3112844db8e 100644
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_INC_NDHINTS_HXX
 #define INCLUDED_SW_INC_NDHINTS_HXX
 
-#include <tools/mempool.hxx>
 #include <o3tl/sorted_vector.hxx>
 
 #include "swtypes.hxx"
@@ -185,8 +184,6 @@ public:
 
     // calc current value of m_bHiddenByParaField, returns true iff changed
     bool CalcHiddenParaField() const; // changes mutable state
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwpHints)
 };
 
 #endif
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index d1a8801eb9c7..a4f0bd55e9a3 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -796,8 +796,6 @@ public:
     bool CompareRsid( const SwTextNode &rTextNode, sal_Int32 nStt1, sal_Int32 nStt2 ) const;
     bool CompareParRsid( const SwTextNode &rTextNode ) const;
 
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTextNode)
-
     // Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
     virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const override;
 
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 50086d45b045..1030cdbe90f0 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SW_INC_NODE_HXX
 
 #include <sal/types.h>
-#include <tools/mempool.hxx>
 
 #include "swdllapi.h"
 #include "ndarr.hxx"
@@ -318,8 +317,6 @@ protected:
                  const SwNodeType nNodeType = SwNodeType::Start,
                  SwStartNodeType = SwNormalStartNode );
 public:
-    DECL_FIXEDMEMPOOL_NEWDEL(SwStartNode)
-
     SwStartNodeType GetStartNodeType() const        { return m_eStartNodeType; }
 
     /// Call ChkCondcoll to all ContentNodes of section.
@@ -345,8 +342,6 @@ class SwEndNode : public SwNode
 protected:
     SwEndNode( const SwNodeIndex &rWhere, SwStartNode& rSttNd );
 
-    DECL_FIXEDMEMPOOL_NEWDEL(SwEndNode)
-
 private:
     SwEndNode( const SwEndNode & rNode ) = delete;
     SwEndNode & operator= ( const SwEndNode & rNode ) = delete;
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 968d20c91f7d..2149bc6b14f9 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_INC_PAM_HXX
 
 #include <sal/types.h>
-#include <tools/mempool.hxx>
 #include "ring.hxx"
 #include "index.hxx"
 #include "ndindex.hxx"
@@ -291,8 +290,6 @@ public:
         return *Start() <= rPos && rPos <= *End();
     }
 
-    DECL_FIXEDMEMPOOL_NEWDEL(SwPaM);
-
     OUString GetText() const;
     void InvalidatePaM();
     SwPaM* GetNext()
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index 3eaf043af617..269911f451ad 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -669,7 +669,6 @@
 #include <tools/lineend.hxx>
 #include <tools/link.hxx>
 #include <tools/mapunit.hxx>
-#include <tools/mempool.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
 #include <tools/solar.h>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index 03dce4d8945a..0a29c99d311e 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -649,7 +649,6 @@
 #include <tools/lineend.hxx>
 #include <tools/link.hxx>
 #include <tools/mapunit.hxx>
-#include <tools/mempool.hxx>
 #include <tools/multisel.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx
index 41c16901d910..0ad59d9dee78 100644
--- a/sw/inc/pch/precompiled_vbaswobj.hxx
+++ b/sw/inc/pch/precompiled_vbaswobj.hxx
@@ -443,7 +443,6 @@
 #include <tools/lineend.hxx>
 #include <tools/link.hxx>
 #include <tools/mapunit.hxx>
-#include <tools/mempool.hxx>
 #include <tools/multisel.hxx>
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 32ded89c4a8b..3e369480bc56 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -18,7 +18,7 @@
  */
 #ifndef INCLUDED_SW_INC_SWATRSET_HXX
 #define INCLUDED_SW_INC_SWATRSET_HXX
-#include <tools/mempool.hxx>
+
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
 #include "swdllapi.h"
@@ -313,8 +313,6 @@ public:
     inline  const SwTableBoxNumFormat       &GetTableBoxNumFormat( bool = true ) const;
     inline  const SwTableBoxFormula     &GetTableBoxFormula( bool = true ) const;
     inline  const SwTableBoxValue           &GetTableBoxValue( bool = true ) const;
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwAttrSet)
 };
 
 //Helper for filters to find true lineheight of a font
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index c1e4c4c145bc..ca6b18b325e9 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -224,8 +224,6 @@ public:
     const SwCursor* GetNext() const { return dynamic_cast<SwCursor const *>(GetNextInRing()); }
     SwCursor* GetPrev()             { return dynamic_cast<SwCursor *>(GetPrevInRing()); }
     const SwCursor* GetPrev() const { return dynamic_cast<SwCursor const *>(GetPrevInRing()); }
-
-    DECL_FIXEDMEMPOOL_NEWDEL( SwCursor )
 };
 
 /**
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index eea1f64fa53a..595785583643 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_INC_SWTABLE_HXX
 #define INCLUDED_SW_INC_SWTABLE_HXX
 
-#include <tools/mempool.hxx>
 #include <tools/ref.hxx>
 #include "tblenum.hxx"
 #include "swtypes.hxx"
@@ -471,8 +470,6 @@ public:
     // Loading of a document requires an actualization of cells with values
     void ActualiseValueBox();
 
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTableBox)
-
     // Access on internal data - currently used for the NumFormatter.
     inline const Color* GetSaveUserColor()  const;
     inline const Color* GetSaveNumFormatColor() const;
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index 0786dc58f3b2..b9070ab875e9 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -31,9 +31,6 @@ class SW_DLLPUBLIC SwTableFormat final : public SwFrameFormat
     {}
 
 public:
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTableFormat)
-
     virtual bool supportsFullDrawingLayerFillAttributeSet() const override;
 };
 
@@ -46,9 +43,6 @@ class SwTableLineFormat final : public SwFrameFormat
     {}
 
 public:
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFormat)
-
     virtual bool supportsFullDrawingLayerFillAttributeSet() const override;
 };
 
@@ -64,9 +58,6 @@ class SW_DLLPUBLIC SwTableBoxFormat final : public SwFrameFormat
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) override;
 
 public:
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTableBoxFormat)
-
     virtual bool supportsFullDrawingLayerFillAttributeSet() const override;
 };
 
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index fc03253a1109..01ea1112cc5d 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -73,8 +73,6 @@ public:
                                     { return m_bSkipOverHiddenSections; }
     void SetSkipOverHiddenSections( bool bFlag )
                                     { m_bSkipOverHiddenSections = bFlag; }
-
-    DECL_FIXEDMEMPOOL_NEWDEL( SwUnoCursor )
 };
 
 class SwUnoTableCursor : public virtual SwUnoCursor, public virtual SwTableCursor
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index 7521fee1370d..332e190c0761 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -163,8 +163,6 @@ public:
     const SwShellCursor* GetNext() const { return dynamic_cast<SwShellCursor const *>(GetNextInRing()); }
     SwShellCursor* GetPrev()             { return dynamic_cast<SwShellCursor *>(GetPrevInRing()); }
     const SwShellCursor* GetPrev() const { return dynamic_cast<SwShellCursor const *>(GetPrevInRing()); }
-
-    DECL_FIXEDMEMPOOL_NEWDEL( SwShellCursor )
 };
 
 class SwShellTableCursor : public virtual SwShellCursor, public virtual SwTableCursor
diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx
index a2caa2705d67..371371b586a1 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -49,34 +49,6 @@ using namespace com::sun::star;
 
 OUString aEmptyOUStr;  // remove once aEmptyOUStr can be changed to OUString
 
-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( SwShellCursor )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTextNode )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwpHints )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwFntObj )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwFontObj )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwBorderAttrs )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwCellFrame )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwRowFrame )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwColumnFrame )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwSectionFrame )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTabFrame )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwPageFrame )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwBodyFrame )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwHeaderFrame )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwFooterFrame )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTextFrame )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableFormat )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableLineFormat )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBoxFormat )
-
 Size GetGraphicSizeTwip(const Graphic& rGraphic, vcl::RenderContext* pOutDev)
 {
     const MapMode aMapTwip(MapUnit::MapTwip);
diff --git a/sw/source/core/inc/UndoDelete.hxx b/sw/source/core/inc/UndoDelete.hxx
index 7a155fb20322..f22832b18d54 100644
--- a/sw/source/core/inc/UndoDelete.hxx
+++ b/sw/source/core/inc/UndoDelete.hxx
@@ -22,7 +22,6 @@
 
 #include <undobj.hxx>
 #include <rtl/ustring.hxx>
-#include <tools/mempool.hxx>
 #include <memory>
 #include <boost/optional.hpp>
 
@@ -99,8 +98,6 @@ public:
 
     // SwUndoTableCpyTable needs this information:
     bool IsDelFullPara() const { return m_bDelFullPara; }
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwUndoDelete)
 };
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDODELETE_HXX
diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx
index b109abf344e1..0037b46965a4 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -25,7 +25,6 @@
 #include <undobj.hxx>
 #include <svx/svdtypes.hxx>
 #include <rtl/ustring.hxx>
-#include <tools/mempool.hxx>
 #include <swtypes.hxx>
 #include <IDocumentContentOperations.hxx>
 #include <boost/optional.hpp>
@@ -87,8 +86,6 @@ public:
     virtual SwRewriter GetRewriter() const override;
 
     void SetWithRsid() { m_bWithRsid = true; }
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwUndoInsert)
 };
 
 SwRewriter
diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx
index 658585d9856b..5bd046ec4e42 100644
--- a/sw/source/core/inc/bodyfrm.hxx
+++ b/sw/source/core/inc/bodyfrm.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_BODYFRM_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_BODYFRM_HXX
 
-#include <tools/mempool.hxx>
 #include "layfrm.hxx"
 
 class SwBorderAttrs;
@@ -35,8 +34,6 @@ public:
     SwBodyFrame( SwFrameFormat*, SwFrame* );
 
     virtual void PaintSubsidiaryLines( const SwPageFrame*, const SwRect& ) const override;
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwBodyFrame)
 };
 
 #endif
diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx
index d97e6cb40f46..4e293a601f45 100644
--- a/sw/source/core/inc/cellfrm.hxx
+++ b/sw/source/core/inc/cellfrm.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_CELLFRM_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_CELLFRM_HXX
 
-#include <tools/mempool.hxx>
 #include "layfrm.hxx"
 
 class SwTableBox;
@@ -61,7 +60,6 @@ public:
     long GetLayoutRowSpan() const;
 
     void dumpAsXmlAttributes(xmlTextWriterPtr writer) const override;
-    DECL_FIXEDMEMPOOL_NEWDEL(SwCellFrame)
 };
 
 #endif
diff --git a/sw/source/core/inc/colfrm.hxx b/sw/source/core/inc/colfrm.hxx
index 1a8e3fb20ba1..7c78661e7920 100644
--- a/sw/source/core/inc/colfrm.hxx
+++ b/sw/source/core/inc/colfrm.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_COLFRM_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_COLFRM_HXX
 
-#include <tools/mempool.hxx>
 #include "ftnboss.hxx"
 
 class SwColumnFrame: public SwFootnoteBossFrame
@@ -34,8 +33,6 @@ public:
 
     virtual void PaintBreak() const override;
     virtual void PaintSubsidiaryLines( const SwPageFrame*, const SwRect& ) const override;
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwColumnFrame)
 };
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_COLFRM_HXX
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index a8ab21a418ff..6a1e82c5b8ee 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -22,7 +22,6 @@
 
 #include <vcl/font.hxx>
 #include <vcl/vclptr.hxx>
-#include <tools/mempool.hxx>
 #include <swtypes.hxx>
 #include "swcache.hxx"
 #include "TextFrameIndex.hxx"
@@ -81,8 +80,6 @@ class SwFntObj : public SwCacheObj
     static MapMode *pPixMap;
 
 public:
-    DECL_FIXEDMEMPOOL_NEWDEL(SwFntObj)
-
     SwFntObj( const SwSubFont &rFont, const void* pOwner,
               SwViewShell const *pSh );
 
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 0ffe4a75c0f6..ab4aaa90faeb 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -328,8 +328,6 @@ class SwBorderAttrs : public SwCacheObj
                        const SwFrame *pCmp ) const;
 
 public:
-    DECL_FIXEDMEMPOOL_NEWDEL(SwBorderAttrs)
-
     SwBorderAttrs( const SwModify *pOwner, const SwFrame *pConstructor );
     virtual ~SwBorderAttrs() override;
 
diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx
index 5a823721c65d..7d070b6831f7 100644
--- a/sw/source/core/inc/hffrm.hxx
+++ b/sw/source/core/inc/hffrm.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_HFFRM_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_HFFRM_HXX
 
-#include <tools/mempool.hxx>
 #include "layfrm.hxx"
 
 class SwHeadFootFrame : public SwLayoutFrame
@@ -45,8 +44,6 @@ class SwHeaderFrame: public SwHeadFootFrame
 {
 public:
     SwHeaderFrame( SwFrameFormat* pFrame, SwFrame* pSib ) : SwHeadFootFrame(pFrame, pSib, SwFrameType::Header) {};
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwHeaderFrame)
 };
 
 /// Footer in the document layout, inside a page.
@@ -54,8 +51,6 @@ class SwFooterFrame: public SwHeadFootFrame
 {
 public:
     SwFooterFrame( SwFrameFormat* pFrame, SwFrame* pSib ) : SwHeadFootFrame(pFrame, pSib, SwFrameType::Footer) {};
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwFooterFrame)
 };
 
 #endif
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index 8c7ab3a92fdb..887c2ba07c7f 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -21,7 +21,6 @@
 
 #include <viewsh.hxx>
 #include "ftnboss.hxx"
-#include <tools/mempool.hxx>
 
 #include <SidebarWindowsTypes.hxx>
 
@@ -108,8 +107,6 @@ protected:
     size_t GetContentHeight(const long nTop, const long nBottom) const;
 
 public:
-    DECL_FIXEDMEMPOOL_NEWDEL(SwPageFrame)
-
     SwPageFrame( SwFrameFormat*, SwFrame*, SwPageDesc* );
 
     /// Make this public, so that the SwViewShell can access it when switching from browse mode
diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx
index c3724667cdaf..8b14b0793cb4 100644
--- a/sw/source/core/inc/rowfrm.hxx
+++ b/sw/source/core/inc/rowfrm.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_ROWFRM_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_ROWFRM_HXX
 
-#include <tools/mempool.hxx>
-
 #include "layfrm.hxx"
 
 class SwTableLine;
@@ -119,8 +117,6 @@ public:
     // height to fit the rest of space.
     bool IsInSplit() const { return m_bIsInSplit; }
     void SetInSplit(bool bNew = true) { m_bIsInSplit = bNew; }
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwRowFrame)
 };
 
 #endif
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index 4bad9cf5b1e0..d9ebecd78f97 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.hxx
@@ -18,7 +18,6 @@
  */
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_SECTFRM_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_SECTFRM_HXX
-#include <tools/mempool.hxx>
 
 #include "layfrm.hxx"
 #include "flowfrm.hxx"
@@ -156,8 +155,6 @@ public:
 
     void SetFootnoteLock( bool bNew ) { m_bFootnoteLock = bNew; }
     bool IsFootnoteLock() const { return m_bFootnoteLock; }
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwSectionFrame)
 };
 
 inline const SwSectionFrame *SwSectionFrame::GetFollow() const
diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx
index 29576a95c026..ebe64d841feb 100644
--- a/sw/source/core/inc/swfntcch.hxx
+++ b/sw/source/core/inc/swfntcch.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_SWFNTCCH_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_SWFNTCCH_HXX
 
-#include <tools/mempool.hxx>
-
 #define NUM_DEFAULT_VALUES 39
 
 #include "swcache.hxx"
@@ -53,8 +51,6 @@ private:
     const SfxPoolItem* m_pDefaultArray[ NUM_DEFAULT_VALUES ];
 
 public:
-    DECL_FIXEDMEMPOOL_NEWDEL(SwFontObj)
-
     SwFontObj( const void* pOwner, SwViewShell *pSh );
 
     virtual ~SwFontObj() override;
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index 8e6f20115919..78a61b49f630 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_TABFRM_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_TABFRM_HXX
 
-#include <tools/mempool.hxx>
 #include "layfrm.hxx"
 #include "flowfrm.hxx"
 
@@ -217,8 +216,6 @@ public:
     sal_uInt16 GetBottomLineSize() const;
 
     virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const override;
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTabFrame)
 };
 
 inline const SwContentFrame *SwTabFrame::FindLastContent() const
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index a9ee00ec2eda..4ccf9ae24100 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_TXTFRM_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
-#include <tools/mempool.hxx>
 #include "cntfrm.hxx"
 #include <ndtxt.hxx>
 #include "TextFrameIndex.hxx"
@@ -465,9 +464,6 @@ public:
     // the offset will be returned.
     SwTwips HangingMargin() const;
 
-    // RTTI
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTextFrame)
-
     // Locking
     bool IsLocked()      const { return mbLocked;     }
 
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 620bd06cf732..4af1cd4f2319 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2447,8 +2447,6 @@ SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* ) const
     return new SwHeaderAndFooterEatSpacingItem( Which(), GetValue() );
 }
 
-// Partially implemented inline in hxx
-IMPL_FIXEDMEMPOOL_NEWDEL_DLL( SwFrameFormat )
 
 SwFrameFormat::SwFrameFormat(
     SwAttrPool& rPool,
@@ -2840,12 +2838,6 @@ void SwFrameFormats::dumpAsXml(xmlTextWriterPtr pWriter, const char* pName) cons
     xmlTextWriterEndElement(pWriter);
 }
 
-//  class SwFlyFrameFormat
-//  Partially implemented inline in hxx
-
-IMPL_FIXEDMEMPOOL_NEWDEL( SwFlyFrameFormat )
-
-
 
 SwFlyFrameFormat::SwFlyFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm, SwFrameFormat *pDrvdFrame )
     : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_FLYFRMFMT )
@@ -3295,11 +3287,6 @@ SwHandleAnchorNodeChg::~SwHandleAnchorNodeChg()
     }
 }
 
-//  class SwDrawFrameFormat
-//  Partially implemented inline in hxx
-
-IMPL_FIXEDMEMPOOL_NEWDEL( SwDrawFrameFormat )
-
 namespace sw
 {
     DrawFrameFormatHint::~DrawFrameFormatHint() {}
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 8d7f4fa40658..38aabd64e2ce 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -224,8 +224,6 @@ public:
                            SwTwips& _orObjDescent,
                            const SwLinePortion* _pDontConsiderPortion = nullptr,
                            const bool _bNoFlyCntPorAndLinePor = false ) const;
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwLineLayout)
 };
 
 /// Collection of SwLineLayout instances, represents the paragraph text in Writer layout.
@@ -307,8 +305,6 @@ public:
     void SetErgoSumNum( const OUString &rErgo );
 
     const SwDropPortion *FindDropPortion() const;
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwParaPortion)
 };
 
 inline void SwParaPortion::ResetPreps()
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index aacdf39a3272..cfa0c190afe9 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORTXT_HXX
 #define INCLUDED_SW_SOURCE_CORE_TEXT_PORTXT_HXX
 
-#include <tools/mempool.hxx>
-
 #include "porlin.hxx"
 
 class SwTextGuess;
@@ -50,8 +48,6 @@ public:
 
     // Accessibility: pass information about this portion to the PortionHandler
     virtual void HandlePortion( SwPortionHandler& rPH ) const override;
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTextPortion)
 };
 
 class SwTextInputFieldPortion : public SwTextPortion
@@ -78,8 +74,6 @@ public:
 
     // Accessibility: pass information about this portion to the PortionHandler
     virtual void HandlePortion( SwPortionHandler& rPH ) const override;
-
-    DECL_FIXEDMEMPOOL_NEWDEL(SwHolePortion)
 };
 
 class SwFieldMarkPortion : public SwTextPortion
diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx
index 491040c46934..805ffa068fef 100644
--- a/sw/source/core/text/txtcache.hxx
+++ b/sw/source/core/text/txtcache.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_SOURCE_CORE_TEXT_TXTCACHE_HXX
 
 #include <sal/types.h>
-#include <tools/mempool.hxx>
 #include <swcache.hxx>
 #include <memory>
 
@@ -32,8 +31,6 @@ class SwTextLine : public SwCacheObj
     std::unique_ptr<SwParaPortion> pLine;
 
 public:
-    DECL_FIXEDMEMPOOL_NEWDEL(SwTextLine)
-
     SwTextLine( SwTextFrame const *pFrame, SwParaPortion *pNew = nullptr );
     virtual ~SwTextLine() override;
 
diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx
index dc952771899c..784d6108703e 100644
--- a/sw/source/core/text/txtinit.cxx
+++ b/sw/source/core/text/txtinit.cxx
@@ -43,12 +43,6 @@ long SwTextFrame::nMinPrtLine = 0;
 SwContourCache *pContourCache = nullptr;
 SwDropCapCache *pDropCapCache = nullptr;
 
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTextLine )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwParaPortion ) // Paragraphs
-IMPL_FIXEDMEMPOOL_NEWDEL( SwLineLayout ) // Lines
-IMPL_FIXEDMEMPOOL_NEWDEL( SwHolePortion ) // e.g. Blanks at the line end
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTextPortion ) // Attribute change
-
 // Are ONLY used in init.cxx.
 // There we have extern void TextFinit()
 // and extern void TextInit_(...)
diff --git a/sw/source/core/unocore/unocrsr.cxx b/sw/source/core/unocore/unocrsr.cxx
index 56dd18792dca..6f6ccc1040a4 100644
--- a/sw/source/core/unocore/unocrsr.cxx
+++ b/sw/source/core/unocore/unocrsr.cxx
@@ -27,8 +27,6 @@
 
 sw::UnoCursorHint::~UnoCursorHint() {}
 
-IMPL_FIXEDMEMPOOL_NEWDEL( SwUnoCursor )
-
 SwUnoCursor::SwUnoCursor( const SwPosition &rPos )
     : SwCursor( rPos, nullptr )
     , m_bRemainInSection(true)