Resolves: #i33737# enable in-place editing of Input Fields

(cherry picked from commit c2afeb1c3f11e8f420b59f3786eb8626c99ff595)

Conflicts:
sw/inc/IDocumentContentOperations.hxx
sw/inc/crsrsh.hxx
sw/inc/doc.hxx
sw/inc/editsh.hxx
sw/inc/expfld.hxx
sw/inc/fldbas.hxx
sw/inc/fmtfld.hxx
sw/inc/hintids.hxx
sw/inc/ndtxt.hxx
sw/inc/txatbase.hxx
sw/inc/txtfld.hxx
sw/inc/txtrfmrk.hxx
sw/inc/txttxmrk.hxx
sw/inc/viscrs.hxx
sw/source/core/bastyp/init.cxx
sw/source/core/crsr/crsrsh.cxx
sw/source/core/crsr/crstrvl.cxx
sw/source/core/crsr/findattr.cxx
sw/source/core/crsr/findtxt.cxx
sw/source/core/crsr/swcrsr.cxx
sw/source/core/crsr/viscrs.cxx
sw/source/core/doc/dbgoutsw.cxx
sw/source/core/doc/doc.cxx
sw/source/core/doc/docfld.cxx
sw/source/core/doc/docfmt.cxx
sw/source/core/doc/docnum.cxx
sw/source/core/doc/docredln.cxx
sw/source/core/doc/docruby.cxx
sw/source/core/doc/doctxm.cxx
sw/source/core/doc/visiturl.cxx
sw/source/core/docnode/nodes.cxx
sw/source/core/edit/edatmisc.cxx
sw/source/core/edit/edattr.cxx
sw/source/core/edit/edfld.cxx
sw/source/core/edit/edfldexp.cxx
sw/source/core/edit/editsh.cxx
sw/source/core/edit/edlingu.cxx
sw/source/core/edit/ednumber.cxx
sw/source/core/fields/expfld.cxx
sw/source/core/fields/fldbas.cxx
sw/source/core/fields/reffld.cxx
sw/source/core/frmedt/fefly1.cxx
sw/source/core/inc/docfld.hxx
sw/source/core/inc/rolbck.hxx
sw/source/core/inc/swfont.hxx
sw/source/core/layout/flycnt.cxx
sw/source/core/layout/laycache.cxx
sw/source/core/layout/trvlfrm.cxx
sw/source/core/text/atrhndl.hxx
sw/source/core/text/atrstck.cxx
sw/source/core/text/inftxt.cxx
sw/source/core/text/porfld.cxx
sw/source/core/text/porfld.hxx
sw/source/core/text/txtfld.cxx
sw/source/core/tox/tox.cxx
sw/source/core/tox/txmsrt.cxx
sw/source/core/txtnode/atrfld.cxx
sw/source/core/txtnode/ndhints.cxx
sw/source/core/txtnode/ndtxt.cxx
sw/source/core/txtnode/thints.cxx
sw/source/core/txtnode/txatbase.cxx
sw/source/core/txtnode/txatritr.cxx
sw/source/core/txtnode/txtedt.cxx
sw/source/core/undo/SwUndoField.cxx
sw/source/core/undo/rolbck.cxx
sw/source/core/undo/unsect.cxx
sw/source/core/undo/untbl.cxx
sw/source/core/unocore/unocrsrhelper.cxx
sw/source/core/unocore/unofield.cxx
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unorefmk.cxx
sw/source/core/view/vprint.cxx
sw/source/filter/ascii/ascatr.cxx
sw/source/filter/html/htmlatr.cxx
sw/source/filter/rtf/rtffly.cxx
sw/source/filter/ww1/fltshell.cxx
sw/source/filter/ww1/w1filter.cxx
sw/source/filter/ww8/wrtw8esh.cxx
sw/source/filter/ww8/wrtw8nds.cxx
sw/source/filter/ww8/ww8atr.cxx
sw/source/filter/ww8/ww8par.cxx
sw/source/filter/ww8/ww8par3.cxx
sw/source/filter/ww8/ww8par5.cxx
sw/source/ui/app/applab.cxx
sw/source/ui/docvw/edtwin.cxx
sw/source/ui/docvw/edtwin2.cxx
sw/source/ui/envelp/envfmt.cxx
sw/source/ui/fldui/fldedt.cxx
sw/source/ui/fldui/fldmgr.cxx
sw/source/ui/inc/wrtsh.hxx
sw/source/ui/lingu/hhcwrp.cxx
sw/source/ui/shells/basesh.cxx
sw/source/ui/shells/drwtxtex.cxx
sw/source/ui/shells/grfsh.cxx
sw/source/ui/shells/tabsh.cxx
sw/source/ui/shells/textfld.cxx
sw/source/ui/shells/textidx.cxx
sw/source/ui/shells/textsh.cxx
sw/source/ui/shells/textsh1.cxx
sw/source/ui/shells/txtattr.cxx
sw/source/ui/uiview/formatclipboard.cxx
sw/source/ui/uiview/view.cxx
sw/source/ui/uiview/view2.cxx
sw/source/ui/uiview/viewsrch.cxx
sw/source/ui/uiview/viewstat.cxx
sw/source/ui/uiview/viewtab.cxx
sw/source/ui/wrtsh/wrtsh1.cxx
sw/source/ui/wrtsh/wrtsh2.cxx

Change-Id: I6758d6719e1fd523797cc6ee2648ffcb47d52595

2 files changed, 15 insertions, 12 deletions

diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 44f2b15224a0..0fb5cdb057f4 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -31,6 +31,7 @@ interface BaseText
     FN_INSERT_GLOSSARY // status(final|play|record)
     [
         ExecMethod = ExecGlossary ;
+        StateMethod = GetState ;
     ]
 
     FN_TXTATR_INET // status()
@@ -133,7 +134,7 @@ interface BaseText
     SID_INSERTDOC // status(final|play|rec)
     [
         ExecMethod = Execute ;
-        StateMethod = NoState ;
+        StateMethod = GetState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     FN_INSERT_BOOKMARK // status(final|play)
@@ -237,13 +238,13 @@ interface BaseText
     FN_INSERT_BREAK // status(final|play)
     [
         ExecMethod = ExecInsert ;
-        StateMethod = NoState ;
+        StateMethod = GetState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     FN_INSERT_PAGEBREAK // status(final|play)
     [
         ExecMethod = ExecInsert ;
-        StateMethod = NoState ;
+        StateMethod = GetState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     FN_INSERT_LINEBREAK  // status(final|play)
@@ -255,19 +256,19 @@ interface BaseText
     FN_INSERT_COLUMN_BREAK // status(final|play)
     [
         ExecMethod = ExecInsert ;
-        StateMethod = NoState ;
+        StateMethod = GetState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     FN_INSERT_BREAK_DLG // status(final|play)
     [
         ExecMethod = Execute ;
-        StateMethod = NoState ;
+        StateMethod = GetState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_INSERT_AVMEDIA // status(final|play)
     [
         ExecMethod = ExecInsert;
-        StateMethod = NoState ;
+        StateMethod = StateInsert ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_INSERT_DIAGRAM // status(final|play)
@@ -330,6 +331,7 @@ interface BaseText
     FN_INSERT_HYPERLINK // status()
     [
         ExecMethod = Execute ;
+        StateMethod = GetState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_HYPERLINK_DIALOG
@@ -916,6 +918,7 @@ interface BaseText
     FN_EXPAND_GLOSSARY // status(final|play)
     [
         ExecMethod = ExecGlossary ;
+        StateMethod = GetState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     FN_POSTIT // status(final|play)
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index bd05db1accfd..54152af3a5be 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -653,12 +653,12 @@ interface BaseTextEditView
         ExecMethod = Execute ;
         StateMethod = GetState ;
     ]
-        SID_INSERT_GRAPHIC // status(final|play)
-        [
-                ExecMethod = Execute ;
-                StateMethod = NoState ;
-                DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
-        ]
+    SID_INSERT_GRAPHIC // status(final|play)
+    [
+        ExecMethod = Execute ;
+        StateMethod = GetState ;
+        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+    ]
     SID_AUTOSPELL_CHECK
     [
         ExecMethod = ExecViewOptions ;