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

List:       kde-commits
Subject:    =?utf-8?q?=5Bcalligra=5D_libs/kotext/opendocument=3A_Handle_tabl?=
From:       Sebastian Sauer <sebastian.sauer () kdab ! com>
Date:       2011-06-03 12:41:32
Message-ID: 20110603124132.6D06CA60A4 () git ! kde ! org
[Download RAW message or body]

Git commit 09bf66c4b404f9fb8d3c2912ea77d02646e38f0a by Sebastian Sauer.
Committed on 03/06/2011 at 14:39.
Pushed by sebsauer into branch 'master'.

Handle table:table-column definitions inside table:table-columns.
This fixes a bunch of cases where some columns wheren't displayed.
This alos fixes those infamous TABLES.odt case.

M  +7    -0    libs/kotext/opendocument/KoTextLoader.cpp     

http://commits.kde.org/calligra/09bf66c4b404f9fb8d3c2912ea77d02646e38f0a

diff --git a/libs/kotext/opendocument/KoTextLoader.cpp b/libs/kotext/opendocument/KoTextLoader.cpp
index 6ceb167..26d4c1b 100644
--- a/libs/kotext/opendocument/KoTextLoader.cpp
+++ b/libs/kotext/opendocument/KoTextLoader.cpp
@@ -1986,6 +1986,13 @@ void KoTextLoader::loadTable(const KoXmlElement &tableElem, QTextCursor &cursor)
             if (tblTag.namespaceURI() == KoXmlNS::table) {
                 if (tblLocalName == "table-column") {
                     loadTableColumn(tblTag, tbl, columns);
+                } else if (tblLocalName == "table-columns") {
+                    KoXmlElement e;
+                    forEachElement(e, tblTag) {
+                        if (e.localName() == "table-column") {
+                            loadTableColumn(e, tbl, columns);
+                        }
+                    }
                 } else if (tblLocalName == "table-row") {
                     if (tblTag.attributeNS(KoXmlNS::delta, "insertion-type") != "")
                         d->openChangeRegion(tblTag);

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