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

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.readonly.results |    2 --
 sc/inc/types.hxx                                           |    1 -
 sc/source/core/data/formulacell.cxx                        |    3 ---
 sc/source/core/tool/token.cxx                              |    1 -
 4 files changed, 7 deletions(-)

New commits:
commit e1cbd518118a5f2889213e5725e0e0a3c133de5d
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sat Nov 24 20:34:04 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Nov 25 08:25:12 2018 +0100

    drop unused FormulaVectorDisabledNotInSoftwareSubset
    
    Change-Id: I6d9b43ce6c72ff876b48bfba4b6de09ed46fd809
    Reviewed-on: https://gerrit.libreoffice.org/63946
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results
index 13c2670990e9..d736f3a52147 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1168,8 +1168,6 @@ sc/inc/token.hxx:214
     enum ScTableRefToken::Item DATA_TOTALS
 sc/inc/types.hxx:38
     enum ScMatValType NonvalueMask
-sc/inc/types.hxx:56
-    enum ScFormulaVectorState FormulaVectorDisabledNotInSoftwareSubset
 sc/source/filter/lotus/lotread.cxx:41
     enum STATE S_WK1
 sc/source/ui/inc/viewdata.hxx:43
diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx
index 995f715c37c3..2cfcb00eab21 100644
--- a/sc/inc/types.hxx
+++ b/sc/inc/types.hxx
@@ -53,7 +53,6 @@ enum ScFormulaVectorState
 {
     FormulaVectorDisabled,
     FormulaVectorDisabledNotInSubSet,
-    FormulaVectorDisabledNotInSoftwareSubset,
     FormulaVectorDisabledByOpCode,
     FormulaVectorDisabledByStackVariable,
 
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 5b20269528a4..aadb8e11b4d0 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -4732,9 +4732,6 @@ bool ScFormulaCell::InterpretFormulaGroupOpenCL(sc::FormulaLogger::GroupScope& a
         case FormulaVectorDisabledByOpCode:
             aScope.addMessage("group calc disabled due to vector state (non-vector-supporting opcode)");
             break;
-        case FormulaVectorDisabledNotInSoftwareSubset:
-            aScope.addMessage("group calc disabled due to vector state (opcode not in software subset)");
-            break;
         case FormulaVectorDisabledByStackVariable:
             aScope.addMessage("group calc disabled due to vector state (non-vector-supporting stack variable)");
             break;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 474730050d72..12e692825b07 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1804,7 +1804,6 @@ bool ScTokenArray::IsFormulaVectorDisabled() const
     {
         case FormulaVectorDisabled:
         case FormulaVectorDisabledByOpCode:
-        case FormulaVectorDisabledNotInSoftwareSubset:
         case FormulaVectorDisabledByStackVariable:
         case FormulaVectorDisabledNotInSubSet:
             return true;