Improved loading of example files shipped with KWordQuiz and KVocTrain

svn path=/branches/work/kwordquiz/src/keduvockvtmlreader.cpp; revision=431354

diff --git a/kwordquiz/keduvockvtmlreader.cpp b/kwordquiz/keduvockvtmlreader.cpp
index 3f3247ea28de5b12a9a29834d25ed76b36e51876..a6567c8b6993b29d310b627543e3bd5053237502 100644 (file)
--- a/kwordquiz/keduvockvtmlreader.cpp
+++ b/kwordquiz/keduvockvtmlreader.cpp
@@ -1144,7 +1144,7 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
         return false;
     }
 
-    if (domElementOriginalChild.tagName() == KV_COMPARISON_GRP)
+    else if (domElementOriginalChild.tagName() == KV_COMPARISON_GRP)
     {
       if (bComparison)
       {
@@ -1157,7 +1157,7 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
         return false;
     }
 
-    if (domElementOriginalChild.tagName() == KV_MULTIPLECHOICE_GRP)
+    else if (domElementOriginalChild.tagName() == KV_MULTIPLECHOICE_GRP)
     {
       if (bMultipleChoice)
       {
@@ -1179,7 +1179,7 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
     domElementOriginalChild = domElementOriginalChild.nextSibling().toElement();
   }
 
-  textstr = domElementExpressionChild.text();
+  textstr = domElementExpressionChild.lastChild().toText().data();
   if (textstr.isNull())
     textstr = "";
 
@@ -1322,7 +1322,7 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
           return false;
       }
 
-      if (domElementOriginalChild.tagName() == KV_COMPARISON_GRP)
+      else if (domElementOriginalChild.tagName() == KV_COMPARISON_GRP)
       {
         if (bComparison)
         {
@@ -1335,7 +1335,7 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
           return false;
       }
 
-      if (domElementOriginalChild.tagName() == KV_MULTIPLECHOICE_GRP)
+      else if (domElementOriginalChild.tagName() == KV_MULTIPLECHOICE_GRP)
       {
         if (bMultipleChoice)
         {
@@ -1357,7 +1357,7 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
       domElementOriginalChild = domElementOriginalChild.nextSibling().toElement();
     }
 
-    textstr = domElementExpressionChild.text();
+    textstr = domElementExpressionChild.lastChild().toText().data();
     if (textstr.isNull())
       textstr = "";