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

List:       kde-commits
Subject:    koffice/kchart
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2008-11-09 11:32:47
Message-ID: 1226230367.860600.25560.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 881931 by ingwa:

* Fix a bug when loading empty cells.
* Also mark loading and saving data as DONE in the TODO



 M  +1 -1      TODO  
 M  +11 -8     shape/TableModel.cpp  


--- trunk/koffice/kchart/TODO #881930:881931
@@ -93,7 +93,7 @@
     - Axis labels                                               josi    done
     - Axis scale                                                --      --
   + Data Series                                                 DONE    DONE
-  + Data                                                        INGE    INGE
+  + Data                                                        DONE    DONE
 
 * Configuration with tools
   + Types and subtypes                                                  ----
--- trunk/koffice/kchart/shape/TableModel.cpp #881930:881931
@@ -90,8 +90,8 @@
         if ( n.localName() == "table-rows" || n.localName() == "table-header-rows" )
         {
             const bool isHeader = n.localName() == "table-header-rows";
-            int row = 0;
-            KoXmlElement _n;
+            int           row = 0;
+            KoXmlElement  _n;
             forEachElement ( _n, n )
             {
                 if ( _n.namespaceURI() != KoXmlNS::table )
@@ -104,18 +104,20 @@
                     KoXmlElement __n;
                     forEachElement ( __n, _n )
                     {
-                        if ( __n.namespaceURI() != KoXmlNS::table )
-                            continue;
-                        if ( __n.localName() == "table-cell" )
-                        {
+			if ( __n.namespaceURI() != KoXmlNS::table )
+			    continue;
+
+                        if ( __n.localName() == "table-cell" ) {
                             if ( column >= columnCount() )
                                 setColumnCount( columnCount() + 1 );
                             const QString valueType = __n.attributeNS( \
KoXmlNS::office, "value-type" ); +
                             QString valueString;
                             const KoXmlElement valueElement = __n.namedItemNS( \
                KoXmlNS::text, "p" ).toElement();
-                            if ( valueElement.isNull() || !valueElement.isElement() \
                )
-                            {
+                            if ( valueElement.isNull() || !valueElement.isElement() \
                ) {
                                 qWarning() << "TableModel::loadOdf(): Cell contains \
no valid <text:p> element, cannnot load cell data."; +				// Even if it doesn't \
contain any value, it's still a cell. +				column++;
                                 continue;
                             }
                             QVariant value;
@@ -126,6 +128,7 @@
                                 value = (bool)valueString.toInt();
                             else // if ( valueType == "string" )
                                 value = valueString;
+
                             if ( isHeader )
                                 setHeaderData( column, Qt::Horizontal, value );
                             else


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