[Libreoffice-commits] core.git: svtools/source

Julien Nabet serval2412 at yahoo.fr
Thu Aug 3 05:35:48 UTC 2017


 svtools/source/control/calendar.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 14b809550657f9df3a70d533ef54df857d48bc1b
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Aug 2 23:26:22 2017 +0200

    tdf#111074: fix AddDays in calendar
    
    Regression from https://cgit.freedesktop.org/libreoffice/core/commit/?id=fcd0361d6be8d088be12e500f0120afd7995d1ac
    In calendar.cxx,
    aLastDate -= nWeekDay;
    was converted with
    aLastDate.AddDays( nWeekDay );
    
    Change-Id: I8df8d288b0f5cfae66d798b1a96b5033c12d6503
    Reviewed-on: https://gerrit.libreoffice.org/40696
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 562b0030b9fb..b60e68df6331 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -1798,7 +1798,7 @@ tools::Rectangle Calendar::GetDateRect( const Date& rDate ) const
         {
             sal_Int32 nWeekDay = (sal_Int32)aLastDate.GetDayOfWeek();
             nWeekDay = (nWeekDay+(7-ImplGetWeekStart())) % 7;
-            aLastDate.AddDays( nWeekDay );
+            aLastDate.AddDays( -nWeekDay );
             aRect = GetDateRect( aLastDate );
             nDaysOff = rDate-aLastDate;
             nDayIndex = 0;


More information about the Libreoffice-commits mailing list