[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source

[Eike Rathke]

 sc/inc/formulacell.hxx              |    2 ++
 sc/source/core/data/formulacell.cxx |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 37a36671e0abfa0e1dfd2cfdd6470a3f2805b199
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Sep 8 13:59:57 2015 +0200

    reactivate fixed mempool for ScFormulaCell
    
    ... it got lost with 8b252f30267d043522ff2cbf2bf42275bb7a6ec6
    
    Change-Id: I1a7c9bbaa1fd70d24c168d53aae6691a45c29085

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index dbafa1b..30fd1b1 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -164,9 +164,7 @@ public:
 
     enum CompareState { NotEqual = 0, EqualInvariant, EqualRelativeRef };
 
-#ifdef USE_MEMPOOL
     DECL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
-#endif
 
     ScAddress       aPos;
 
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 2483382..e21a26e 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -66,9 +66,7 @@
 
 using namespace formula;
 
-#ifdef USE_MEMPOOL
 IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
-#endif
 
 #define DEBUG_CALCULATION 0
 #if DEBUG_CALCULATION
commit 7df729da30f89ad20cd5705e3a1a91866ac71898
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Sep 8 13:27:14 2015 +0200

    Revert "USE_MEMPOOL is not defined anywhere"
    
    Well.. then let's remove the ifdef instead of the implementation,
    dammit..
    
    This reverts commit 64c6b0ed6c67d169021732d276ec02706e139261.

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 1b67b40..dbafa1b 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -164,6 +164,10 @@ public:
 
     enum CompareState { NotEqual = 0, EqualInvariant, EqualRelativeRef };
 
+#ifdef USE_MEMPOOL
+    DECL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
+#endif
+
     ScAddress       aPos;
 
                     virtual ~ScFormulaCell();
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index dc3f9bb..2483382 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -66,6 +66,10 @@
 
 using namespace formula;
 
+#ifdef USE_MEMPOOL
+IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
+#endif
+
 #define DEBUG_CALCULATION 0
 #if DEBUG_CALCULATION
 static ScAddress aDebugCalculationTriggerAddress(1,2,0);    // Sheet1.B3, whatever you like