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

1 files changed, 52 insertions, 24 deletions

diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index 3c98492733a0..cfab932a8660 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -28,43 +28,71 @@ class SwTxtNode;
 
 class SwTxtFld : public SwTxtAttr
 {
-    mutable   OUString m_aExpand;
+    mutable OUString m_aExpand; // only used to determine, if field content is changing in <ExpandTxtFld()>
     SwTxtNode * m_pTxtNode;
 
 public:
-    SwTxtFld(SwFmtFld & rAttr, sal_Int32 const nStart,
-            bool const bInClipboard);
+    SwTxtFld(
+        SwFmtFld & rAttr,
+        sal_Int32 const nStart,
+        bool const bInClipboard );
+
     virtual ~SwTxtFld();
 
-    void CopyFld( SwTxtFld *pDest ) const;
-    void Expand() const;
-    inline void ExpandAlways();
+    void CopyTxtFld( SwTxtFld *pDest ) const;
+
+    void ExpandTxtFld() const;
+    void ExpandAlways()
+    {
+        m_aExpand += " "; // changing current value to assure that <ExpandTxtFld()> changes the value.
+        ExpandTxtFld();
+    }
 
     // get and set TxtNode pointer
-    SwTxtNode* GetpTxtNode() const { return m_pTxtNode; }
-    inline SwTxtNode& GetTxtNode() const;
-    void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
-    // enable notification that field content has changed and needs reformatting
-    void NotifyContentChange(SwFmtFld& rFmtFld);
+    SwTxtNode* GetpTxtNode() const
+    {
+        return m_pTxtNode;
+    }
+    SwTxtNode& GetTxtNode() const
+    {
+        OSL_ENSURE( m_pTxtNode, "SwTxtFld:: where is my TxtNode?" );
+        return *m_pTxtNode;
+    }
+    void ChgTxtNode( SwTxtNode* pNew )
+    {
+        m_pTxtNode = pNew;
+    }
 
-    /**
-       Returns position of this field.
+    bool IsFldInDoc() const;
+
+    // enable notification that field content has changed and needs reformatting
+    virtual void NotifyContentChange( SwFmtFld& rFmtFld );
 
-       @return position of this field. Has to be deleted explicitly.
-    */
 };
 
-inline SwTxtNode& SwTxtFld::GetTxtNode() const
+class SwTxtInputFld : public SwTxtFld
 {
-    assert( m_pTxtNode );
-    return *m_pTxtNode;
-}
+public:
+    SwTxtInputFld(
+        SwFmtFld & rAttr,
+        sal_Int32 const nStart,
+        sal_Int32 const nEnd,
+        bool const bInClipboard );
 
-inline void SwTxtFld::ExpandAlways()
-{
-    m_aExpand += " ";
-    Expand();
-}
+    virtual ~SwTxtInputFld();
+
+    virtual sal_Int32* GetEnd();
+
+    virtual void NotifyContentChange( SwFmtFld& rFmtFld );
+
+    void UpdateTextNodeContent( const OUString& rNewContent );
+
+    const OUString GetFieldContent() const;
+    void UpdateFieldContent();
+
+private:
+    sal_Int32 m_nEnd;
+};
 
 #endif