sc/inc/formulacell.hxx | 3 +--
sc/source/core/tool/chgtrack.cxx | 4 ----
sc/source/core/tool/interpr4.cxx | 2 +-
sc/source/filter/excel/xetable.cxx | 1 -
sc/source/ui/docshell/docsh3.cxx | 6 ------
5 files changed, 2 insertions(+), 14 deletions(-)
New commits:
commit fb59df3a5504ab857923149d53cd222b9b4d6388
Author: Eike Rathke <er...@redhat.com>
Date: Tue Sep 15 18:59:01 2015 +0200
there's no default ScMatrixMode enum other than the known ones
... and if there was one not handled let the compiler complain.
Change-Id: Ibe3a2a913edfbfbba30a83a8d985d5509853ff6d
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index a33b564..3517f26 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -1689,8 +1689,6 @@ ScChangeActionContentCellType
ScChangeActionContent::GetContentCellType( const S
return SC_CACCT_MATORG;
case MM_REFERENCE :
return SC_CACCT_MATREF;
- default:
- ;
}
return SC_CACCT_NORMAL;
}
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 27eddeb..3924354 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -1003,8 +1003,6 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc,
bool bShared, bool bCheck
break;
case MM_REFERENCE : // do nothing
break;
- default:
- OSL_FAIL( "MergeDocument: unknown
MatrixFlag" );
}
}
break;
commit d8d699736334d009503a9a8e1363db7f7d237f99
Author: Eike Rathke <er...@redhat.com>
Date: Tue Sep 15 18:34:01 2015 +0200
stab MM_FAKE, it's a zombie
Change-Id: Iee70d0d027197c431926ab1194e0daa5eb429caf
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 30fd1b1..9579029 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 b8785ca..a33b564 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 70c52bc..37ef230 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 c30334a..be65181 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 631e1fb..27eddeb 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" );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
