diff options
author | Eike Rathke <erack@redhat.com> | 2016-01-05 19:13:54 +0100 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2016-01-05 19:29:17 +0100 |
commit | 902c593196741ffec2d096855369313f6bbe756e (patch) | |
tree | 2a0555aec7de54dff4239dbd94090531340d4e82 /sc/source/core/inc/interpre.hxx | |
parent | 5f981642889b1b9980e98ebccc3150e022a73bed (diff) |
The remaining cases when loading old and wrong ISOWEEKNUM that can't be
mapped to either new WEEKNUM or ISOWEEKNUM now are mapped to
WEEKNUM_OOO(date,mode) with calculations identical to the old and wrong
OOo WEEKNUM.
These WEEKNUM_OOO cases are still wrongly saved as ISOWEEKNUM so can be
read by 5.0 or earlier versions as the old WEEKNUM, which should be
changed for 5.3 or later.
WEEKNUM_OOO is not offered in the Function Wizard to prevent deliberate
usage.
Also reverts the interim unit test change to
sc/qa/unit/data/contentCSV/date-time-functions.csv
that was necessary to catch the error generated by ISOWEEKNUM with two
arguments.
Change-Id: I874c4c7225900f03b879f2947512ae02270cbd4f
Diffstat (limited to 'sc/source/core/inc/interpre.hxx')
-rw-r--r-- | sc/source/core/inc/interpre.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index eefd16af7b33..f6b5bd89751e 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -620,6 +620,7 @@ void ScGetDay(); void ScGetDayOfWeek(); void ScGetWeekOfYear(); void ScGetIsoWeekOfYear(); +void ScWeeknumOOo(); void ScEasterSunday(); sal_uInt16 GetWeekendAndHolidayMasks( const sal_uInt8 nParamCount, const sal_uInt32 nNullDate, ::std::vector<double>& rSortArray, bool bWeekendMask[ 7 ] ); |