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

List:       kde-commits
Subject:    [calligra] /: Merge remote-tracking branch 'remotes/origin/moji'
From:       C. Boemann <cbo () boemann ! dk>
Date:       2011-12-25 20:57:57
Message-ID: 20111225205757.8BC42A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 71b352027000cc19efa54ea0ba94e04c87717223 by C. Boemann.
Committed on 25/12/2011 at 21:57.
Pushed by boemann into branch 'master'.

Merge remote-tracking branch 'remotes/origin/moji'

M  +1    -3    libs/kotext/KoTextEditor.cpp
M  +21   -0    plugins/textshape/TextTool.cpp
M  +6    -1    plugins/textshape/TextTool.h
M  +1    -1    plugins/textshape/dialogs/SimpleParagraphWidget.ui

http://commits.kde.org/calligra/71b352027000cc19efa54ea0ba94e04c87717223

diff --cc plugins/textshape/TextTool.h
index 4d5e2ed,3dafaa4..57cd768
--- a/plugins/textshape/TextTool.h
+++ b/plugins/textshape/TextTool.h
@@@ -359,10 -364,7 +365,9 @@@ private
      int m_changeTipCursorPos;
      QPoint m_changeTipPos;
      bool m_delayedEnsureVisible;
- =

      TextToolSelection *m_toolSelection;
 +
 +    mutable QRectF m_lastImMicroFocus;
  };
  =

  #endif
[prev in list] [next in list] [prev in thread] [next in thread]