Related: #i33737# some minor refactoring in advance

(cherry picked from commit b27ff0a078b7c1b32e88041f25314eaad267618b)

Conflicts:
sw/source/core/bastyp/init.cxx
sw/source/core/crsr/findtxt.cxx
sw/source/core/doc/doc.cxx
sw/source/core/doc/docfld.cxx
sw/source/core/edit/edfld.cxx
sw/source/core/fields/authfld.cxx
sw/source/core/fields/dbfld.cxx
sw/source/core/fields/docufld.cxx
sw/source/core/fields/expfld.cxx
sw/source/core/fields/fldlst.cxx
sw/source/core/fields/reffld.cxx
sw/source/core/frmedt/tblsel.cxx
sw/source/core/inc/wrong.hxx
sw/source/core/layout/atrfrm.cxx
sw/source/core/text/EnhancedPDFExportHelper.cxx
sw/source/core/text/atrstck.cxx
sw/source/core/text/itratr.cxx
sw/source/core/tox/txmsrt.cxx
sw/source/core/txtnode/atrfld.cxx
sw/source/core/txtnode/ndtxt.cxx
sw/source/core/txtnode/thints.cxx
sw/source/core/undo/SwUndoField.cxx
sw/source/core/undo/rolbck.cxx
sw/source/core/unocore/unocrsrhelper.cxx
sw/source/core/unocore/unofield.cxx
sw/source/core/unocore/unoportenum.cxx
sw/source/core/unocore/unotext.cxx
sw/source/filter/rtf/rtffld.cxx
sw/source/filter/ww8/ww8atr.cxx
sw/source/filter/ww8/ww8par.cxx
sw/source/ui/docvw/AnnotationWin.cxx
sw/source/ui/utlui/content.cxx

Change-Id: I372cfaed881188266c359867879ae92c8d45fee1

5 files changed, 12 insertions, 12 deletions

diff --git a/sw/source/ui/docvw/AnnotationWin.cxx b/sw/source/ui/docvw/AnnotationWin.cxx
index 2b471485c8f5..2e482cbfa2ca 100644
--- a/sw/source/ui/docvw/AnnotationWin.cxx
+++ b/sw/source/ui/docvw/AnnotationWin.cxx
@@ -65,7 +65,7 @@ SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin,
                                   SwFmtFld* aField )
     : SwSidebarWin( rEditWin, nBits, aMgr, aBits, rSidebarItem )
     , mpFmtFld(aField)
-    , mpFld( static_cast<SwPostItField*>(aField->GetFld()))
+    , mpFld( static_cast<SwPostItField*>(aField->GetField()))
     , mpButtonPopup(0)
 {
 }
@@ -84,7 +84,7 @@ void SwAnnotationWin::SetPostItText()
 
     //If the new text is the same as the old text, keep the same insertion
     //point .e.g. fdo#33599
-    mpFld = static_cast<SwPostItField*>(mpFmtFld->GetFld());
+    mpFld = static_cast<SwPostItField*>(mpFmtFld->GetField());
     OUString sNewText = mpFld->GetPar2();
     bool bTextUnchanged = sNewText.equals(Engine()->GetEditEngine().GetText());
     ESelection aOrigSelection(GetOutlinerView()->GetEditView().GetSelection());
@@ -174,7 +174,7 @@ bool SwAnnotationWin::CalcFollow()
     aPosition.nContent = *pTxtFld->GetStart();
     SwTxtAttr * const pTxtAttr = pTxtFld->GetTxtNode().GetTxtAttrForCharAt(
                     aPosition.nContent.GetIndex() - 1, RES_TXTATR_FIELD );
-    const SwField* pFld = pTxtAttr ? pTxtAttr->GetFld().GetFld() : 0;
+    const SwField* pFld = pTxtAttr ? pTxtAttr->GetFmtFld().GetField() : 0;
     return pFld && (pFld->Which()== RES_POSTITFLD);
 }
 
@@ -190,7 +190,7 @@ sal_uInt32 SwAnnotationWin::CountFollowing()
                                         aPosition.nContent.GetIndex() + 1,
                                         RES_TXTATR_FIELD );
     SwField* pFld = pTxtAttr
-                    ? const_cast<SwField*>(pTxtAttr->GetFld().GetFld())
+                    ? const_cast<SwField*>(pTxtAttr->GetFmtFld().GetField())
                     : 0;
     while ( pFld && ( pFld->Which()== RES_POSTITFLD ) )
     {
@@ -199,7 +199,7 @@ sal_uInt32 SwAnnotationWin::CountFollowing()
                                         aPosition.nContent.GetIndex() + aCount,
                                         RES_TXTATR_FIELD );
         pFld = pTxtAttr
-               ? const_cast<SwField*>(pTxtAttr->GetFld().GetFld())
+               ? const_cast<SwField*>(pTxtAttr->GetFmtFld().GetField())
                : 0;
     }
     return aCount - 1;
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index 9ee999d5f63d..8ca06e75c3ab 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -378,7 +378,7 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                     {
                         if ((*i)->pPostIt)
                         {
-                            sal_uInt16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( (*i)->GetFmtFld()->GetFld()->GetLanguage() );
+                            sal_uInt16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( (*i)->GetFmtFld()->GetField()->GetLanguage() );
                             sal_uInt16 nLangWhichId = 0;
                             switch (nScriptType)
                             {
@@ -386,7 +386,7 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                                 case SCRIPTTYPE_ASIAN :    nLangWhichId = EE_CHAR_LANGUAGE_CJK; break;
                                 case SCRIPTTYPE_COMPLEX :  nLangWhichId = EE_CHAR_LANGUAGE_CTL; break;
                             }
-                            (*i)->pPostIt->SetLanguage( SvxLanguageItem((*i)->GetFmtFld()->GetFld()->GetLanguage(),
+                            (*i)->pPostIt->SetLanguage( SvxLanguageItem((*i)->GetFmtFld()->GetField()->GetLanguage(),
                                                         nLangWhichId) );
                         }
                         break;
@@ -1271,7 +1271,7 @@ sw::annotation::SwAnnotationWin* SwPostItMgr::GetAnnotationWin(const SwPostItFie
 {
     for(const_iterator i = mvPostItFlds.begin(); i != mvPostItFlds.end() ; ++i)
     {
-        if ( (*i)->GetFmtFld() && ((*i)->GetFmtFld()->GetFld() == pFld))
+        if ( (*i)->GetFmtFld() && ((*i)->GetFmtFld()->GetField() == pFld))
             return dynamic_cast<sw::annotation::SwAnnotationWin*>((*i)->pPostIt);
     }
     return NULL;
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index fe07e87f1c5b..559255bb3bc5 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -226,7 +226,7 @@ sal_Bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUS
 
                 for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
                 {
-                    if( pFmtFld->GetFld() == m_pCurFld)
+                    if( pFmtFld->GetField() == m_pCurFld)
                     {
                         pFmtFld->RegisterToFieldType(*pTyp);
                         pTmpFld->ChgTyp(pTyp);
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 66b1f20a60d4..5e562ed73dd0 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -372,7 +372,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                     SwFmtFld* pSwFmtFld = aIter.First();
                     while( pSwFmtFld )
                     {
-                        if ( pSwFmtFld->GetFld() == pPostIt )
+                        if ( pSwFmtFld->GetField() == pPostIt )
                         {
                             pSwFmtFld->Broadcast( SwFmtFldHint( 0, SWFMTFLD_FOCUS, &GetView() ) );
                             break;
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 25d693013409..20fb60fd832b 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -392,7 +392,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
                         if (aFmtFld->GetTxtFld() && aFmtFld->IsFldInDoc() &&
                             (*i)->mLayoutStatus!=SwPostItHelper::INVISIBLE )
                         {
-                            OUString sEntry = aFmtFld->GetFld()->GetPar2();
+                            OUString sEntry = aFmtFld->GetField()->GetPar2();
                             sEntry = RemoveNewline(sEntry);
                             SwPostItContent* pCnt = new SwPostItContent(
                                                 this,
@@ -718,7 +718,7 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged)
                         if (aFmtFld->GetTxtFld() && aFmtFld->IsFldInDoc() &&
                             (*i)->mLayoutStatus!=SwPostItHelper::INVISIBLE )
                         {
-                            OUString sEntry = aFmtFld->GetFld()->GetPar2();
+                            OUString sEntry = aFmtFld->GetField()->GetPar2();
                             sEntry = RemoveNewline(sEntry);
                             SwPostItContent* pCnt = new SwPostItContent(
                                                 this,