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

List:       kde-commits
Subject:    [koffice/koffice/change-tracking] plugins/textshape/commands
From:       Ganesh Paramasivam <ganesh () crystalfab ! com>
Date:       2011-01-23 13:32:00
Message-ID: 20110123133200.C396FA6092 () git ! kde ! org
[Download RAW message or body]

Git commit 6834dae609ea07e44a18b8a59b6e5ea1e3c02a9c by Ganesh Paramasivam
Pushed by ganeshp into branch koffice/change-tracking

Set change-id in the charformat when deleting text with change tracking enabled in \
ChangeTrackedDeleteCommand.cpp. This was being previously done in \
KoChangeTracker::insertDeleteFragment

M  +5    -0    plugins/textshape/commands/ChangeTrackedDeleteCommand.cpp     

http://commits.kde.org/68dc8371/6834dae609ea07e44a18b8a59b6e5ea1e3c02a9c

diff --git a/plugins/textshape/commands/ChangeTrackedDeleteCommand.cpp \
b/plugins/textshape/commands/ChangeTrackedDeleteCommand.cpp index aa0f8c0..af17717 \
                100644
--- a/plugins/textshape/commands/ChangeTrackedDeleteCommand.cpp
+++ b/plugins/textshape/commands/ChangeTrackedDeleteCommand.cpp
@@ -290,6 +290,11 @@ void ChangeTrackedDeleteCommand::deleteSelection(QTextCursor \
                &selection)
     deleteChangemarker = new \
KoDeleteChangeMarker(KoTextDocument(document).changeTracker());  \
deleteChangemarker->setChangeId(changeId);  \
element->setDeleteChangeMarker(deleteChangemarker); +
+    QTextCharFormat charFormat;
+    charFormat.setProperty(KoCharacterStyle::ChangeTrackerId, changeId);
+    selection.mergeCharFormat(charFormat);
+
     deletedFragment = KoChangeTracker::generateDeleteFragment(selection, \
deleteChangemarker);  element->setDeleteData(deletedFragment);
 


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