[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sc/source

Eike Rathke erack at redhat.com
Tue Jun 14 16:06:11 UTC 2016


 sc/source/core/tool/interpr2.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b54102be568b306b8de8d09e538a9ad332f1c602
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Jun 14 17:33:32 2016 +0200

    allow text as dates in inline array of holidays for NETWORKDAYS()
    
    Change-Id: I0c5438a0ee23a5974495a9f782b3f22ef7472c87
    (cherry picked from commit 3c2803bdbc598deeaf6efe43870d4f9d61cb2c6a)
    Reviewed-on: https://gerrit.libreoffice.org/26273
    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 bd29749..4e57826 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -344,7 +344,7 @@ sal_uInt16 ScInterpreter::GetWeekendAndHolidayMasks(
 
     if ( nParamCount >= 3 )
     {
-        GetSortArray( 1, rSortArray, nullptr, false, true );
+        GetSortArray( 1, rSortArray, nullptr, true, true );
         size_t nMax = rSortArray.size();
         for ( size_t i = 0; i < nMax; i++ )
             rSortArray.at( i ) = ::rtl::math::approxFloor( rSortArray.at( i ) ) + nNullDate;


More information about the Libreoffice-commits mailing list