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

List:       kde-commits
Subject:    branches/work/koffice-change-tracking/libs/kotext/opendocument
From:       Ganesh Paramasivam <ganesh () crystalfab ! com>
Date:       2011-01-05 12:40:19
Message-ID: 20110105124019.BFED9AC8B0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1212002 by ganeshp:

Bug fix for a problem that resulted in occasional hang-ups of the application while \
saving changes

 M  +3 -3      KoTextWriter.cpp  


--- branches/work/koffice-change-tracking/libs/kotext/opendocument/KoTextWriter.cpp \
#1212001:1212002 @@ -702,8 +702,8 @@
     QTextBlock::iterator it = block.begin();
 
     if (it.atEnd()) {
-        //This is a single fragment block. So just return the change-id of the \
                fragment
-        changeId = it.fragment().charFormat().intProperty(KoCharacterStyle::ChangeTrackerId);
 +        //This is a empty block. So just return the change-id of the block 
+        changeId = block.blockFormat().property(KoCharacterStyle::ChangeTrackerId).toInt();
  }
 
     for (it = block.begin(); !(it.atEnd()); ++it) {
@@ -1279,7 +1279,7 @@
         }
     } while(changeId);
 
-    if (endBlock.blockNumber() != block.blockNumber()) {
+    if ((endBlock.blockNumber() != block.blockNumber()) && (endBlock.length())) {
         //Check that the last fragment of this block is not a part of this change. \
If so, it is not a merge or a split  QTextFragment lastFragment = \
(--(endBlock.end())).fragment();  QTextCharFormat lastFragmentFormat = \
lastFragment.charFormat();


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