diff options
| author | Eike Rathke <erack@redhat.com> | 2015-09-15 18:34:01 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-09-15 19:01:26 +0200 |
| commit | d8d699736334d009503a9a8e1363db7f7d237f99 (patch) | |
| tree | 7ca00d33d2a948f5d5ece2ac6137dfe8f7382a95 /sc | |
| parent | d38e743e8eb3fa70faf194c25dea1893029c5460 (diff) | |
stab MM_FAKE, it's a zombie
Change-Id: Iee70d0d027197c431926ab1194e0daa5eb429caf
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/formulacell.hxx | 3 | ||||
| -rw-r--r-- | sc/source/core/tool/chgtrack.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xetable.cxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docsh3.cxx | 4 |
5 files changed, 2 insertions, 10 deletions
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 30fd1b110254..957902957681 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -113,8 +113,7 @@ inline void intrusive_ptr_release(const ScFormulaCellGroup *p) enum ScMatrixMode { MM_NONE = 0, // No matrix formula MM_FORMULA = 1, // Upper left matrix formula cell - MM_REFERENCE = 2, // Remaining cells, via ocMatRef reference token - MM_FAKE = 3 // Interpret "as-if" matrix formula (legacy) + MM_REFERENCE = 2 // Remaining cells, via ocMatRef reference token }; class SC_DLLPUBLIC ScFormulaCell : public SvtListener diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index b8785caecbda..a33b5643038e 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -1660,7 +1660,6 @@ ScChangeActionContentCellType ScChangeActionContent::GetContentCellType( const S case MM_NONE : return SC_CACCT_NORMAL; case MM_FORMULA : - case MM_FAKE : return SC_CACCT_MATORG; case MM_REFERENCE : return SC_CACCT_MATREF; @@ -1687,7 +1686,6 @@ ScChangeActionContentCellType ScChangeActionContent::GetContentCellType( const S case MM_NONE : return SC_CACCT_NORMAL; case MM_FORMULA : - case MM_FAKE : return SC_CACCT_MATORG; case MM_REFERENCE : return SC_CACCT_MATREF; diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 70c52bcee45d..37ef2302932e 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -3735,7 +3735,7 @@ ScInterpreter::ScInterpreter( ScFormulaCell* pCell, ScDocument* pDoc, if(pMyFormulaCell) { sal_uInt8 cMatFlag = pMyFormulaCell->GetMatrixFlag(); - bMatrixFormula = ( cMatFlag == MM_FORMULA || cMatFlag == MM_FAKE ); + bMatrixFormula = ( cMatFlag == MM_FORMULA ); } else bMatrixFormula = false; diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index c30334a9f98c..be651813f2e2 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -945,7 +945,6 @@ void XclExpFormulaCell::SaveXml( XclExpXmlStream& rStrm ) bWriteFormula = false; break; case MM_FORMULA: - case MM_FAKE: { // origin of the matrix - find the used matrix range SCCOL nMatWidth; diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 631e1fb5e084..27eddebae0a9 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -1003,10 +1003,6 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck break; case MM_REFERENCE : // do nothing break; - case MM_FAKE : - OSL_FAIL( "MergeDocument: MatrixFlag MM_FAKE" ); - pViewSh->EnterData( aPos.Col(), aPos.Row(), aPos.Tab(), aValue ); - break; default: OSL_FAIL( "MergeDocument: unknown MatrixFlag" ); } |