[Libreoffice-commits] core.git: sc/qa

Stephan Bergmann sbergman at redhat.com
Mon Jun 20 12:54:54 UTC 2016


 sc/qa/unit/data/functions/fods/eastersunday.fods |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit f92fb1cc0a4fb3e2024665a4274c543f64946538
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jun 20 14:44:11 2016 +0200

    Check that EASTERSUNDAY with negative value causes error
    
    ...even though that's not obvious from the implementation of
    ScInterpreter::ScEasterSunday (sc/source/core/tool/interpr2.cxx), which calls
    SvNumberFormatter::ExpandTwoDigitYear on that value, which also only checks that
    the value is < 100, but not whether it is non-negative.  However,
    ExpandTwoDigitYear takes its argument as sal_uInt16, so any negative value is
    guaranteed to be converted into a large sal_uInt16 value that is not < 100.
    
    Change-Id: I6f10672e510918f6e9010061541829fcd98e6dd0

diff --git a/sc/qa/unit/data/functions/fods/eastersunday.fods b/sc/qa/unit/data/functions/fods/eastersunday.fods
index 5f21573..0ff92a6 100644
--- a/sc/qa/unit/data/functions/fods/eastersunday.fods
+++ b/sc/qa/unit/data/functions/fods/eastersunday.fods
@@ -868,6 +868,20 @@
      <table:table-cell table:number-columns-repeated="9"/>
     </table:table-row>
     <table:table-row table:style-name="ro2">
+     <table:table-cell table:style-name="ce12" table:formula="of:=ORG.OPENOFFICE.EASTERSUNDAY(-1)" office:value-type="string" office:string-value="" calcext:value-type="error">
+      <text:p>Err:502</text:p>
+     </table:table-cell>
+     <table:table-cell office:value-type="string" calcext:value-type="string">
+      <text:p>#VALUE</text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="ce16" table:formula="of:=ISERROR([.A12])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
+      <text:p>TRUE</text:p>
+     </table:table-cell>
+     <table:table-cell table:style-name="ce18" table:formula="of:=FORMULA([.A12])" office:value-type="string" office:string-value="=EASTERSUNDAY(-1)" calcext:value-type="string">
+      <text:p>=EASTERSUNDAY(-1)</text:p>
+     </table:table-cell>
+    </table:table-row>
+    <table:table-row table:style-name="ro2">
      <table:table-cell table:number-columns-repeated="2"/>
      <table:table-cell table:style-name="ce17"/>
      <table:table-cell table:number-columns-repeated="11"/>
@@ -991,4 +1005,4 @@
    </table:named-expressions>
   </office:spreadsheet>
  </office:body>
-</office:document>
\ No newline at end of file
+</office:document>


More information about the Libreoffice-commits mailing list