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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkoffice/change-tracking-odf12=5D_/=3A_Merging_from_?=
From:       Ganesh Paramasivam <ganesh () crystalfab ! com>
Date:       2011-03-11 6:44:33
Message-ID: 20110311064433.254A5A609B () git ! kde ! org
[Download RAW message or body]

Git commit c01836e57996fea18a88c1714f99929d4ab08607 by Ganesh Paramasivam.
Committed on 11/03/2011 at 07:43.
Pushed by ganeshp into branch 'change-tracking-odf12'.

Merging from change-tracking-integration branch

MM +17   -21   libs/kotext/KoTextEditor.cpp     
I  +66   -4    libs/kotext/KoTextShapeData.cpp     
I  +28   -1    libs/kotext/changetracker/KoDeleteChangeMarker.cpp     
MM +2    -0    libs/kotext/changetracker/KoDeleteChangeMarker.h     
I  +381  -0    libs/kotext/changetracker/KoTextShapeData.cpp     
MM +4    -8    libs/kotext/opendocument/KoTextLoader.cpp     
I  +255  -129  libs/kotext/opendocument/KoTextWriter.cpp     
I  +0    -7    libs/kotext/opendocument/tests/CMakeLists.txt     
I  +0    -473  libs/kotext/opendocument/tests/TestChangeLoading.cpp     
I  +0    -63   libs/kotext/opendocument/tests/TestChangeLoading.h     
I  +68   -57   libs/kotext/opendocument/tests/TestChangeTracking.cpp     
I  +1    -1    libs/kotext/opendocument/tests/TestChangeTracking.h     
I  +-    --    libs/kotext/opendocument/tests/data/ChangeTracking/odf12/paragraph-merge/paragraph-merge-tracked.odt \
 I  +-    --    libs/kotext/opendocument/tests/data/ChangeTracking/odf12/simple-text-addition/simple-text-addition-tracked.odt \
 I  +-    --    libs/kotext/opendocument/tests/data/ChangeTracking/odf12/simple-text-deletion/simple-text-deletion-tracked.odt \
 I  +-    --    libs/kotext/opendocument/tests/data/ChangeTracking/odf12/text-format-changes/text-format-changes-tracked.odt \
 I  +-    --    libs/kotext/opendocument/tests/data/TrackedChanges/ListDelete.odt     \
 I  +-    --    libs/kotext/opendocument/tests/data/TrackedChanges/ListItemDelete.odt \
 I  +-    --    libs/kotext/opendocument/tests/data/TrackedChanges/MultiParaDelete.odt \
 I  +-    --    libs/kotext/opendocument/tests/data/TrackedChanges/PartialListItemDelete.odt \
 I  +-    --    libs/kotext/opendocument/tests/data/TrackedChanges/SimpleDelete.odt   \
 I  +-    --    libs/kotext/opendocument/tests/data/TrackedChanges/TableDelete.odt    \
 I  +44   -1    libs/odf/KoGenChange.cpp     
I  +21   -1    libs/odf/KoGenChange.h     
I  +7    -2    libs/odf/KoGenChanges.cpp     
I  +1    -1    plugins/textshape/Layout.cpp     
MM +1    -1    plugins/textshape/TextTool.cpp     

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

diff --cc libs/kotext/KoTextEditor.cpp
index 8cd8db4,804f590..7ca5843
--- a/libs/kotext/KoTextEditor.cpp
+++ b/libs/kotext/KoTextEditor.cpp
@@@ -1326,19 -1320,10 +1320,10 @@@ void KoTextEditor::newLine(
      if (format.hasProperty(KoCharacterStyle::ChangeTrackerId)) {
          format.clearProperty(KoCharacterStyle::ChangeTrackerId);
      }
-     d->caret.insertBlock();
-     int endPosition = d->caret.position();
  
-     //Mark the inserted text
-     d->caret.setPosition(startPosition);
-     d->caret.setPosition(endPosition, QTextCursor::KeepAnchor);
- 
-     registerTrackedChange(d->caret, KoGenChange::InsertChange, i18n("Key Press"), \
                format, format, false);
- 
-     d->caret.clearSelection();
      QTextBlockFormat bf = d->caret.blockFormat();
      QVariant direction = bf.property(KoParagraphStyle::TextProgressionDirection);
 -    bf.clearProperty(QTextFormat::PageBreak_Auto);
 +    bf.clearProperty(QTextFormat::PageBreakPolicy);
      bf.clearProperty(KoParagraphStyle::ListStartValue);
      bf.clearProperty(KoParagraphStyle::UnnumberedListItem);
      bf.clearProperty(KoParagraphStyle::IsListHeader);
diff --cc plugins/textshape/TextTool.cpp
index 065221b,3e51b75..770e709
--- a/plugins/textshape/TextTool.cpp
+++ b/plugins/textshape/TextTool.cpp
@@@ -514,10 -514,9 +514,10 @@@ TextTool::~TextTool(
  
  void TextTool::showChangeTip()
  {
 -    if (!m_textShapeData || !m_changeTipCursorPos || \
!m_changeTracker->displayChanges())  +    KoTextEditor *textEditor = \
m_textEditor.data();  +    if (!textEditor || !m_changeTipCursorPos || \
!m_changeTracker->displayChanges())  return;
-     QTextCursor c(textEditor->document());
+     QTextCursor c(m_textShapeData->document());
      c.setPosition(m_changeTipCursorPos);
      if (m_changeTracker && m_changeTracker->containsInlineChanges(c.charFormat())) \
                {
          KoChangeTrackerElement *element = \
m_changeTracker->elementById(c.charFormat().property(KoCharacterStyle::ChangeTrackerId).toInt());



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