diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-12-15 22:16:01 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-12-15 22:24:00 -0500 |
| commit | 017d16bdc2b02af03a9c08bb162229ba391dfd6a (patch) | |
| tree | 4c4db8ffee7374cf0a1571b01696d2b4fa54e298 /sc | |
| parent | 990dbcab759265de1497b15a93e53a5fe81ff48d (diff) | |
Reduce the size of ScFormulaCell by packing the matrix flag value.
Change-Id: I07ee4f03ba74415c11188f7b63879ccad542537c
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/formulacell.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/formulacell.cxx | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 86b8045ee1d6..0ed021f6b756 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 3162ba7c49b8..d8c79b96921b 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 ), |