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

List:       kde-commits
Subject:    =?utf-8?q?=5Bcalligra=5D_libs/kotext/opendocument/tests=3A_Fix_t?=
From:       Lukáš Tvrdý <lukast.dev () gmail ! com>
Date:       2011-03-01 14:59:06
Message-ID: 20110301145906.B4ABAA60C9 () git ! kde ! org
[Download RAW message or body]

Git commit ecc1bd8090af4f4252d892e37eac4e8f0387ffd3 by Lukáš Tvrdý.
Committed on 01/03/2011 at 15:58.
Pushed by lukast into branch 'master'.

Fix the loading test

M  +2    -0    libs/kotext/opendocument/tests/TestLoading.cpp     
M  +2    -1    libs/kotext/opendocument/tests/data/common.qs     

http://commits.kde.org/calligra/ecc1bd8090af4f4252d892e37eac4e8f0387ffd3

diff --git a/libs/kotext/opendocument/tests/TestLoading.cpp \
b/libs/kotext/opendocument/tests/TestLoading.cpp index e6a790a..5f632e6 100644
--- a/libs/kotext/opendocument/tests/TestLoading.cpp
+++ b/libs/kotext/opendocument/tests/TestLoading.cpp
@@ -252,12 +252,14 @@ bool TestLoading::compareListFormats(const QTextListFormat \
&actualFormat, const  actualProperties.remove(KoListStyle::StyleId);
     actualProperties.remove(KoListStyle::MinimumDistance);
     actualProperties.remove(KoListStyle::ListId);
+    actualProperties.remove(KoListStyle::MarkCharacterStyleId);
     actualProperties.remove(QTextFormat::ObjectIndex);
 
     QMap<int, QVariant> expectedProperties = expectedFormat.properties();
     expectedProperties.remove(KoListStyle::StyleId);
     expectedProperties.remove(KoListStyle::MinimumDistance);
     expectedProperties.remove(KoListStyle::ListId);
+    expectedProperties.remove(KoListStyle::MarkCharacterStyleId);
     expectedProperties.remove(QTextFormat::ObjectIndex);
 
 
diff --git a/libs/kotext/opendocument/tests/data/common.qs \
b/libs/kotext/opendocument/tests/data/common.qs index 46cbff8..e88ba0b 100644
--- a/libs/kotext/opendocument/tests/data/common.qs
+++ b/libs/kotext/opendocument/tests/data/common.qs
@@ -185,6 +185,7 @@ KoListStyle.StartValue= ++i;
 KoListStyle.Level= ++i;
 KoListStyle.DisplayLevel= ++i;
 KoListStyle.CharacterStyleId= ++i;
+KoListStyle.MarkCharacterStyleId= ++i;
 KoListStyle.BulletCharacter= ++i;
 KoListStyle.BulletSize= ++i;
 KoListStyle.Alignment= ++i;
@@ -270,4 +271,4 @@ KoTableCellStyle.RightBorderSpacing = i++;
 KoTableCellStyle.RightBorderInnerPen = i++;
 KoTableCellStyle.CellBackgroundBrush = i++;
 KoTableCellStyle.MasterPageName = i++;
-KoTableCellStyle.InlineRdf = i++;       
+KoTableCellStyle.InlineRdf = i++;


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