diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2018-08-03 19:01:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-16 15:02:27 +0200 |
| commit | 346ba4bedaaa5fa6a7b76687b749959814685846 (patch) | |
| tree | 1a97b3abc7a7ddf1830cd9c1e359461c0d1a7cfe | |
| parent | tdf#119284 bg for automatic not set while editing (diff) | |
| download | core-346ba4bedaaa5fa6a7b76687b749959814685846.tar.gz core-346ba4bedaaa5fa6a7b76687b749959814685846.zip | |
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>
57 files changed, 1 insertions, 393 deletions
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index aa98a4e56bdb..d66204590e67 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -40,17 +40,6 @@ namespace formula { using namespace com::sun::star; -// Align MemPools on 4k boundaries - 64 bytes (4k is a MUST for OS/2) - -// Need a lot of FormulaDoubleToken -IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaDoubleToken ) -// Need quite some FormulaTypedDoubleToken -IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaTypedDoubleToken ) -// Need a lot of FormulaByteToken -IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaByteToken ) -// Need several FormulaStringToken -IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken ) - // --- helpers -------------------------------------------------------------- diff --git a/include/formula/token.hxx b/include/formula/token.hxx index 6d2851e4edfe..bd33935cbf26 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -35,7 +35,6 @@ #include <rtl/ustring.hxx> #include <sal/types.h> #include <svl/sharedstring.hxx> -#include <tools/mempool.hxx> class ScJumpMatrix; class ScMatrix; @@ -258,8 +257,6 @@ public: virtual ParamClass GetInForceArray() const override; virtual void SetInForceArray( ParamClass c ) override; virtual bool operator==( const FormulaToken& rToken ) const override; - - DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaByteToken ) }; @@ -296,8 +293,6 @@ public: virtual double& GetDoubleAsReference() override; virtual sal_Int16 GetDoubleType() const override; ///< always returns 0 for "not typed" virtual bool operator==( const FormulaToken& rToken ) const override; - - DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaDoubleToken ) }; class FORMULA_DLLPUBLIC FormulaTypedDoubleToken : public FormulaDoubleToken @@ -317,8 +312,6 @@ public: virtual sal_Int16 GetDoubleType() const override; virtual void SetDoubleType( sal_Int16 nType ) override; virtual bool operator==( const FormulaToken& rToken ) const override; - - DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaTypedDoubleToken ) }; @@ -333,8 +326,6 @@ public: virtual svl::SharedString GetString() const override; virtual void SetString( const svl::SharedString& rStr ) override; virtual bool operator==( const FormulaToken& rToken ) const override; - - DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken ) }; diff --git a/include/tools/mempool.hxx b/include/tools/mempool.hxx deleted file mode 100644 index a3b13f228ca1..000000000000 --- a/include/tools/mempool.hxx +++ /dev/null @@ -1,93 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_TOOLS_MEMPOOL_HXX -#define INCLUDED_TOOLS_MEMPOOL_HXX - -#include <sal/config.h> - -#include <sal/macros.h> -#include <tools/toolsdllapi.h> - -struct FixedMemPool_Impl; - -class SAL_WARN_UNUSED TOOLS_DLLPUBLIC FixedMemPool -{ - FixedMemPool_Impl * m_pImpl; - char const * m_pTypeName; - -public: - FixedMemPool( char const * pTypeName, - sal_uInt16 nTypeSize ); - ~FixedMemPool(); - - void* Alloc(); - void Free( void* p ); -}; - -#define DECL_FIXEDMEMPOOL_NEW_DECL() \ -static void * operator new( size_t n ) - -#define IMPL_FIXEDMEMPOOL_NEW_BODY( Class, aPool ) \ -{ \ - if ( n == sizeof( Class ) ) \ - return (aPool).Alloc(); \ - else \ - return ::operator new(n); \ -} - -#define DECL_FIXEDMEMPOOL_DEL_DECL() \ -static void operator delete( void * p, size_t n ) - -#define IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool ) \ -{ \ - if ( n == sizeof( Class ) ) \ - (aPool).Free(p); \ - else \ - ::operator delete(p); \ -} - -#define DECL_FIXEDMEMPOOL_NEWDEL( Class ) \ - private: \ - static FixedMemPool aPool; \ - public: \ - DECL_FIXEDMEMPOOL_NEW_DECL() \ - IMPL_FIXEDMEMPOOL_NEW_BODY( Class, aPool ) \ - DECL_FIXEDMEMPOOL_DEL_DECL() \ - IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool ) - -#define IMPL_FIXEDMEMPOOL_NEWDEL( Class ) \ - FixedMemPool Class::aPool( SAL_STRINGIFY( Class ), sizeof( Class ) ); - -#define DECL_FIXEDMEMPOOL_NEWDEL_DLL( Class ) \ - private: \ - static FixedMemPool aPool; \ - public: \ - DECL_FIXEDMEMPOOL_NEW_DECL(); \ - DECL_FIXEDMEMPOOL_DEL_DECL(); - -#define IMPL_FIXEDMEMPOOL_NEWDEL_DLL( Class ) \ - FixedMemPool Class::aPool( SAL_STRINGIFY( Class ), sizeof( Class ) ); \ - void * Class::operator new( size_t n ) \ - IMPL_FIXEDMEMPOOL_NEW_BODY( Class, aPool ) \ - void Class::operator delete( void * p, size_t n ) \ - IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool ) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index 81d4fb74047d..b2c3fbcc2eb0 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -552,7 +552,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/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. diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 92040f51e2b3..d951c529ca74 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -7745,7 +7745,6 @@ include/tools/line.hxx include/tools/lineend.hxx include/tools/link.hxx include/tools/mapunit.hxx -include/tools/mempool.hxx include/tools/multisel.hxx include/tools/pathutils.hxx include/tools/poly.hxx @@ -16792,7 +16791,6 @@ tools/source/generic/svborder.cxx tools/source/inet/inetmime.cxx tools/source/inet/inetmsg.cxx tools/source/inet/inetstrm.cxx -tools/source/memtools/mempool.cxx tools/source/memtools/multisel.cxx tools/source/misc/cpuid.cxx tools/source/misc/extendapplicationenvironment.cxx 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) diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index c524a38084aa..acd007cc4761 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -65,7 +65,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/inet/inetmime \ tools/source/inet/inetmsg \ tools/source/inet/inetstrm \ - tools/source/memtools/mempool \ tools/source/memtools/multisel \ tools/source/misc/cpuid \ tools/source/misc/extendapplicationenvironment \ diff --git a/tools/source/memtools/mempool.cxx b/tools/source/memtools/mempool.cxx deleted file mode 100644 index f38ab6925079..000000000000 --- a/tools/source/memtools/mempool.cxx +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <tools/mempool.hxx> -#include <sal/log.hxx> -#include <rtl/alloc.h> - -#include <stdio.h> - -FixedMemPool::FixedMemPool(char const * pTypeName, sal_uInt16 nTypeSize) - : m_pTypeName (pTypeName) -{ - char name[RTL_CACHE_NAME_LENGTH + 1]; - snprintf (name, sizeof(name), "FixedMemPool_%d", static_cast<int>(nTypeSize)); - m_pImpl = reinterpret_cast<FixedMemPool_Impl*>(rtl_cache_create (name, nTypeSize, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0)); - SAL_INFO("tools.memtools","FixedMemPool::ctor(\"" << m_pTypeName << "\"): " << m_pImpl); -} - -FixedMemPool::~FixedMemPool() -{ - SAL_INFO("tools.memtools","FixedMemPool::dtor(\"" << m_pTypeName << "\"): " << m_pImpl); - rtl_cache_destroy (reinterpret_cast<rtl_cache_type*>(m_pImpl)); - m_pImpl = nullptr; -} - -void* FixedMemPool::Alloc() -{ - return rtl_cache_alloc (reinterpret_cast<rtl_cache_type*>(m_pImpl)); -} - -void FixedMemPool::Free( void* pFree ) -{ - rtl_cache_free (reinterpret_cast<rtl_cache_type*>(m_pImpl), pFree); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |