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

Winfried Donkers winfrieddonkers at libreoffice.org
Fri Dec 13 06:09:41 PST 2013


 formula/source/core/resource/core_resource.src |    4 ----
 include/formula/compiler.hrc                   |    1 -
 include/formula/opcode.hxx                     |    1 -
 sc/source/core/inc/interpre.hxx                |    2 --
 sc/source/core/tool/parclass.cxx               |    1 -
 5 files changed, 9 deletions(-)

New commits:
commit d1e1cd128c83982f69331c92a8e319d3031a7685
Author: Winfried Donkers <winfrieddonkers at libreoffice.org>
Date:   Tue Dec 10 13:05:52 2013 +0100

    remove unused code (ancient Calc function ZELLERROR)
    
    code has no function, except that calc documents with formula
    ZELLERROR will not produce an error. But the formula is not
    interpreted, so remains 'dead code'.
    
    Change-Id: I6e7df7040a0273bcd3ebd497055924b7afdd3311
    Reviewed-on: https://gerrit.libreoffice.org/7018
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index 5b2220a..84faa58 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -143,7 +143,6 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
     String SC_OPCODE_GAMMA_LN { Text = "GAMMALN" ; };
     String SC_OPCODE_GAMMA_LN_MS { Text = "COM.MICROSOFT.GAMMALN.PRECISE" ; };
     String SC_OPCODE_ERROR_TYPE { Text = "ORG.OPENOFFICE.ERRORTYPE" ; };
-    String SC_OPCODE_ERR_CELL { Text = "ZellError" ; };  // TODO: ancient legacy only, remove?
     String SC_OPCODE_FORMULA { Text = "FORMULA"; };
     String SC_OPCODE_ARC_TAN_2 { Text = "ATAN2" ; };
     String SC_OPCODE_CEIL { Text = "CEILING" ; };
@@ -518,7 +517,6 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
     String SC_OPCODE_GAMMA_LN { Text = "GAMMALN" ; };
     String SC_OPCODE_GAMMA_LN_MS { Text = "_xlfn.GAMMALN.PRECISE" ; };
     String SC_OPCODE_ERROR_TYPE { Text = "ERRORTYPE" ; };
-    String SC_OPCODE_ERR_CELL { Text = "ZellError" ; };  // TODO: ancient legacy only, remove?
     String SC_OPCODE_FORMULA { Text = "_xlfn.FORMULATEXT"; };
     String SC_OPCODE_ARC_TAN_2 { Text = "ATAN2" ; };
     String SC_OPCODE_CEIL { Text = "CEILING" ; };
@@ -895,7 +893,6 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
     String SC_OPCODE_GAMMA_LN { Text = "GAMMALN" ; };
     String SC_OPCODE_GAMMA_LN_MS { Text = "GAMMALN.PRECISE" ; };
     String SC_OPCODE_ERROR_TYPE { Text = "ERRORTYPE" ; };
-    String SC_OPCODE_ERR_CELL { Text = "ZellError" ; };  // TODO: ancient legacy only, remove?
     String SC_OPCODE_FORMULA { Text = "FORMULA"; };
     String SC_OPCODE_ARC_TAN_2 { Text = "ATAN2" ; };
     String SC_OPCODE_CEIL { Text = "CEILING" ; };
@@ -1555,7 +1552,6 @@ Resource RID_STRLIST_FUNCTION_NAMES
     {
         Text [ en-US ] = "ERRORTYPE" ;
     };
-    String SC_OPCODE_ERR_CELL { Text = "ZellError" ; };  // TODO: ancient legacy only, remove?
     String SC_OPCODE_FORMULA
     {
         Text [ en-US ] = "FORMULA" ;
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index b71c746..7dacf307 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -182,7 +182,6 @@
 #define SC_OPCODE_S_NORM_INV        149
 #define SC_OPCODE_GAMMA_LN          150
 #define SC_OPCODE_ERROR_TYPE        151
-#define SC_OPCODE_ERR_CELL          152
 #define SC_OPCODE_FORMULA           153
 #define SC_OPCODE_ARABIC            154
 #define SC_OPCODE_INFO              155
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 18e2a34..0b08532 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -176,7 +176,6 @@ enum OpCodeEnum
         ocGammaLn_MS        = SC_OPCODE_GAMMA_LN_MS,
         ocGamma             = SC_OPCODE_GAMMA,
         ocErrorType         = SC_OPCODE_ERROR_TYPE,
-        ocErrCell           = SC_OPCODE_ERR_CELL,
         ocFormula           = SC_OPCODE_FORMULA,
         ocArabic            = SC_OPCODE_ARABIC,
         ocInfo              = SC_OPCODE_INFO,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 5171f30..c2a82f3 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -357,8 +357,6 @@ ScMatrixRef GetMatrix();
 sc::RangeMatrix GetRangeMatrix();
 
 void ScTableOp();                                       // repeated operations
-void ScErrCell();                                       // special handling for
-                                                        // error cell
 
 // common helper functions
 
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 550b116..db42e46 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -62,7 +62,6 @@ const ScParameterClassification::RawData ScParameterClassification::pRawData[] =
     { ocClose,           {{ Bounds                                               }, 0 }},
     { ocSep,             {{ Bounds                                               }, 0 }},
     { ocNoName,          {{ Bounds                                               }, 0 }},
-    { ocErrCell,         {{ Bounds                                               }, 0 }},
     { ocStop,            {{ Bounds                                               }, 0 }},
     { ocUnion,           {{ Reference, Reference                                 }, 0 }},
     { ocRange,           {{ Reference, Reference                                 }, 0 }},


More information about the Libreoffice-commits mailing list