[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kroupware_branch: kdepim/korganizer
From:       Bo Thorsen <bo () sonofthor ! dk>
Date:       2003-10-14 8:25:40
[Download RAW message or body]

CVS commit by thorsen: 

Backported a fix to HTML exporting a month view. This fixes kroupware bug 375


  M +7 -2      htmlexport.cpp   1.30.2.2


--- kdepim/korganizer/htmlexport.cpp  #1.30.2.1:1.30.2.2
@@ -119,6 +119,7 @@ void HtmlExport::createHtmlMonthView(QTe
 
   int startmonth = start.month();
+  int startyear = start.year();
 
-  while (end.month()<=toDate().month()) {
+  while (end.month()<=toDate().month() && end.year()<=toDate().year()) {
     // Write header
     *ts << "<h2>" << (i18n("month_year","%1 %2").arg(KGlobal::locale()->monthName(start.month()))
@@ -183,5 +184,9 @@ void HtmlExport::createHtmlMonthView(QTe
     *ts << "</table>\n";
     startmonth++;
-    start.setYMD(start.year(),startmonth,1);
+    if( startmonth > 12 ) {
+        startmonth = 1;
+        ++startyear;
+    }
+    start.setYMD(startyear,startmonth,1);
     end.setYMD(start.year(),start.month(),start.daysInMonth());
   }


[prev in list] [next in list] [prev in thread] [next in thread]