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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkoffice/change-tracking-integration=5D_plugins/text?=
From:       Ganesh Paramasivam <ganesh () crystalfab ! com>
Date:       2011-02-23 15:15:50
Message-ID: 20110223151550.5C8D4A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 735e473307a2c43fab25a8c8b911543ca085b23d by Ganesh Paramasivam.
Committed on 23/02/2011 at 15:43.
Pushed by ganeshp into branch 'change-tracking-integration'.

Fixing merge issues

M  +0    -7    plugins/textshape/TextTool.cpp     

http://commits.kde.org/koffice/735e473307a2c43fab25a8c8b911543ca085b23d

diff --git a/plugins/textshape/TextTool.cpp b/plugins/textshape/TextTool.cpp
index f819e8b..ef36f68 100644
--- a/plugins/textshape/TextTool.cpp
+++ b/plugins/textshape/TextTool.cpp
@@ -1858,15 +1858,8 @@ void TextTool::formatParagraph()
 
 void TextTool::toggleShowChanges(bool on)//TODO transfer this in KoTextEditor
 {
-<<<<<<< HEAD
-    KoTextEditor *textEditor = m_textEditor.data();
-    if (textEditor == 0)
-        return;
-    ShowChangesCommand *command = new ShowChangesCommand(on, textEditor->document(), \
                this->canvas());
-=======
     m_actionShowChanges->setChecked(on);
     ShowChangesCommand *command = new ShowChangesCommand(on, \
                m_textShapeData->document(), this->canvas());
->>>>>>> koffice/change-tracking
     connect(command, SIGNAL(toggledShowChange(bool)), m_actionShowChanges, \
SLOT(setChecked(bool)));  m_textEditor.data()->addCommand(command);
 }


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