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

[Kohei Yoshida]

 sc/inc/formulacell.hxx              |    2 +-
 sc/source/core/data/formulacell.cxx |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 017d16bdc2b02af03a9c08bb162229ba391dfd6a
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Mon Dec 15 22:16:01 2014 -0500

    Reduce the size of ScFormulaCell by packing the matrix flag value.
    
    Change-Id: I07ee4f03ba74415c11188f7b63879ccad542537c

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 86b8045..0ed021f 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -129,8 +129,8 @@ private:
     ScFormulaCell*  pPreviousTrack;
     ScFormulaCell*  pNextTrack;
     sal_uInt16      nSeenInIteration;   // Iteration cycle in which the cell was last encountered
-    sal_uInt8       cMatrixFlag;        // One of ScMatrixMode
     short           nFormatType;
+    sal_uInt8       cMatrixFlag    : 2; // One of ScMatrixMode
     bool            bDirty         : 1; // Must be (re)calculated
     bool            bChanged       : 1; // Whether something changed regarding display/representation
     bool            bRunning       : 1; // Already interpreting right now
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 3162ba7..d8c79b9 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -593,8 +593,8 @@ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos ) :
     pPreviousTrack(0),
     pNextTrack(0),
     nSeenInIteration(0),
-    cMatrixFlag(MM_NONE),
     nFormatType(NUMBERFORMAT_NUMBER),
+    cMatrixFlag(MM_NONE),
     bDirty(false),
     bChanged(false),
     bRunning(false),
@@ -622,8 +622,8 @@ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos,
     pPreviousTrack(0),
     pNextTrack(0),
     nSeenInIteration(0),
-    cMatrixFlag ( cMatInd ),
     nFormatType ( NUMBERFORMAT_NUMBER ),
+    cMatrixFlag ( cMatInd ),
     bDirty( true ), // -> Because of the use of the Auto Pilot Function was: cMatInd != 0
     bChanged( false ),
     bRunning( false ),
@@ -654,8 +654,8 @@ ScFormulaCell::ScFormulaCell(
     pPreviousTrack(0),
     pNextTrack(0),
     nSeenInIteration(0),
-    cMatrixFlag ( cMatInd ),
     nFormatType ( NUMBERFORMAT_NUMBER ),
+    cMatrixFlag ( cMatInd ),
     bDirty( true ),
     bChanged( false ),
     bRunning( false ),
@@ -702,8 +702,8 @@ ScFormulaCell::ScFormulaCell(
     pPreviousTrack(0),
     pNextTrack(0),
     nSeenInIteration(0),
-    cMatrixFlag ( cMatInd ),
     nFormatType ( NUMBERFORMAT_NUMBER ),
+    cMatrixFlag ( cMatInd ),
     bDirty( true ),
     bChanged( false ),
     bRunning( false ),
@@ -749,8 +749,8 @@ ScFormulaCell::ScFormulaCell(
     pPreviousTrack(0),
     pNextTrack(0),
     nSeenInIteration(0),
-    cMatrixFlag ( cInd ),
     nFormatType(xGroup->mnFormatType),
+    cMatrixFlag ( cInd ),
     bDirty(true),
     bChanged( false ),
     bRunning( false ),
@@ -778,8 +778,8 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, cons
     pPreviousTrack(0),
     pNextTrack(0),
     nSeenInIteration(0),
-    cMatrixFlag ( rCell.cMatrixFlag ),
     nFormatType( rCell.nFormatType ),
+    cMatrixFlag ( rCell.cMatrixFlag ),
     bDirty( rCell.bDirty ),
     bChanged( rCell.bChanged ),
     bRunning( false ),