[Libreoffice-commits] core.git: sc/source
Winfried Donkers
winfrieddonkers at libreoffice.org
Fri Sep 16 19:37:32 UTC 2016
sc/source/core/tool/interpr2.cxx | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
New commits:
commit 5e9d5eeb8a33fdcc500377d9eace40b5f5a7f750
Author: Winfried Donkers <winfrieddonkers at libreoffice.org>
Date: Fri Sep 9 13:18:42 2016 +0200
tdf#101541 function WORKDAY.INTL not working properly
When holidays are adjacent to weekend days, wrong results occurred.
Change-Id: I9ec86e00f1a62ea941ff70617a1b448601aff9cc
Reviewed-on: https://gerrit.libreoffice.org/28771
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index e214d39..0d02066 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -596,41 +596,37 @@ void ScInterpreter::ScWorkday_MS()
if ( nDays > 0 )
{
size_t nRef = 0;
- //skip holidays before/on start date
- while ( nRef < nMax && nSortArray.at( nRef ) <= nDate )
- nRef++;
-
while ( nDays )
{
+ do
+ {
+ ++nDate;
+ }
+ while ( bWeekendMask[ GetDayOfWeek( nDate ) ] ); //jump over weekend day(s)
+
while ( nRef < nMax && nSortArray.at( nRef ) < nDate )
nRef++;
if ( !( nRef < nMax && nSortArray.at( nRef ) == nDate ) || nRef >= nMax )
- nDays--;
-
- do
- ++nDate;
- while ( bWeekendMask[ GetDayOfWeek( nDate ) ] ); //jump over weekend day(s)
+ nDays--;
}
}
else
{
sal_Int16 nRef = nMax - 1;
- //skip holidays after/on start date
- while ( nRef >= 0 && nSortArray.at( nRef ) >= nDate )
- nRef--;
-
while ( nDays )
{
+ do
+ {
+ --nDate;
+ }
+ while ( bWeekendMask[ GetDayOfWeek( nDate ) ] ); //jump over weekend day(s)
+
while ( nRef >= 0 && nSortArray.at( nRef ) > nDate )
nRef--;
if ( !( nRef >= 0 && nSortArray.at( nRef ) == nDate ) || nRef < 0 )
nDays++;
-
- do
- --nDate;
- while ( bWeekendMask[ GetDayOfWeek( nDate ) ] ); //jump over weekend day(s)
}
}
PushDouble( ( double ) ( nDate - nNullDate ) );
More information about the Libreoffice-commits
mailing list