Kaydet (Commit) 7ea839ae authored tarafından Eike Rathke's avatar Eike Rathke

correct WEEKNUM DayOfWeek handling, tdf#50950 follow-up, tdf#95419 related

Slight misinterpretation of the
{Sunday, Monday, Monday, Tuesday, ..., Sunday}
sequence defined in ODFF.

Change-Id: I09ac711adf8a52db1c9efbb1c67dc908b8e06618
üst ce814d1a
...@@ -220,15 +220,21 @@ void ScInterpreter::ScGetWeekOfYear() ...@@ -220,15 +220,21 @@ void ScInterpreter::ScGetWeekOfYear()
switch ( nFlag ) switch ( nFlag )
{ {
case 1 : case 1 :
case 11 : eFirstDayOfWeek = SUNDAY;
nMinimumNumberOfDaysInWeek = 1;
break;
case 2 : case 2 :
eFirstDayOfWeek = MONDAY;
nMinimumNumberOfDaysInWeek = 1;
break;
case 11 :
case 12 : case 12 :
case 13 : case 13 :
case 14 : case 14 :
case 15 : case 15 :
case 16 : case 16 :
case 17 : case 17 :
eFirstDayOfWeek = (DayOfWeek) ( ( nFlag - 1 ) % 10 ); eFirstDayOfWeek = static_cast<DayOfWeek>( nFlag - 11 ); // MONDAY := 0
nMinimumNumberOfDaysInWeek = 1; //the week containing January 1 is week 1 nMinimumNumberOfDaysInWeek = 1; //the week containing January 1 is week 1
break; break;
case 21 : case 21 :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment