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>

2 files changed, 0 insertions, 102 deletions

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: */