[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - svx/source

[Tamás Zolnai]

 svx/source/svdraw/svdedxv.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a6c80dcb93a73d8d56122dab5030ed7eec17c109
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Sun Jun 18 17:03:07 2017 +0200

    tdf#107666: EDITING: No caret outside the textbox after inserting a textbox
    
    This reverts commit 44555103217df34b218787f3dc6a2634b41fe52e.
    
    Now revert the related commit, need to revisit the original bug later.
    
    Change-Id: I08f42c4e859277ab411e4be5ad065fe3cca8bbb6
    Reviewed-on: https://gerrit.libreoffice.org/38925
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index ea521d790752..f9aeb4ae1c1e 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1222,7 +1222,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
         // and now the Outliner itself
         if (!bTextEditDontDelete) delete pTEOutliner;
         else pTEOutliner->Clear();
-        if (bTextEditDontDelete && pTEWin!=nullptr) {
+        if (pTEWin!=nullptr) {
             pTEWin->SetCursor(pTECursorMerker);
         }
         maHdlList.SetMoveOutside(false);