summaryrefslogtreecommitdiff
path: root/include/formula
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2018-08-03 19:01:38 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-08-16 15:02:27 +0200
commit346ba4bedaaa5fa6a7b76687b749959814685846 (patch)
tree1a97b3abc7a7ddf1830cd9c1e359461c0d1a7cfe /include/formula
parent3ec86ad77071af577f37a83a0b1d0389b2204716 (diff)
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>
Diffstat (limited to 'include/formula')
-rw-r--r--include/formula/token.hxx9
1 files changed, 0 insertions, 9 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 )
};