[SCM] KOffice packaging branch, squeeze, updated. debian/2.2.1-3-4-gc1936ef

[Modestas Vainius]

The following commit has been merged in the squeeze branch:
commit 7820aca79db7917623949a7bcc9f4048afcc06b1
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Nov 29 02:00:26 2010 +0200

    Fix saving of time values in ods files in kspread.
    
    Add patch kspread_backport_fix_time_values_in_ods.diff.
    (Closes: #604773)
---
 debian/changelog                                   |    2 +
 .../kspread_backport_fix_time_values_in_ods.diff   |   32 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ff8386..f4f63f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 koffice (1:2.2.1-4) UNRELEASED; urgency=low
 
+  * Add patch kspread_backport_fix_time_values_in_ods.diff to fix saving of
+    time values in ods files in kspread. (Closes: #604773)
 
  -- Modestas Vainius <modax at debian.org>  Mon, 29 Nov 2010 01:58:04 +0200
 
diff --git a/debian/patches/kspread_backport_fix_time_values_in_ods.diff b/debian/patches/kspread_backport_fix_time_values_in_ods.diff
new file mode 100644
index 0000000..11dc25f
--- /dev/null
+++ b/debian/patches/kspread_backport_fix_time_values_in_ods.diff
@@ -0,0 +1,32 @@
+From: Marijn Kruisselbrink <m.kruisselbrink at student.tue.nl>
+Subject: Fix saving of time values in ods files
+Acked-By: Modestas Vainius <modax at debian.org>
+Bug: https://bugs.kde.org/show_bug.cgi?id=253042
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=604773
+Origin: backport, http://websvn.kde.org/?view=rev&revision=1183113
+Last-Update: 2010-11-28
+Applied-Upstream: 2.3
+
+This unfortunately got broken by a change in Qt4.1 and kspread relying on
+undocumented behavior of QTime::toString()
+
+--- a/kspread/Cell.cpp
++++ b/kspread/Cell.cpp
+@@ -1273,7 +1273,7 @@ void Cell::saveOdfValue(KoXmlWriter &xml
+         if (isTime()) {
+             xmlWriter.addAttribute("office:value-type", "time");
+             xmlWriter.addAttribute("office:time-value",
+-                                   value().asTime(sheet()->map()->calculationSettings()).toString("PThhHmmMssS"));
++                                   value().asTime(sheet()->map()->calculationSettings()).toString("'PT'hh'H'mm'M'ss'S'"));
+         } else {
+             xmlWriter.addAttribute("office:value-type", "date");
+             xmlWriter.addAttribute("office:date-value",
+@@ -1284,7 +1284,7 @@ void Cell::saveOdfValue(KoXmlWriter &xml
+     case Value::fmt_Time: {
+         xmlWriter.addAttribute("office:value-type", "time");
+         xmlWriter.addAttribute("office:time-value",
+-                               value().asTime(sheet()->map()->calculationSettings()).toString("PThhHmmMssS"));
++                               value().asTime(sheet()->map()->calculationSettings()).toString("'PT'hh'H'mm'M'ss'S'"));
+         break;
+     }
+     case Value::fmt_String: {
diff --git a/debian/patches/series b/debian/patches/series
index 3020b32..39b3c62 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fixes_arm.diff
+kspread_backport_fix_time_values_in_ods.diff

-- 
KOffice packaging