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

List:       kde-commits
Subject:    koffice/libs/kotext
From:       Thomas Zander <zander () kde ! org>
Date:       2010-08-21 19:04:44
Message-ID: 20100821190444.BE7A4AC887 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1166410 by zander:

Fix output types to be what we actually should put in

 M  +9 -9      KoTextDebug.cpp  
 M  +12 -2     opendocument/tests/TestLoading.cpp  


--- trunk/koffice/libs/kotext/KoTextDebug.cpp #1166409:1166410
@@ -285,7 +285,7 @@
             break;
         case KoCharacterStyle::TextRotationAngle:
             key = "rotation-angle";
-            value = properties[id].toInt();
+            value = QString::number(properties[id].toInt());
             break;
         case KoCharacterStyle::TextRotationScale:
             key = "text-rotation-scale";
@@ -293,11 +293,11 @@
             break;
         case KoCharacterStyle::TextScale:
             key = "text-scale";
-            value = properties[id].toInt();
+            value = QString::number(properties[id].toInt());
             break;
         case KoCharacterStyle::InlineRdf:
             key = "inline-rdf";
-            value = properties[id].toInt();
+            value = QString::number(properties[id].toInt());
             break;
         default:
             break;
@@ -512,7 +512,7 @@
             break;
         case QTextListFormat::ListIndent:
             key = "indent";
-            value = QString::number(properties[id].toInt());
+            value = QString::number(properties[id].toDouble());
             break;
         case KoListStyle::ListItemPrefix:
             key = "prefix";
@@ -564,7 +564,7 @@
             break;
         case KoListStyle::MinimumWidth:
             key = "minimum-width";
-            value = QString::number(properties[id].toInt());
+            value = QString::number(properties[id].toDouble());
             break;
         case KoListStyle::ListId:
             key = "list-id";
@@ -572,7 +572,7 @@
             break;
         case KoListStyle::IsOutline:
             key = "is-outline";
-            value = QString::number(properties[id].toInt());
+            value = properties[id].toBool();
             break;
         case KoListStyle::Indent:
             key = "indent";
@@ -580,15 +580,15 @@
             break;
         case KoListStyle::MinimumDistance:
             key = "minimum-distance";
-            value = QString::number(properties[id].toInt());
+            value = QString::number(properties[id].toDouble());
             break;
         case KoListStyle::Width:
             key = "width";
-            value = QString::number(properties[id].toInt());
+            value = QString::number(properties[id].toDouble());
             break;
         case KoListStyle::Height:
             key = "height";
-            value = QString::number(properties[id].toInt());
+            value = QString::number(properties[id].toDouble());
             break;
         case KoListStyle::BulletImageKey:
             key = "bullet-image-key";
--- trunk/koffice/libs/kotext/opendocument/tests/TestLoading.cpp #1166409:1166410
@@ -319,8 +319,16 @@
     }
 
     bool equal = actualIterator.atEnd() == expectedIterator.atEnd();
-    if (!equal)
-        qDebug() << "compareBlock: Iterator are not in the end! at " << \
actualBlock.text() << expectedBlock.text(); +    if (!equal) {
+        if (actualIterator.atEnd())
+            qDebug() << "compareBlock: expected more text after block length:"
+                << actualBlock.length() << ", expected:" << expectedBlock.length()
+                << "at position:" << actualBlock.position();
+        else
+            qDebug() << "compareBlock: more text than expected in block length:"
+                << actualBlock.length() << ", expected:" << expectedBlock.length()
+                << "at position:" << actualBlock.position();
+    }
 
     return equal;
 }
@@ -1141,7 +1149,9 @@
 //    showDocument(actualDocument);
 //    showDocument(expectedDocument);
     if (!documentsEqual) {
+        qDebug() << "actual document:  ======================";
         KoTextDebug::dumpDocument(actualDocument);
+        qDebug() << "expected document: ======================";
         KoTextDebug::dumpDocument(expectedDocument);
     }
     delete actualDocument;


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