Commit af514db8 authored by Volker Krause's avatar Volker Krause

Adapt to Event::isMultiDay changes

parent 5217ef80
......@@ -310,14 +310,14 @@ void HtmlExport::createEvent(QTextStream *ts, const Event::Ptr &event, QDate dat
*ts << " <tr>" << endl;
if (!event->allDay()) {
if (event->isMultiDay(d->mCalendar->timeSpec()) && (event->dtStart().date() != date)) {
if (event->isMultiDay(d->mCalendar->timeZone()) && (event->dtStart().date() != date)) {
*ts << " <td>&nbsp;</td>" << endl;
} else {
*ts << " <td valign=\"top\">"
<< IncidenceFormatter::timeToString(event->dtStart().toLocalZone().time(), true)
<< "</td>" << endl;
}
if (event->isMultiDay(d->mCalendar->timeSpec()) && (event->dtEnd().date() != date)) {
if (event->isMultiDay(d->mCalendar->timeZone()) && (event->dtEnd().date() != date)) {
*ts << " <td>&nbsp;</td>" << endl;
} else {
*ts << " <td valign=\"top\">"
......
......@@ -1090,7 +1090,7 @@ static QVariantHash invitationDetailsEvent(InvitationFormatterHelper *helper, co
incidence[QStringLiteral("location")] = invitationLocation(event, noHtmlMode);
incidence[QStringLiteral("recurs")] = event->recurs();
incidence[QStringLiteral("recurrence")] = recurrenceString(event);
incidence[QStringLiteral("isMultiDay")] = event->isMultiDay(KDateTime::LocalZone);
incidence[QStringLiteral("isMultiDay")] = event->isMultiDay(QTimeZone::systemTimeZone());
incidence[QStringLiteral("isAllDay")] = event->allDay();
incidence[QStringLiteral("dateTime")] = IncidenceFormatter::formatStartEnd(event->dtStart().dateTime(), event->dtEnd().dateTime(), event->allDay());
incidence[QStringLiteral("duration")] = durationString(event);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment