[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/source

[Michael Stahl]

 sw/source/uibase/fldui/fldmgr.cxx |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 03d46490d753bdeaaa7685c9bb01c75e090cb939
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue May 3 11:39:37 2016 +0200

    tdf#99529 sw: don't pop up input field dialog before inserting field
    
    The dialog calls SwEditShell::UpdateFields(), so if there is already
    a existing field at the current cursor position it will be "updated"
    before the new field is inserted.
    
    Change-Id: I8ddbbe00534950759781a1ce8d0dca0376663462
    (cherry picked from commit 39d719a80d8c87856c84e3ecd569d45fa6f8a30e)
    Reviewed-on: https://gerrit.libreoffice.org/24613
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index 1386ba2..0825bbc 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -1192,9 +1192,6 @@ bool SwFieldMgr::InsertField(
                     new SwInputField( pTyp, rData.m_sPar1, rData.m_sPar2, nSubType|nsSwExtendedSubType::SUB_INVISIBLE, nFormatId);
                 pField = pInpField;
             }
-
-            // start dialog
-            pCurShell->StartInputFieldDlg(pField, false, rData.m_pParent);
             break;
         }
 
@@ -1336,6 +1333,14 @@ bool SwFieldMgr::InsertField(
 
     pCurShell->Insert( *pField );
 
+    if (TYP_INPUTFLD == rData.m_nTypeId)
+    {
+        // start dialog, not before the field is inserted tdf#99529
+        pCurShell->Left(CRSR_SKIP_CHARS,
+                false, (INP_VAR == (nSubType & 0xff)) ? 1 : 2, false );
+        pCurShell->StartInputFieldDlg(pField, false, rData.m_pParent);
+    }
+
     if(bExp && bEvalExp)
         pCurShell->UpdateExpFields(true);