[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/source

[Libreoffice Gerrit user]

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

New commits:
commit 40a7c1c1ef133950ddb4c2052d460a9ce2b02b15
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Wed Aug 22 20:00:16 2018 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Thu Aug 23 10:46:17 2018 +0200

    Resolves: tdf#119402 +- typo sign flip
    
    Regression from
    
        commit 667aa6ade94a4dee441868d21db037e42c871932
        CommitDate: Wed Jul 19 20:13:58 2017 +0200
    
            Avoid temporary Date and normalization
    
    that introduced a sign flip
    from        +  5 - eDay
    to          + (5 + eDay)
    instead of  + (5 - eDay)
    
    Change-Id: I28194296b20552135e6abd24eb9eefe8634ce7c0
    Reviewed-on: https://gerrit.libreoffice.org/59461
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit cadd6c595b250b3ce0025a2a09c160eaae483d5a)
    Reviewed-on: https://gerrit.libreoffice.org/59476
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index d07c98ebbf8d..705bb83a64e5 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1604,7 +1604,7 @@ bool ScCondDateFormatEntry::IsValid( const ScAddress& rPos ) const
                 if( eDay != SUNDAY )
                 {
                     Date aBegin(rActDate - (1 + static_cast<sal_Int32>(eDay)));
-                    Date aEnd(rActDate + (5 + static_cast<sal_Int32>(eDay)));
+                    Date aEnd(rActDate + (5 - static_cast<sal_Int32>(eDay)));
                     return aCellDate.IsBetween( aBegin, aEnd );
                 }
                 else