Git commit b869914ddfb34af910fffee71423f22e35ffc76c by Ganesh Paramasivam.
Committed on 09/03/2011 at 09:20.
Pushed by ganeshp into branch 'koffice/change-tracking'.

Verification and addition of unit test to verify paragraph merges in ODF 1.2 format

M  +1    -0    libs/kotext/opendocument/tests/TestChangeTracking.cpp     
A  +-    --    libs/kotext/opendocument/tests/data/ChangeTracking/odf12/paragraph-merge/paragraph-merge-tracked.odt         [License: UNKNOWN]  *

The files marked with a * at the end have a non valid license. Please read: http://techbase.kde.org/Policies/Licensing_Policy and use the headers which are listed at that page.


http://commits.kde.org/koffice/b869914ddfb34af910fffee71423f22e35ffc76c

diff --git a/libs/kotext/opendocument/tests/TestChangeTracking.cpp b/libs/kotext/opendocument/tests/TestChangeTracking.cpp
index 4b9bb22..f10fa86 100644
--- a/libs/kotext/opendocument/tests/TestChangeTracking.cpp
+++ b/libs/kotext/opendocument/tests/TestChangeTracking.cpp
@@ -320,6 +320,7 @@ void TestChangeTracking::testChangeTracking_data()
     QTest::newRow("Simple Text Insertion")  << "ChangeTracking/odf12/simple-text-addition/simple-text-addition-tracked.odt" << "ODF12";
     QTest::newRow("Simple Text Deletion")  << "ChangeTracking/odf12/simple-text-deletion/simple-text-deletion-tracked.odt" << "ODF12";
     QTest::newRow("Text Format Changes")  << "ChangeTracking/odf12/text-format-changes/text-format-changes-tracked.odt" << "ODF12";
+    QTest::newRow("Paragraph Merge")  << "ChangeTracking/odf12/paragraph-merge/paragraph-merge-tracked.odt" << "ODF12";
 }
 
 bool TestChangeTracking::verifyContentXml(QString &originalFileName, QString &roundTripFileName)
diff --git a/libs/kotext/opendocument/tests/data/ChangeTracking/odf12/paragraph-merge/paragraph-merge-tracked.odt b/libs/kotext/opendocument/tests/data/ChangeTracking/odf12/paragraph-merge/paragraph-merge-tracked.odt
new file mode 100644
index 0000000..5cb918a
Binary files /dev/null and b/libs/kotext/opendocument/tests/data/ChangeTracking/odf12/paragraph-merge/paragraph-merge-tracked.odt differ