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/ui/docvw | |
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/ui/docvw')
-rw-r--r-- | sw/source/ui/docvw/AnnotationWin.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/docvw/PostItMgr.cxx | 6 |
2 files changed, 8 insertions, 8 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; |