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

List:       kde-commits
Subject:    koffice/kugar/lib
From:       Alexander Dymo <cloudtemple () mksat ! net>
Date:       2003-05-03 15:33:59
[Download RAW message or body]

CVS commit by dymo: 

direct database support integrated with kugar part (shell)


  M +1 -0      kugar.h   1.3
  M +19 -15    mdatabasereportengine.cpp   1.4


--- koffice/kugar/lib/kugar.h  #1.2:1.3
@@ -13,4 +13,5 @@
 #include "mreportengine.h"
 #include "kreportviewer.h"
+#include "mdatabasereportengine.h"
 
 #endif

--- koffice/kugar/lib/mdatabasereportengine.cpp  #1.3:1.4
@@ -301,4 +301,23 @@ QString MDatabaseReportEngine::mergeRepo
     QString result = dom.toString(4);
 
+    QDomNode *formerDataSource = 0;
+    QDomNode n = dom.documentElement().firstChild();
+    while ( !n.isNull() ) {
+        if ( n.isElement() ) {
+            QDomElement e = n.toElement();
+            if ( e.tagName() == QString("DataSource") )
+            {
+                formerDataSource = &e;
+                break;
+            }
+        }
+        n = n.nextSibling();
+    }
+    if (formerDataSource == 0)
+    {
+        qWarning("datasource not found");
+        return result;
+    }
+
     QDomElement docElem = dom.documentElement();
     QString templateFile = docElem.attribute("Template");
@@ -328,19 +347,4 @@ QString MDatabaseReportEngine::mergeRepo
 
     // perform merging with existing data in the data file
-    QDomNode *formerDataSource = 0;
-    QDomNode n = dom.documentElement().firstChild();
-    while ( !n.isNull() ) {
-        if ( n.isElement() ) {
-            QDomElement e = n.toElement();
-            if ( e.tagName() == "DataSource" );
-            {
-                formerDataSource = &e;
-                break;
-            }
-        }
-        n = n.nextSibling();
-    }
-    if (!formerDataSource)
-        return result;
 
     QDomDocument d;


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