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

List:       kde-commits
Subject:    [calligra/calligra/2.6] plugins/textshape/dialogs: Improved undo/redo of lists.
From:       Gopalakrishna Bhat A <gopalakbhat () gmail ! com>
Date:       2013-01-26 3:26:59
Message-ID: 20130126032659.CD008A6091 () git ! kde ! org
[Download RAW message or body]

Git commit e8c0f9e3f9069bfe07d3ed7ea14a4cfa598c1bda by Gopalakrishna Bhat A.
Committed on 14/01/2013 at 18:16.
Pushed by gopalakrishnabhat into branch 'calligra/2.6'.

Improved undo/redo of lists.

CCBUG: 312318
(cherry picked from commit 42a679e5c9f7b9bb250c722fcb5f2b0d7fc69f73)

M  +4    -1    plugins/textshape/dialogs/ParagraphSettingsDialog.cpp

http://commits.kde.org/calligra/e8c0f9e3f9069bfe07d3ed7ea14a4cfa598c1bda

diff --git a/plugins/textshape/dialogs/ParagraphSettingsDialog.cpp \
b/plugins/textshape/dialogs/ParagraphSettingsDialog.cpp index e6b66e6..4bd7a2c 100644
--- a/plugins/textshape/dialogs/ParagraphSettingsDialog.cpp
+++ b/plugins/textshape/dialogs/ParagraphSettingsDialog.cpp
@@ -89,6 +89,9 @@ void ParagraphSettingsDialog::slotApply()
     chosenStyle.applyStyle(format);
 
     m_editor->mergeAutoStyle(cformat, format);
+
+    m_editor->endEditBlock();
+
     if (chosenStyle.listStyle()) {
         KoTextEditor::ChangeListFlags flags(KoTextEditor::AutoListStyle | \
                KoTextEditor::DontUnsetIfSame);
         m_tool->textEditor()->setListProperties(chosenStyle.listStyle()->levelProperties(chosenStyle.listStyle()->listLevels().first()),
 @@ -99,7 +102,7 @@ void ParagraphSettingsDialog::slotApply()
             list->remove(m_editor->block());
         }
     }
-    m_editor->endEditBlock();
+
     m_styleChanged = false;
 }
 


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