diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2013-09-24 15:03:38 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-01 14:43:15 +0000 |
| commit | 0921642e7f15d3abf6a96e19529b313cf8fd1a8e (patch) | |
| tree | 8857023bab4a072be3af95a8338adc3fb9e0538a /sw/source/core/text/txtfld.cxx | |
| parent | 3b27470860cfa377dfc0cb940bba204d827434ad (diff) | |
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
Diffstat (limited to 'sw/source/core/text/txtfld.cxx')
| -rw-r--r-- | sw/source/core/text/txtfld.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx index 5c0dc843c2a7..2588d2d91905 100644 --- a/sw/source/core/text/txtfld.cxx +++ b/sw/source/core/text/txtfld.cxx @@ -75,7 +75,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, { SwExpandPortion *pRet = 0; SwFrm *pFrame = (SwFrm*)pFrm; - SwField *pFld = (SwField*)pHint->GetFld().GetFld(); + SwField *pFld = (SwField*)pHint->GetFmtFld().GetField(); const sal_Bool bName = rInf.GetOpt().IsFldName(); SwCharFmt* pChFmt = 0; @@ -88,7 +88,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, pFld->SetLanguage( GetFnt()->GetLanguage() ); // let the visual note know about its new language if (pFld->GetTyp()->Which()==RES_POSTITFLD) - const_cast<SwFmtFld*> (&pHint->GetFld())->Broadcast( SwFmtFldHint( &pHint->GetFld(), SWFMTFLD_LANGUAGE ) ); + const_cast<SwFmtFld*> (&pHint->GetFmtFld())->Broadcast( SwFmtFldHint( &pHint->GetFmtFld(), SWFMTFLD_LANGUAGE ) ); } SwViewShell *pSh = rInf.GetVsh(); |