[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/inc sw/source
Oliver-Rainer Wittmann
orw at apache.org
Tue Sep 24 09:08:38 PDT 2013
sw/inc/fmtfld.hxx | 10 ++-
sw/inc/txatbase.hxx | 4 -
sw/source/core/bastyp/init.cxx | 14 +---
sw/source/core/crsr/crstrvl.cxx | 8 +-
sw/source/core/crsr/findtxt.cxx | 42 +++++++------
sw/source/core/doc/doc.cxx | 26 ++++----
sw/source/core/doc/docfld.cxx | 68 +++++++++------------
sw/source/core/docnode/nodes.cxx | 9 ++
sw/source/core/edit/edattr.cxx | 2
sw/source/core/edit/edfld.cxx | 8 +-
sw/source/core/edit/edfldexp.cxx | 10 +--
sw/source/core/fields/authfld.cxx | 4 -
sw/source/core/fields/cellfml.cxx | 2
sw/source/core/fields/dbfld.cxx | 22 +++---
sw/source/core/fields/docufld.cxx | 14 ++--
sw/source/core/fields/expfld.cxx | 12 +--
sw/source/core/fields/fldlst.cxx | 16 ++--
sw/source/core/fields/reffld.cxx | 30 ++++-----
sw/source/core/fields/tblcalc.cxx | 2
sw/source/core/frmedt/fefly1.cxx | 2
sw/source/core/frmedt/tblsel.cxx | 3
sw/source/core/inc/docfld.hxx | 2
sw/source/core/inc/wrong.hxx | 8 +-
sw/source/core/layout/atrfrm.cxx | 35 +++++-----
sw/source/core/table/swtable.cxx | 2
sw/source/core/text/EnhancedPDFExportHelper.cxx | 7 --
sw/source/core/text/atrstck.cxx | 24 +++----
sw/source/core/text/itratr.cxx | 4 -
sw/source/core/text/txtfld.cxx | 4 -
sw/source/core/tox/txmsrt.cxx | 17 ++---
sw/source/core/txtnode/atrfld.cxx | 77 ++++++++++++------------
sw/source/core/txtnode/ndtxt.cxx | 25 +++----
sw/source/core/txtnode/thints.cxx | 29 ++++-----
sw/source/core/undo/SwUndoField.cxx | 8 +-
sw/source/core/undo/rolbck.cxx | 12 +--
sw/source/core/unocore/unocrsrhelper.cxx | 4 -
sw/source/core/unocore/unofield.cxx | 14 ++--
sw/source/core/unocore/unoportenum.cxx | 2
sw/source/core/unocore/unotext.cxx | 2
sw/source/core/view/vprint.cxx | 9 +-
sw/source/filter/ascii/ascatr.cxx | 4 -
sw/source/filter/html/htmlatr.cxx | 2
sw/source/filter/html/htmlfld.cxx | 3
sw/source/filter/html/htmlfldw.cxx | 2
sw/source/filter/html/swhtml.cxx | 5 -
sw/source/filter/html/wrthtml.cxx | 4 -
sw/source/filter/rtf/rtffld.cxx | 2
sw/source/filter/ww8/ww8atr.cxx | 10 +--
sw/source/filter/ww8/ww8par.cxx | 4 -
sw/source/ui/docvw/AnnotationWin.cxx | 10 +--
sw/source/ui/docvw/PostItMgr.cxx | 6 -
sw/source/ui/fldui/fldpage.cxx | 2
sw/source/ui/shells/textfld.cxx | 2
sw/source/ui/utlui/content.cxx | 23 -------
54 files changed, 329 insertions(+), 343 deletions(-)
New commits:
commit b27ff0a078b7c1b32e88041f25314eaad267618b
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Tue Sep 24 15:03:38 2013 +0000
33737: - some minor refactoring in advance
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 19c0d08..3986517 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -72,8 +72,14 @@ public:
virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const;
- const SwField *GetFld() const { return pField; }
- SwField *GetFld() { return pField; }
+ const SwField* GetField() const
+ {
+ return pField;
+ }
+ SwField* GetField()
+ {
+ return pField;
+ }
// #111840#
/**
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index 685face..1213fdf 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -108,7 +108,7 @@ public:
inline const SwFmtCharFmt &GetCharFmt() const;
inline const SwFmtAutoFmt &GetAutoFmt() const;
- inline const SwFmtFld &GetFld() const;
+ inline const SwFmtFld &GetFmtFld() const;
inline const SwFmtFtn &GetFtn() const;
inline const SwFmtFlyCnt &GetFlyCnt() const;
inline const SwTOXMark &GetTOXMark() const;
@@ -181,7 +181,7 @@ inline const SwFmtAutoFmt& SwTxtAttr::GetAutoFmt() const
return (const SwFmtAutoFmt&)(*m_pAttr);
}
-inline const SwFmtFld& SwTxtAttr::GetFld() const
+inline const SwFmtFld& SwTxtAttr::GetFmtFld() const
{
ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_FIELD,
"Wrong attribute" );
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 61e9f82..6a5d2e4 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -334,10 +334,7 @@ SfxItemInfo __FAR_DATA aSlotTab[] =
{ SID_ATTR_PARA_HYPHENZONE, SFX_ITEM_POOLABLE }, // RES_PARATR_HYPHENZONE
{ FN_FORMAT_DROPCAPS, 0 }, // RES_PARATR_DROP
{ SID_ATTR_PARA_REGISTER, SFX_ITEM_POOLABLE }, // RES_PARATR_REGISTER
- // --> OD 2008-03-04 #refactorlists#
- // RES_PARATR_NUMRULE is now poolable
{ SID_ATTR_PARA_NUMRULE, SFX_ITEM_POOLABLE }, // RES_PARATR_NUMRULE
- // <--
{ SID_ATTR_PARA_SCRIPTSPACE, SFX_ITEM_POOLABLE }, // RES_PARATR_SCRIPTSPACE
{ SID_ATTR_PARA_HANGPUNCTUATION, SFX_ITEM_POOLABLE },// RES_PARATR_HANGINGPUNCTUATION
@@ -348,13 +345,11 @@ SfxItemInfo __FAR_DATA aSlotTab[] =
{ SID_ATTR_PARA_OUTLINE_LEVEL, SFX_ITEM_POOLABLE }, // RES_PARATR_OUTLINELEVEL //#outline level,zhaojianwei
- // --> OD 2008-02-19 #refactorlists#
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_ID
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_LEVEL
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_ISRESTART
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_RESTARTVALUE
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_ISCOUNTED
- // <--
{ 0, SFX_ITEM_POOLABLE }, // RES_FILL_ORDER
{ 0, SFX_ITEM_POOLABLE }, // RES_FRM_SIZE
@@ -524,15 +519,15 @@ void _InitCore()
aAttrTab[ RES_CHRATR_DUMMY2 - POOLATTR_BEGIN ] = new SfxBoolItem( RES_CHRATR_DUMMY2 );
// CharakterAttr - Dummies
- aAttrTab[ RES_TXTATR_AUTOFMT- POOLATTR_BEGIN ] = new SwFmtAutoFmt;
- aAttrTab[ RES_TXTATR_INETFMT - POOLATTR_BEGIN ] = new SwFmtINetFmt( aEmptyStr, aEmptyStr );
aAttrTab[ RES_TXTATR_REFMARK - POOLATTR_BEGIN ] = new SwFmtRefMark( aEmptyStr );
aAttrTab[ RES_TXTATR_TOXMARK - POOLATTR_BEGIN ] = new SwTOXMark;
+ aAttrTab[ RES_TXTATR_META - POOLATTR_BEGIN ] = SwFmtMeta::CreatePoolDefault(RES_TXTATR_META);
+ aAttrTab[ RES_TXTATR_METAFIELD - POOLATTR_BEGIN ] = SwFmtMeta::CreatePoolDefault(RES_TXTATR_METAFIELD);
+ aAttrTab[ RES_TXTATR_AUTOFMT- POOLATTR_BEGIN ] = new SwFmtAutoFmt;
+ aAttrTab[ RES_TXTATR_INETFMT - POOLATTR_BEGIN ] = new SwFmtINetFmt( aEmptyStr, aEmptyStr );
aAttrTab[ RES_TXTATR_CHARFMT- POOLATTR_BEGIN ] = new SwFmtCharFmt( 0 );
aAttrTab[ RES_TXTATR_CJK_RUBY - POOLATTR_BEGIN ] = new SwFmtRuby( aEmptyStr );
aAttrTab[ RES_TXTATR_UNKNOWN_CONTAINER - POOLATTR_BEGIN ] = new SvXMLAttrContainerItem( RES_TXTATR_UNKNOWN_CONTAINER );
- aAttrTab[ RES_TXTATR_META - POOLATTR_BEGIN ] = SwFmtMeta::CreatePoolDefault(RES_TXTATR_META);
- aAttrTab[ RES_TXTATR_METAFIELD - POOLATTR_BEGIN ] = SwFmtMeta::CreatePoolDefault(RES_TXTATR_METAFIELD);
aAttrTab[ RES_TXTATR_FIELD- POOLATTR_BEGIN ] = new SwFmtFld;
aAttrTab[ RES_TXTATR_FLYCNT - POOLATTR_BEGIN ] = new SwFmtFlyCnt( 0 );
@@ -545,6 +540,7 @@ void _InitCore()
aAttrTab[ RES_TXTATR_DUMMY2 - POOLATTR_BEGIN ] = new SfxBoolItem( RES_TXTATR_DUMMY2 );
aAttrTab[ RES_TXTATR_DUMMY5 - POOLATTR_BEGIN ] = new SfxBoolItem( RES_TXTATR_DUMMY5 );
// TextAttr - Dummies
+
aAttrTab[ RES_CHRATR_BIDIRTL - POOLATTR_BEGIN ] = new SfxInt16Item( RES_CHRATR_BIDIRTL, sal_Int16(-1) );
aAttrTab[ RES_CHRATR_IDCTHINT - POOLATTR_BEGIN ] = new SfxInt16Item( RES_CHRATR_IDCTHINT, sal_Int16(-1) );
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 18f534d..6c32e55 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -629,9 +629,9 @@ void lcl_MakeFldLst( _SetGetExpFlds& rLst, const SwFieldType& rFldType,
bool bSubType = nSubType != USHRT_MAX;
for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
if( 0 != ( pTxtFld = pFmtFld->GetTxtFld() ) &&
- ( !bChkInpFlag || ((SwSetExpField*)pTxtFld->GetFld().GetFld())
+ ( !bChkInpFlag || ((SwSetExpField*)pTxtFld->GetFmtFld().GetField())
->GetInputFlag() ) &&
- (!bSubType || (pFmtFld->GetFld()->GetSubType()
+ (!bSubType || (pFmtFld->GetField()->GetSubType()
& 0xff ) == nSubType ))
{
SwCntntFrm* pCFrm;
@@ -1118,7 +1118,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
pTxtAttr = pTxtNd->GetTxtAttrForCharAt(
aPos.nContent.GetIndex(), RES_TXTATR_FIELD );
const SwField* pFld = pTxtAttr
- ? pTxtAttr->GetFld().GetFld()
+ ? pTxtAttr->GetFmtFld().GetField()
: 0;
if( SwContentAtPos::SW_CLICKFIELD & rCntntAtPos.eCntntAtPos &&
pFld && !pFld->HasClickHdl() )
@@ -1544,7 +1544,7 @@ const SwPostItField* SwCrsrShell::GetPostItFieldAtCursor() const
{
SwTxtAttr* pTxtAttr = pTxtNd->GetTxtAttrForCharAt(
pCursorPos->nContent.GetIndex(), RES_TXTATR_FIELD );
- const SwField* pFld = pTxtAttr ? pTxtAttr->GetFld().GetFld() : 0;
+ const SwField* pFld = pTxtAttr ? pTxtAttr->GetFmtFld().GetField() : 0;
if ( pFld && pFld->Which()== RES_POSTITFLD )
{
pPostItFld = static_cast<const SwPostItField*>(pFld);
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 4a2d671..74cca26 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -57,9 +57,13 @@ using namespace util;
String *ReplaceBackReferences( const SearchOptions& rSearchOpt, SwPaM* pPam );
-String& lcl_CleanStr( const SwTxtNode& rNd, xub_StrLen nStart,
- xub_StrLen& rEnde, SvULongs& rArr, String& rRet,
- bool bRemoveSoftHyphen )
+String& lcl_CleanStr(
+ const SwTxtNode& rNd,
+ xub_StrLen nStart,
+ xub_StrLen& rEnde,
+ SvULongs& rArr,
+ String& rRet,
+ const bool bRemoveSoftHyphen )
{
rRet = rNd.GetTxt();
if( rArr.Count() )
@@ -122,13 +126,13 @@ String& lcl_CleanStr( const SwTxtNode& rNd, xub_StrLen nStart,
if ( pHt->HasDummyChar() && (nStt >= nStart) )
{
//JP 17.05.00: Task 75806 ask for ">=" and not for ">"
- switch( pHt->Which() )
+ switch( pHt->Which() )
{
case RES_TXTATR_FLYCNT:
case RES_TXTATR_FTN:
- case RES_TXTATR_FIELD:
+ case RES_TXTATR_FIELD:
case RES_TXTATR_REFMARK:
- case RES_TXTATR_TOXMARK:
+ case RES_TXTATR_TOXMARK:
case RES_TXTATR_META:
case RES_TXTATR_METAFIELD:
{
@@ -140,24 +144,24 @@ String& lcl_CleanStr( const SwTxtNode& rNd, xub_StrLen nStart,
// wir sie einfach.
// Fuer das Ende merken wir uns die Ersetzungen und entferenen
// hinterher alle am Stringende (koenten ja 'normale' 0x7f drinstehen
- sal_Bool bEmpty = RES_TXTATR_FIELD != pHt->Which() ||
+ sal_Bool bEmpty = RES_TXTATR_FIELD != pHt->Which() ||
!(static_cast<SwTxtFld const*>(pHt)
- ->GetFld().GetFld()->ExpandField(true).Len());
+ ->GetFmtFld().GetField()->ExpandField(true).Len());
if ( bEmpty && nStart == nAkt )
- {
+ {
rArr.Insert( nAkt, rArr.Count() );
--rEnde;
rRet.Erase( nAkt, 1 );
- }
+ }
else
- {
+ {
if ( bEmpty )
aReplaced.Insert( nAkt, aReplaced.Count() );
rRet.SetChar( nAkt, '\x7f' );
- }
- }
- break;
- default:
+ }
+ }
+ break;
+ default:
ASSERT( false, "unknown case in lcl_CleanStr" )
break;
}
@@ -200,7 +204,7 @@ xub_StrLen GetPostIt(xub_StrLen aCount,const SwpHints *pHts)
aIndex++;
const SwTxtAttr* pTxtAttr = (*pHts)[i];
if ( (pTxtAttr->Which()==RES_TXTATR_FIELD) &&
- (pTxtAttr->GetFld().GetFld()->Which()==RES_POSTITFLD))
+ (pTxtAttr->GetFmtFld().GetField()->Which()==RES_POSTITFLD))
{
aCount--;
if (!aCount)
@@ -213,7 +217,7 @@ xub_StrLen GetPostIt(xub_StrLen aCount,const SwpHints *pHts)
{
const SwTxtAttr* pTxtAttr = (*pHts)[i];
if ( (pTxtAttr->Which()==RES_TXTATR_FIELD) &&
- (pTxtAttr->GetFld().GetFld()->Which()==RES_POSTITFLD))
+ (pTxtAttr->GetFmtFld().GetField()->Which()==RES_POSTITFLD))
break;
else
aIndex++;
@@ -308,7 +312,7 @@ sal_uInt8 SwPaM::Find( const SearchOptions& rSearchOpt, sal_Bool bSearchInNotes
xub_StrLen aPos = *(*pHts)[i]->GetStart();
const SwTxtAttr* pTxtAttr = (*pHts)[i];
if ( (pTxtAttr->Which()==RES_TXTATR_FIELD) &&
- (pTxtAttr->GetFld().GetFld()->Which()==RES_POSTITFLD))
+ (pTxtAttr->GetFmtFld().GetField()->Which()==RES_POSTITFLD))
{
if ( (aPos >= nStart) && (aPos <= nEnde) )
aNumberPostits++;
@@ -391,7 +395,7 @@ sal_uInt8 SwPaM::Find( const SearchOptions& rSearchOpt, sal_Bool bSearchInNotes
if ( (bSrchForward && (GetPostIt(aLoop + aIgnore,pHts) < pHts->Count()) ) || ( !bSrchForward && (aLoop!=0) ))
{
const SwTxtAttr* pTxtAttr = bSrchForward ? (*pHts)[GetPostIt(aLoop+aIgnore,pHts)] : (*pHts)[GetPostIt(aLoop+aIgnore-1,pHts)];
- if ( pPostItMgr && pPostItMgr->SearchReplace(((SwTxtFld*)pTxtAttr)->GetFld(),rSearchOpt,bSrchForward) )
+ if ( pPostItMgr && pPostItMgr->SearchReplace(((SwTxtFld*)pTxtAttr)->GetFmtFld(),rSearchOpt,bSrchForward) )
{
bFound = true ;
break;
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 35c8891..1fa3321 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1082,7 +1082,7 @@ struct _PostItFld : public _SetGetExpFld
SwPostItField* GetPostIt() const
{
- return (SwPostItField*) GetFld()->GetFld().GetFld();
+ return (SwPostItField*) GetTxtFld()->GetFmtFld().GetField();
}
};
@@ -1100,7 +1100,7 @@ sal_uInt16 _PostItFld::GetPageNo(
//Bereichs ermittelt werden.
rVirtPgNo = 0;
sal_uInt16 nPos = GetCntnt();
- SwIterator<SwTxtFrm,SwTxtNode> aIter( GetFld()->GetTxtNode() );
+ SwIterator<SwTxtFrm,SwTxtNode> aIter( GetTxtFld()->GetTxtNode() );
for( SwTxtFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
{
if( pFrm->GetOfst() > nPos ||
@@ -1232,7 +1232,7 @@ void SwDoc::CalculatePagesForPrinting(
bool bIsPDFExport,
sal_Int32 nDocPageCount )
{
- const sal_Int32 nContent = rOptions.getIntValue( "PrintContent", 0 );
+ const sal_Int64 nContent = rOptions.getIntValue( "PrintContent", 0 );
const bool bPrintSelection = nContent == 2;
// properties to take into account when calcualting the set of pages
@@ -1593,7 +1593,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
// 0 -> print all pages (default if aPageRange is empty)
// 1 -> print range according to PageRange
// 2 -> print selection
- const sal_Int32 nContent = rOptions.getIntValue( "PrintContent", 0 );
+ const sal_Int64 nContent = rOptions.getIntValue( "PrintContent", 0 );
if (0 == nContent)
{
// set page range to print to 'all pages'
@@ -1666,7 +1666,9 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
// dann sorge mal dafuer, das alle Seiten in der richtigen
// Reihenfolge stehen:
- sal_uInt16 nSPg = 0, nEPg = aVec.size(), nStep = 1;
+ sal_uInt16 nSPg = 0;
+ sal_uInt32 nEPg = aVec.size();
+ sal_uInt16 nStep = 1;
if ( 0 == (nEPg & 1 )) // ungerade gibt es nicht!
--nEPg;
@@ -1754,7 +1756,7 @@ void SwDoc::UpdateDocStat( SwDocStat& rStat )
if (pFmtFld->IsFldInDoc())
{
SwPostItField const * const pField(
- static_cast<SwPostItField const*>(pFmtFld->GetFld()));
+ static_cast<SwPostItField const*>(pFmtFld->GetField()));
rStat.nAllPara += pField->GetNumberOfParagraphs();
}
}
@@ -1870,8 +1872,8 @@ sal_uInt16 SwDoc::GetRefMarks( SvStringsDtor* pNames ) const
const SfxPoolItem* pItem;
const SwTxtRefMark* pTxtRef;
- sal_uInt32 nMaxItems = GetAttrPool().GetItemCount2( RES_TXTATR_REFMARK );
- sal_uInt32 nCount = 0;
+ const sal_uInt32 nMaxItems = GetAttrPool().GetItemCount2( RES_TXTATR_REFMARK );
+ sal_uInt16 nCount = 0;
for( sal_uInt32 n = 0; n < nMaxItems; ++n )
if( 0 != (pItem = GetAttrPool().GetItem2( RES_TXTATR_REFMARK, n )) &&
0 != (pTxtRef = ((SwFmtRefMark*)pItem)->GetTxtRefMark()) &&
@@ -1882,7 +1884,7 @@ sal_uInt16 SwDoc::GetRefMarks( SvStringsDtor* pNames ) const
String* pTmp = new String( ((SwFmtRefMark*)pItem)->GetRefName() );
pNames->Insert( pTmp, nCount );
}
- nCount ++;
+ ++nCount;
}
return nCount;
@@ -2463,8 +2465,8 @@ sal_Bool SwDoc::ConvertFieldsToText()
if (!bSkip)
{
sal_Bool bInHeaderFooter = IsInHeaderFooter(SwNodeIndex(*pTxtFld->GetpTxtNode()));
- const SwFmtFld& rFmtFld = pTxtFld->GetFld();
- const SwField* pField = rFmtFld.GetFld();
+ const SwFmtFld& rFmtFld = pTxtFld->GetFmtFld();
+ const SwField* pField = rFmtFld.GetField();
//#i55595# some fields have to be excluded in headers/footers
sal_uInt16 nWhich = pField->GetTyp()->Which();
@@ -2696,7 +2698,7 @@ SwField * SwDoc::GetField(const SwPosition & rPos)
{
SwTxtFld * const pAttr = GetTxtFld(rPos);
- return (pAttr) ? const_cast<SwField *>( pAttr->GetFld().GetFld() ) : 0;
+ return (pAttr) ? const_cast<SwField *>( pAttr->GetFmtFld().GetField() ) : 0;
}
SwTxtFld * SwDoc::GetTxtFld(const SwPosition & rPos)
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 1fe8179..4eeb04a 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -446,7 +446,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
{
if( pFmtFld->GetTxtFld() )
{
- SwTblField* pFld = (SwTblField*)pFmtFld->GetFld();
+ SwTblField* pFld = (SwTblField*)pFmtFld->GetField();
if( pUpdtFld )
{
@@ -532,7 +532,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
// mba: do we really need this "optimization"? Is it still valid?
SwTblField* pFld;
if( !pFmtFld->GetTxtFld() || (nsSwExtendedSubType::SUB_CMD &
- (pFld = (SwTblField*)pFmtFld->GetFld())->GetSubType() ))
+ (pFld = (SwTblField*)pFmtFld->GetField())->GetSubType() ))
continue;
// muss neu berechnet werden (und ist keine textuelle Anzeige)
@@ -1070,11 +1070,11 @@ String lcl_GetDBVarName( SwDoc& rDoc, SwDBNameInfField& rDBFld )
void lcl_CalcFld( SwDoc& rDoc, SwCalc& rCalc, const _SetGetExpFld& rSGEFld,
SwNewDBMgr* pMgr )
{
- const SwTxtFld* pTxtFld = rSGEFld.GetFld();
+ const SwTxtFld* pTxtFld = rSGEFld.GetTxtFld();
if( !pTxtFld )
return ;
- const SwField* pFld = pTxtFld->GetFld().GetFld();
+ const SwField* pFld = pTxtFld->GetFmtFld().GetField();
const sal_uInt16 nFldWhich = pFld->GetTyp()->Which();
if( RES_SETEXPFLD == nFldWhich )
@@ -1196,11 +1196,11 @@ void SwDoc::FldsToExpand( SwHash**& ppHashTbl, sal_uInt16& rTblSize,
const _SetGetExpFldPtr* ppSortLst = pUpdtFlds->GetSortLst()->GetData();
for( ; nLast; --nLast, ++ppSortLst )
{
- const SwTxtFld* pTxtFld = (*ppSortLst)->GetFld();
+ const SwTxtFld* pTxtFld = (*ppSortLst)->GetTxtFld();
if( !pTxtFld )
continue;
- const SwField* pFld = pTxtFld->GetFld().GetFld();
+ const SwField* pFld = pTxtFld->GetFmtFld().GetField();
switch( pFld->GetTyp()->Which() )
{
case RES_SETEXPFLD:
@@ -1341,7 +1341,6 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
{
//!SECTION
-// if( pGFld->IsInBodyTxt() )
SwSbxValue aValue = aCalc.Calculate(
pSect->GetCondition() );
if(!aValue.IsVoidValue())
@@ -1349,15 +1348,15 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
continue;
}
- SwTxtFld* pTxtFld = (SwTxtFld*)(*ppSortLst)->GetFld();
+ SwTxtFld* pTxtFld = (SwTxtFld*)(*ppSortLst)->GetTxtFld();
if( !pTxtFld )
{
ASSERT( !this, "was ist es denn nun" );
continue;
}
- SwFmtFld* pFmtFld = (SwFmtFld*)&pTxtFld->GetFld();
- SwField* pFld = pFmtFld->GetFld();
+ SwFmtFld* pFmtFld = (SwFmtFld*)&pTxtFld->GetFmtFld();
+ const SwField* pFld = pFmtFld->GetField();
switch( nWhich = pFld->GetTyp()->Which() )
{
@@ -1688,11 +1687,9 @@ const SwDBData& SwDoc::GetDBDesc()
if(pFld->IsFldInDoc())
{
if(RES_DBFLD == nWhich)
- aDBData =
- (static_cast < SwDBFieldType * > (pFld->GetFld()->GetTyp()))
- ->GetDBData();
+ aDBData = (static_cast < SwDBFieldType * > (pFld->GetField()->GetTyp()))->GetDBData();
else
- aDBData = (static_cast < SwDBNameInfField* > (pFld->GetFld()))->GetRealDBData();
+ aDBData = (static_cast < SwDBNameInfField* > (pFld->GetField()))->GetRealDBData();
break;
}
}
@@ -1762,7 +1759,7 @@ void SwDoc::GetAllUsedDB( SvStringsDtor& rDBNameList,
if( !pTxtFld || !pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
continue;
- const SwField* pFld = pFmtFld->GetFld();
+ const SwField* pFld = pFmtFld->GetField();
switch( pFld->GetTyp()->Which() )
{
case RES_DBFLD:
@@ -1937,7 +1934,7 @@ void SwDoc::ChangeDBFields( const SvStringsDtor& rOldNames,
if( !pTxtFld || !pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
continue;
- SwField* pFld = pFmtFld->GetFld();
+ SwField* pFld = pFmtFld->GetField();
sal_Bool bExpand = sal_False;
switch( pFld->GetTyp()->Which() )
@@ -2096,18 +2093,18 @@ void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
{
SwFieldType* pFldType = GetSysFldType( aTypes[ nStt ] );
SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
- for( SwFmtFld* pFld = aIter.First(); pFld; pFld = aIter.Next() )
+ for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
{
- if( pFld && pFld->GetTxtFld() )
+ if( pFmtFld && pFmtFld->GetTxtFld() )
{
sal_Bool bChgd = sal_False;
switch( aTypes[ nStt ] )
{
case RES_DOCINFOFLD:
- if( ((SwDocInfoField*)pFld->GetFld())->IsFixed() )
+ if( ((SwDocInfoField*)pFmtFld->GetField())->IsFixed() )
{
bChgd = sal_True;
- SwDocInfoField* pDocInfFld = (SwDocInfoField*)pFld->GetFld();
+ SwDocInfoField* pDocInfFld = (SwDocInfoField*)pFmtFld->GetField();
pDocInfFld->SetExpansion( ((SwDocInfoFieldType*)
pDocInfFld->GetTyp())->Expand(
pDocInfFld->GetSubType(),
@@ -2118,10 +2115,10 @@ void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
break;
case RES_AUTHORFLD:
- if( ((SwAuthorField*)pFld->GetFld())->IsFixed() )
+ if( ((SwAuthorField*)pFmtFld->GetField())->IsFixed() )
{
bChgd = sal_True;
- SwAuthorField* pAuthorFld = (SwAuthorField*)pFld->GetFld();
+ SwAuthorField* pAuthorFld = (SwAuthorField*)pFmtFld->GetField();
pAuthorFld->SetExpansion( ((SwAuthorFieldType*)
pAuthorFld->GetTyp())->Expand(
pAuthorFld->GetFormat() ) );
@@ -2129,10 +2126,10 @@ void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
break;
case RES_EXTUSERFLD:
- if( ((SwExtUserField*)pFld->GetFld())->IsFixed() )
+ if( ((SwExtUserField*)pFmtFld->GetField())->IsFixed() )
{
bChgd = sal_True;
- SwExtUserField* pExtUserFld = (SwExtUserField*)pFld->GetFld();
+ SwExtUserField* pExtUserFld = (SwExtUserField*)pFmtFld->GetField();
pExtUserFld->SetExpansion( ((SwExtUserFieldType*)
pExtUserFld->GetTyp())->Expand(
pExtUserFld->GetSubType(),
@@ -2141,20 +2138,20 @@ void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
break;
case RES_DATETIMEFLD:
- if( ((SwDateTimeField*)pFld->GetFld())->IsFixed() )
+ if( ((SwDateTimeField*)pFmtFld->GetField())->IsFixed() )
{
bChgd = sal_True;
- ((SwDateTimeField*)pFld->GetFld())->SetDateTime(
+ ((SwDateTimeField*)pFmtFld->GetField())->SetDateTime(
DateTime(Date(nDate), Time(nTime)) );
}
break;
case RES_FILENAMEFLD:
- if( ((SwFileNameField*)pFld->GetFld())->IsFixed() )
+ if( ((SwFileNameField*)pFmtFld->GetField())->IsFixed() )
{
bChgd = sal_True;
SwFileNameField* pFileNameFld =
- (SwFileNameField*)pFld->GetFld();
+ (SwFileNameField*)pFmtFld->GetField();
pFileNameFld->SetExpansion( ((SwFileNameFieldType*)
pFileNameFld->GetTyp())->Expand(
pFileNameFld->GetFormat() ) );
@@ -2164,7 +2161,7 @@ void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
// Formatierung anstossen
if( bChgd )
- pFld->ModifyNotification( 0, 0 );
+ pFmtFld->ModifyNotification( 0, 0 );
}
}
}
@@ -2243,7 +2240,7 @@ void SwDoc::ChangeAuthorityData( const SwAuthEntry* pNewData )
void SwDocUpdtFld::InsDelFldInFldLst( sal_Bool bIns, const SwTxtFld& rFld )
{
- sal_uInt16 nWhich = rFld.GetFld().GetFld()->GetTyp()->Which();
+ const sal_uInt16 nWhich = rFld.GetFmtFld().GetField()->GetTyp()->Which();
switch( nWhich )
{
case RES_DBFLD:
@@ -2381,7 +2378,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
if( !pTxtFld || !pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
continue;
- const SwField* pFld = pFmtFld->GetFld();
+ const SwField* pFld = pFmtFld->GetField();
switch( nWhich = pFld->GetTyp()->Which() )
{
case RES_DBSETNUMBERFLD:
@@ -2396,7 +2393,6 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
break;
case RES_SETEXPFLD:
- /// OD 04.10.2002 #102894#
/// fields of subtype <string> have also been add
/// for calculation (eGetMode == GETFLD_CALC).
/// Thus, add fields of subtype <string> in all modes
@@ -2558,12 +2554,12 @@ void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, sal_uInt16 nFldWhich )
// bei GetExp.-/DB.-Felder immer das BodyTxtFlag setzen
if( RES_GETEXPFLD == nFldWhich )
{
- SwGetExpField* pGetFld = (SwGetExpField*)rTFld.GetFld().GetFld();
+ SwGetExpField* pGetFld = (SwGetExpField*)rTFld.GetFmtFld().GetField();
pGetFld->ChgBodyTxtFlag( bIsInBody );
}
else if( RES_DBFLD == nFldWhich )
{
- SwDBField* pDBFld = (SwDBField*)rTFld.GetFld().GetFld();
+ SwDBField* pDBFld = (SwDBField*)rTFld.GetFmtFld().GetField();
pDBFld->ChgBodyTxtFlag( bIsInBody );
}
@@ -2707,8 +2703,8 @@ bool SwDoc::UpdateFld(SwTxtFld * pDstTxtFld, SwField & rSrcFld,
sal_Bool bTblSelBreak = sal_False;
- SwFmtFld * pDstFmtFld = (SwFmtFld*)&pDstTxtFld->GetFld();
- SwField * pDstFld = pDstFmtFld->GetFld();
+ SwFmtFld * pDstFmtFld = (SwFmtFld*)&pDstTxtFld->GetFmtFld();
+ SwField * pDstFld = pDstFmtFld->GetField();
sal_uInt16 nFldWhich = rSrcFld.GetTyp()->Which();
SwNodeIndex aTblNdIdx(pDstTxtFld->GetTxtNode());
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 0ff1f8a..48534b3 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -321,10 +321,15 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
static_cast<SwTxtFld*>(pAttr);
rNds.GetDoc()->InsDelFldInFldLst( !bToUndo, *pTxtFld );
- const SwFieldType* pTyp = pTxtFld->GetFld().GetFld()->GetTyp();
+ const SwFieldType* pTyp = pTxtFld->GetFmtFld().GetField()->GetTyp();
if ( RES_POSTITFLD == pTyp->Which() )
{
- rNds.GetDoc()->GetDocShell()->Broadcast( SwFmtFldHint( &pTxtFld->GetFld(), pTxtFld->GetFld().IsFldInDoc() ? SWFMTFLD_INSERTED : SWFMTFLD_REMOVED ) );
+ rNds.GetDoc()->GetDocShell()->Broadcast(
+ SwFmtFldHint(
+ &pTxtFld->GetFmtFld(),
+ ( pTxtFld->GetFmtFld().IsFldInDoc()
+ ? SWFMTFLD_INSERTED
+ : SWFMTFLD_REMOVED ) ) );
}
else
if( RES_DDEFLD == pTyp->Which() )
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 1b9fe45..55c093d 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -463,7 +463,7 @@ sal_Bool lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, xub_StrLen nPos,
// defined as weak-script ?
if ( RES_TXTATR_FIELD == pAttr->Which() )
{
- const SwField* const pFld = pAttr->GetFld().GetFld();
+ const SwField* const pFld = pAttr->GetFmtFld().GetField();
if (pFld)
{
sExp += pFld->ExpandField(true);
diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index b4c1d18..9f4669d 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -273,7 +273,7 @@ SwField* SwEditShell::GetCurFld() const
(pCrsr->End()->nContent.GetIndex() -
pCrsr->Start()->nContent.GetIndex()) <= 1)
{
- pCurFld = (SwField*)pTxtFld->GetFld().GetFld();
+ pCurFld = (SwField*)pTxtFld->GetFmtFld().GetField();
// TabellenFormel ? wandel internen in externen Namen um
if( RES_TABLEFLD == pCurFld->GetTyp()->Which() )
{
@@ -311,7 +311,7 @@ SwTxtFld* lcl_FindInputFld( SwDoc* pDoc, SwField& rFld )
for( n = 0; n < nMaxItems; ++n )
if( 0 != (pItem =
pDoc->GetAttrPool().GetItem2( RES_TXTATR_FIELD, n ) )
- && ((SwFmtFld*)pItem)->GetFld() == &rFld )
+ && ((SwFmtFld*)pItem)->GetField() == &rFld )
{
pTFld = ((SwFmtFld*)pItem)->GetTxtFld();
break;
@@ -390,8 +390,8 @@ void SwEditShell::UpdateFlds( SwField &rFld )
if( 0 != (pTxtFld = GetDocTxtFld( pCurStt )) )
{
- pFmtFld = (SwFmtFld*)&pTxtFld->GetFld();
- pCurFld = pFmtFld->GetFld();
+ pFmtFld = (SwFmtFld*)&pTxtFld->GetFmtFld();
+ pCurFld = pFmtFld->GetField();
// bei gemischten Feldtypen
if( pCurFld->GetTyp()->Which() !=
diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx
index bce3300..6e6dd1c 100644
--- a/sw/source/core/edit/edfldexp.cxx
+++ b/sw/source/core/edit/edfldexp.cxx
@@ -63,13 +63,13 @@ sal_Bool SwEditShell::IsFieldDataSourceAvailable(String& rUsedDataSource) const
case RES_DBFLD:
{
SwIterator<SwFmtFld,SwFieldType> aIter( rFldType );
- SwFmtFld* pFld = aIter.First();
- while(pFld)
+ SwFmtFld* pFmtFld = aIter.First();
+ while(pFmtFld)
{
- if(pFld->IsFldInDoc())
+ if(pFmtFld->IsFldInDoc())
{
const SwDBData& rData =
- ((SwDBFieldType*)pFld->GetFld()->GetTyp())->GetDBData();
+ ((SwDBFieldType*)pFmtFld->GetField()->GetTyp())->GetDBData();
try
{
return xDBContext->getByName(rData.sDataSource).hasValue();
@@ -80,7 +80,7 @@ sal_Bool SwEditShell::IsFieldDataSourceAvailable(String& rUsedDataSource) const
return sal_False;
}
}
- pFld = aIter.Next();
+ pFmtFld = aIter.Next();
}
}
break;
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index bacf595..bc63d52 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -325,7 +325,7 @@ sal_uInt16 SwAuthorityFieldType::GetSequencePos(long nHandle)
if(!pTxtFld || !pTxtFld->GetpTxtNode())
{
#ifdef DBG_UTIL
- if(nHandle == ((SwAuthorityField*)pFmtFld->GetFld())->GetHandle())
+ if(nHandle == ((SwAuthorityField*)pFmtFld->GetField())->GetHandle())
bCurrentFieldWithoutTextNode = sal_True;
#endif
continue;
@@ -381,7 +381,7 @@ sal_uInt16 SwAuthorityFieldType::GetSequencePos(long nHandle)
{
const SwTOXSortTabBase& rBase = *aSortArr[i];
SwFmtFld& rFmtFld = ((SwTOXAuthority&)rBase).GetFldFmt();
- SwAuthorityField* pAFld = (SwAuthorityField*)rFmtFld.GetFld();
+ SwAuthorityField* pAFld = (SwAuthorityField*)rFmtFld.GetField();
m_pSequArr->Insert(pAFld->GetHandle(), i);
}
aSortArr.DeleteAndDestroy(0, aSortArr.Count());
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index c524b73..4e77fdf 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -164,7 +164,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
- const SwField* pFld = pTxtFld->GetFld().GetFld();
+ const SwField* pFld = pTxtFld->GetFmtFld().GetField();
switch( pFld->GetTyp()->Which() )
{
case RES_SETEXPFLD:
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index 1212450..11e3fa4 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -159,18 +159,18 @@ sal_Bool SwDBFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
{
sColumn = sTmp;
SwIterator<SwFmtFld,SwFieldType> aIter( *this );
- SwFmtFld* pFld = aIter.First();
- while(pFld)
+ SwFmtFld* pFmtFld = aIter.First();
+ while(pFmtFld)
{
// Feld im Undo?
- SwTxtFld *pTxtFld = pFld->GetTxtFld();
+ SwTxtFld *pTxtFld = pFmtFld->GetTxtFld();
if(pTxtFld && pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
{
- SwDBField* pDBField = (SwDBField*)pFld->GetFld();
+ SwDBField* pDBField = (SwDBField*)pFmtFld->GetField();
pDBField->ClearInitialized();
pDBField->InitContent();
}
- pFld = aIter.Next();
+ pFmtFld = aIter.Next();
}
}
}
@@ -460,17 +460,17 @@ sal_Bool SwDBField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
if(GetTyp())
{
SwIterator<SwFmtFld,SwFieldType> aIter( *GetTyp() );
- SwFmtFld* pFld = aIter.First();
- while(pFld)
+ SwFmtFld* pFmtFld = aIter.First();
+ while(pFmtFld)
{
- SwTxtFld *pTxtFld = pFld->GetTxtFld();
- if(pTxtFld && (SwDBField*)pFld->GetFld() == this )
+ SwTxtFld *pTxtFld = pFmtFld->GetTxtFld();
+ if(pTxtFld && (SwDBField*)pFmtFld->GetField() == this )
{
//notify the change
- pTxtFld->NotifyContentChange(*pFld);
+ pTxtFld->NotifyContentChange(*pFmtFld);
break;
}
- pFld = aIter.Next();
+ pFmtFld = aIter.Next();
}
}
}
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 3114014..d6efc7a 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -2313,7 +2313,7 @@ sal_uInt16 SwRefPageGetFieldType::MakeSetList( _SetGetExpFlds& rTmpLst )
void SwRefPageGetFieldType::UpdateField( SwTxtFld* pTxtFld,
_SetGetExpFlds& rSetList )
{
- SwRefPageGetField* pGetFld = (SwRefPageGetField*)pTxtFld->GetFld().GetFld();
+ SwRefPageGetField* pGetFld = (SwRefPageGetField*)pTxtFld->GetFmtFld().GetField();
pGetFld->SetText( aEmptyStr );
// dann suche mal das richtige RefPageSet-Field
@@ -2329,9 +2329,9 @@ void SwRefPageGetFieldType::UpdateField( SwTxtFld* pTxtFld,
if( nLast-- )
{
- const SwTxtFld* pRefTxtFld = rSetList[ nLast ]->GetFld();
+ const SwTxtFld* pRefTxtFld = rSetList[ nLast ]->GetTxtFld();
const SwRefPageSetField* pSetFld =
- (SwRefPageSetField*)pRefTxtFld->GetFld().GetFld();
+ (SwRefPageSetField*)pRefTxtFld->GetFmtFld().GetField();
if( pSetFld->IsOn() )
{
// dann bestimme mal den entsp. Offset
@@ -2355,7 +2355,7 @@ void SwRefPageGetFieldType::UpdateField( SwTxtFld* pTxtFld,
}
}
// dann die Formatierung anstossen
- ((SwFmtFld&)pTxtFld->GetFld()).ModifyNotification( 0, 0 );
+ ((SwFmtFld&)pTxtFld->GetFmtFld()).ModifyNotification( 0, 0 );
}
/*--------------------------------------------------------------------
@@ -2426,9 +2426,9 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm,
if( !nLast-- )
return ; // es gibt kein entsprechendes Set - Feld vor mir
- const SwTxtFld* pRefTxtFld = aTmpLst[ nLast ]->GetFld();
+ const SwTxtFld* pRefTxtFld = aTmpLst[ nLast ]->GetTxtFld();
const SwRefPageSetField* pSetFld =
- (SwRefPageSetField*)pRefTxtFld->GetFld().GetFld();
+ (SwRefPageSetField*)pRefTxtFld->GetFmtFld().GetField();
Point aPt;
const SwCntntFrm* pRefFrm = pRefTxtFld ? pRefTxtFld->GetTxtNode().getLayoutFrm( pFrm->getRootFrm(), &aPt, 0, sal_False ) : 0;
if( pSetFld->IsOn() && pRefFrm )
@@ -2438,7 +2438,7 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm,
sal_uInt16 nDiff = pPgFrm->GetPhyPageNum() -
pRefFrm->FindPageFrm()->GetPhyPageNum() + 1;
- SwRefPageGetField* pGetFld = (SwRefPageGetField*)pFld->GetFld().GetFld();
+ SwRefPageGetField* pGetFld = (SwRefPageGetField*)pFld->GetFmtFld().GetField();
sal_uInt32 nTmpFmt = SVX_NUM_PAGEDESC == pGetFld->GetFormat()
? pPgFrm->GetPageDesc()->GetNumType().GetNumberingType()
: pGetFld->GetFormat();
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 71a20cd..67c5339 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -534,8 +534,8 @@ void SwSetExpFieldType::Modify( const SfxPoolItem*, const SfxPoolItem* )
void SwSetExpFieldType::SetSeqFormat(sal_uLong nFmt)
{
SwIterator<SwFmtFld,SwFieldType> aIter(*this);
- for( SwFmtFld* pFld = aIter.First(); pFld; pFld = aIter.Next() )
- pFld->GetFld()->ChangeFormat( nFmt );
+ for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+ pFmtFld->GetField()->ChangeFormat( nFmt );
}
sal_uLong SwSetExpFieldType::GetSeqFormat()
@@ -543,7 +543,7 @@ sal_uLong SwSetExpFieldType::GetSeqFormat()
if( !GetDepends() )
return SVX_NUM_ARABIC;
- SwField *pFld = ((SwFmtFld*)GetDepends())->GetFld();
+ SwField *pFld = ((SwFmtFld*)GetDepends())->GetField();
return pFld->GetFormat();
}
@@ -562,10 +562,10 @@ extern void InsertSort( SvUShorts& rArr, sal_uInt16 nIdx, sal_uInt16* pInsPos =
SwIterator<SwFmtFld,SwFieldType> aIter( *this );
const SwTxtNode* pNd;
for( SwFmtFld* pF = aIter.First(); pF; pF = aIter.Next() )
- if( pF->GetFld() != &rFld && pF->GetTxtFld() &&
+ if( pF->GetField() != &rFld && pF->GetTxtFld() &&
0 != ( pNd = pF->GetTxtFld()->GetpTxtNode() ) &&
pNd->GetNodes().IsDocNodes() )
- InsertSort( aArr, ((SwSetExpField*)pF->GetFld())->GetSeqNumber() );
+ InsertSort( aArr, ((SwSetExpField*)pF->GetField())->GetSeqNumber() );
// teste erstmal ob die Nummer schon vorhanden ist:
@@ -605,7 +605,7 @@ sal_uInt16 SwSetExpFieldType::GetSeqFldList( SwSeqFldList& rList )
{
_SeqFldLstElem* pNew = new _SeqFldLstElem(
pNd->GetExpandTxt( 0, (*pF->GetTxtFld()->GetStart()) + 1 ),
- ((SwSetExpField*)pF->GetFld())->GetSeqNumber() );
+ ((SwSetExpField*)pF->GetField())->GetSeqNumber() );
rList.InsertSort( pNew );
}
diff --git a/sw/source/core/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx
index 82a3252..684595e 100644
--- a/sw/source/core/fields/fldlst.cxx
+++ b/sw/source/core/fields/fldlst.cxx
@@ -60,14 +60,14 @@ SwInputFieldList::SwInputFieldList( SwEditShell* pShell, sal_Bool bBuildTmpLst )
if( RES_SETEXPFLD == nType || RES_INPUTFLD == nType || RES_DROPDOWN == nType )
{
SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
- for( SwFmtFld* pFld = aIter.First(); pFld; pFld = aIter.Next() )
+ for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
{
- const SwTxtFld* pTxtFld = pFld->GetTxtFld();
+ const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
// nur InputFields und interaktive SetExpFlds bearbeiten
// and DropDown fields
if( !pTxtFld || ( RES_SETEXPFLD == nType &&
- !((SwSetExpField*)pFld->GetFld())->GetInputFlag()))
+ !((SwSetExpField*)pFmtFld->GetField())->GetInputFlag()))
continue;
const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
@@ -107,9 +107,9 @@ sal_uInt16 SwInputFieldList::Count() const
SwField* SwInputFieldList::GetField(sal_uInt16 nId)
{
- const SwTxtFld* pTxtFld = (*pSrtLst)[ nId ]->GetFld();
+ const SwTxtFld* pTxtFld = (*pSrtLst)[ nId ]->GetTxtFld();
ASSERT( pTxtFld, "kein TextFld" );
- return (SwField*)pTxtFld->GetFld().GetFld();
+ return (SwField*)pTxtFld->GetFmtFld().GetField();
}
/*--------------------------------------------------------------------
@@ -156,13 +156,13 @@ sal_uInt16 SwInputFieldList::BuildSortLst()
if( RES_SETEXPFLD == nType || RES_INPUTFLD == nType )
{
SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
- for( SwFmtFld* pFld = aIter.First(); pFld; pFld = aIter.Next() )
+ for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
{
- const SwTxtFld* pTxtFld = pFld->GetTxtFld();
+ const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
// nur InputFields und interaktive SetExpFlds bearbeiten
if( !pTxtFld || ( RES_SETEXPFLD == nType &&
- !((SwSetExpField*)pFld->GetFld())->GetInputFlag()))
+ !((SwSetExpField*)pFmtFld->GetField())->GetInputFlag()))
continue;
const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index a46458a..2996950 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -318,7 +318,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
pTxtNd->GetTxtAttrForCharAt(nStt, RES_TXTATR_FIELD);
if( pTxtAttr )
nStt = SwGetExpField::GetReferenceTextPos(
- pTxtAttr->GetFld(), *pDoc );
+ pTxtAttr->GetFmtFld(), *pDoc );
else if( nStt + 1 < nEnd )
++nStt;
}
@@ -768,23 +768,21 @@ void SwGetRefFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew
if( !pNew && !pOld )
{
SwIterator<SwFmtFld,SwFieldType> aIter( *this );
- for( SwFmtFld* pFld = aIter.First(); pFld; pFld = aIter.Next() )
+ for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
{
// nur die GetRef-Felder Updaten
//JP 3.4.2001: Task 71231 - we need the correct language
- SwGetRefField* pGRef = (SwGetRefField*)pFld->GetFld();
+ SwGetRefField* pGRef = (SwGetRefField*)pFmtFld->GetField();
const SwTxtFld* pTFld;
if( !pGRef->GetLanguage() &&
- 0 != ( pTFld = pFld->GetTxtFld()) &&
+ 0 != ( pTFld = pFmtFld->GetTxtFld()) &&
pTFld->GetpTxtNode() )
{
pGRef->SetLanguage( pTFld->GetpTxtNode()->GetLang(
*pTFld->GetStart() ) );
}
- // --> OD 2007-09-06 #i81002#
- pGRef->UpdateField( pFld->GetTxtFld() );
- // <--
+ pGRef->UpdateField( pFmtFld->GetTxtFld() );
}
}
// weiter an die Text-Felder, diese "Expandieren" den Text
@@ -820,12 +818,12 @@ SwTxtNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const String& rRefMark,
nsSwGetSetExpType::GSE_SEQ & ((SwSetExpFieldType*)pFldType)->GetType() )
{
SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
- for( SwFmtFld* pFld = aIter.First(); pFld; pFld = aIter.Next() )
+ for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
{
- if( pFld->GetTxtFld() && nSeqNo ==
- ((SwSetExpField*)pFld->GetFld())->GetSeqNumber() )
+ if( pFmtFld->GetTxtFld() && nSeqNo ==
+ ((SwSetExpField*)pFmtFld->GetField())->GetSeqNumber() )
{
- SwTxtFld* pTxtFld = pFld->GetTxtFld();
+ SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
pTxtNd = (SwTxtNode*)pTxtFld->GetpTxtNode();
*pStt = *pTxtFld->GetStart();
if( pEnd )
@@ -939,7 +937,7 @@ void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rFld,
if( pF->GetTxtFld() &&
0 != ( pNd = pF->GetTxtFld()->GetpTxtNode() ) &&
pNd->GetNodes().IsDocNodes() )
- aIds.Insert( ((SwSetExpField*)pF->GetFld())->GetSeqNumber() );
+ aIds.Insert( ((SwSetExpField*)pF->GetField())->GetSeqNumber() );
}
if( 0 != ( pType = rDoc.GetFldType( RES_SETEXPFLD, aName, false ) ))
{
@@ -948,7 +946,7 @@ void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rFld,
if( pF->GetTxtFld() &&
0 != ( pNd = pF->GetTxtFld()->GetpTxtNode() ) &&
pNd->GetNodes().IsDocNodes() )
- aDstIds.Insert( ((SwSetExpField*)pF->GetFld())->GetSeqNumber() );
+ aDstIds.Insert( ((SwSetExpField*)pF->GetField())->GetSeqNumber() );
}
}
else
@@ -996,8 +994,8 @@ void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rFld,
SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
for( SwFmtFld* pF = aIter.First(); pF; pF = aIter.Next() )
if( pF->GetTxtFld() && nSeqNo ==
- ((SwSetExpField*)pF->GetFld())->GetSeqNumber() )
- ((SwSetExpField*)pF->GetFld())->SetSeqNumber( n );
+ ((SwSetExpField*)pF->GetField())->GetSeqNumber() )
+ ((SwSetExpField*)pF->GetField())->SetSeqNumber( n );
}
}
else
@@ -1035,7 +1033,7 @@ void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc )
SwIterator<SwFmtFld,SwFieldType> aIter( *this );
for( SwFmtFld* pFld = aIter.First(); pFld; pFld = aIter.Next() )
{
- SwGetRefField& rRefFld = *(SwGetRefField*)pFld->GetFld();
+ SwGetRefField& rRefFld = *(SwGetRefField*)pFld->GetField();
switch( rRefFld.GetSubType() )
{
case REF_SEQUENCEFLD:
diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx
index 40dac75..f7c33e9 100644
--- a/sw/source/core/fields/tblcalc.cxx
+++ b/sw/source/core/fields/tblcalc.cxx
@@ -101,7 +101,7 @@ const SwNode* SwTblField::GetNodeOfFormula() const
SwIterator<SwFmtFld,SwFieldType> aIter( *GetTyp() );
for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
- if( this == pFmtFld->GetFld() )
+ if( this == pFmtFld->GetField() )
return (SwTxtNode*)&pFmtFld->GetTxtFld()->GetTxtNode();
return 0;
}
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 488eee3..88011e0 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1467,7 +1467,7 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference <
for( sal_uInt16 n = 0, nEnd = pHts->Count(); n < nEnd; ++n )
if( RES_TXTATR_FIELD == ( pItem =
&(*pHts)[ n ]->GetAttr())->Which() &&
- TYP_SEQFLD == ((SwFmtFld*)pItem)->GetFld()->GetTypeId() )
+ TYP_SEQFLD == ((SwFmtFld*)pItem)->GetField()->GetTypeId() )
{
// sequence field found
SwFlyFrm* pChgFly = (SwFlyFrm*)pAnchor->GetUpper();
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index a12fcb3..9691a67 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -640,7 +640,8 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
// alle Zellen der (Teil-)Tabelle zusammen. Dann teste mal ob
// all huebsch nebeneinander liegen.
- size_t n, nCellCnt = 0;
+ size_t n;
+ sal_uInt16 nCellCnt = 0;
long nYPos = LONG_MAX;
long nXPos = 0;
long nHeight = 0;
diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx
index 4563421..691dc53 100644
--- a/sw/source/core/inc/docfld.hxx
+++ b/sw/source/core/inc/docfld.hxx
@@ -86,7 +86,7 @@ public:
CNTNT.pTxtFld == rFld.CNTNT.pTxtFld ); }
sal_Bool operator<( const _SetGetExpFld& rFld ) const;
- const SwTxtFld* GetFld() const
+ const SwTxtFld* GetTxtFld() const
{ return TEXTFIELD == eSetGetExpFldType ? CNTNT.pTxtFld : 0; }
const SwTxtTOXMark* GetTOX() const
{ return TEXTTOXMARK == eSetGetExpFldType ? CNTNT.pTxtTOX : 0; }
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index e5517b4..c274816 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -103,10 +103,10 @@ private:
}
}
}
- catch(::com::sun::star::container::NoSuchElementException& ex)
+ catch(::com::sun::star::container::NoSuchElementException& )
{
}
- catch(::com::sun::star::uno::RuntimeException& ex)
+ catch(::com::sun::star::uno::RuntimeException& )
{
}
@@ -137,10 +137,10 @@ private:
}
}
}
- catch(::com::sun::star::container::NoSuchElementException& ex)
+ catch(::com::sun::star::container::NoSuchElementException& )
{
}
- catch(::com::sun::star::uno::RuntimeException& ex)
+ catch(::com::sun::star::uno::RuntimeException& )
{
}
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 3df4298..a8cd269 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2795,32 +2795,28 @@ void SwFlyFrmFmt::MakeFrms()
{
sal_uInt16 nPgNum = aAnchorAttr.GetPageNum();
SwPageFrm *pPage = (SwPageFrm*)GetDoc()->GetCurrentLayout()->Lower(); //swmod 080218
- if( !nPgNum && aAnchorAttr.GetCntntAnchor() )
+ if( nPgNum == 0 && aAnchorAttr.GetCntntAnchor() )
{
- SwCntntNode *pCNd =
- aAnchorAttr.GetCntntAnchor()->nNode.GetNode().GetCntntNode();
+ SwCntntNode *pCNd = aAnchorAttr.GetCntntAnchor()->nNode.GetNode().GetCntntNode();
SwIterator<SwFrm,SwCntntNode> aIter( *pCNd );
- for (SwFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
+ for ( SwFrm* pFrm = aIter.First(); pFrm != NULL; pFrm = aIter.Next() )
{
- pPage = pFrm->FindPageFrm();
- if( pPage )
- {
- nPgNum = pPage->GetPhyPageNum();
- // OD 24.07.2003 #111032# - update anchor attribute
- aAnchorAttr.SetPageNum( nPgNum );
- aAnchorAttr.SetAnchor( 0 );
- SetFmtAttr( aAnchorAttr );
- }
+ pPage = pFrm->FindPageFrm();
+ if( pPage )
+ {
+ nPgNum = pPage->GetPhyPageNum();
+ aAnchorAttr.SetPageNum( nPgNum );
+ aAnchorAttr.SetAnchor( 0 );
+ SetFmtAttr( aAnchorAttr );
break;
}
+ }
}
while ( pPage )
{
if ( pPage->GetPhyPageNum() == nPgNum )
{
- // --> OD 2005-06-09 #i50432# - adjust synopsis of <PlaceFly(..)>
pPage->PlaceFly( 0, this );
- // <--
break;
}
pPage = (SwPageFrm*)pPage->GetNext();
@@ -2929,18 +2925,21 @@ SwAnchoredObject* SwFlyFrmFmt::GetAnchoredObj( const Point* pPoint, const sal_Bo
sal_Bool SwFlyFrmFmt::GetInfo( SfxPoolItem& rInfo ) const
{
+ sal_Bool bRet = sal_True;
switch( rInfo.Which() )
{
case RES_CONTENT_VISIBLE:
{
((SwPtrMsgPoolItem&)rInfo).pObject = SwIterator<SwFrm,SwFmt>::FirstElement( *this );
}
- return sal_False;
+ bRet = sal_False;
+ break;
default:
- return SwFrmFmt::GetInfo( rInfo );
+ bRet = SwFrmFmt::GetInfo( rInfo );
+ break;
}
- return sal_True;
+ return bRet;
}
// --> OD 2009-07-14 #i73249#
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 295a342..43648b4 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2593,7 +2593,7 @@ sal_uLong SwTableBox::IsValidNumTxtNd( sal_Bool bCheckAttr ) const
// it inserts hidden variable-set fields at
// the beginning of para in cell, but they
// should not turn cell into text cell
- const SwField* pField = pAttr->GetFld().GetFld();
+ const SwField* pField = pAttr->GetFmtFld().GetField();
if (pField &&
(pField->GetTypeId() == TYP_SETFLD) &&
(0 != (static_cast<SwSetExpField const*>
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index a86d8bb..0c9ac4e 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -1460,7 +1460,7 @@ void SwTaggedPDFHelper::BeginInlineStructureElements()
const SwField* pFld = 0;
if ( pHint && RES_TXTATR_FIELD == pHint->Which() )
{
- pFld = (SwField*)pHint->GetFld().GetFld();
+ pFld = (SwField*)pHint->GetFmtFld().GetField();
if ( RES_GETREFFLD == pFld->Which() )
{
nPDFType = vcl::PDFWriter::Link;
@@ -1611,7 +1611,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
vcl::PDFNote aNote;
// Use the NumberFormatter to get the date string:
- const SwPostItField* pField = (SwPostItField*)pFirst->GetFld();
+ const SwPostItField* pField = (SwPostItField*)pFirst->GetField();
SvNumberFormatter* pNumFormatter = pDoc->GetNumberFormatter();
const Date aDateDiff( pField->GetDate() -
*pNumFormatter->GetNullDate() );
@@ -1851,8 +1851,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
mrSh.SwCrsrShell::ClearMark();
// Destination Rectangle
- const SwGetRefField* pField =
- (SwGetRefField*)pFirst->GetFld();
+ const SwGetRefField* pField = (SwGetRefField*)pFirst->GetField();
const String& rRefName = pField->GetSetRefName();
mrSh.GotoRefMark( rRefName, pField->GetSubType(), pField->GetSeqNo() );
const SwRect& rDestRect = mrSh.GetCharRect();
diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx
index 9661e97..ad06d9f 100644
--- a/sw/source/core/text/atrstck.cxx
+++ b/sw/source/core/text/atrstck.cxx
@@ -121,18 +121,18 @@ const sal_uInt8 StackPos[ static_cast<sal_uInt16>(RES_TXTATR_WITHEND_END) -
35, // RES_CHRATR_OVERLINE, // 38
0, // RES_CHRATR_DUMMY1, // 39
0, // RES_CHRATR_DUMMY2, // 40
- 0, // RES_CHRATR_BIDIRTL
- 0, // RES_CHRATR_IDCTHINT
- 36, // RES_TXTATR_REFMARK, // 41
- 37, // RES_TXTATR_TOXMARK, // 42
- 38, // RES_TXTATR_META, // 43
- 38, // RES_TXTATR_METAFIELD, // 44
- 0, // RES_TXTATR_AUTOFMT, // 45
- 0, // RES_TXTATR_INETFMT // 46
- 0, // RES_TXTATR_CHARFMT, // 47
- 39, // RES_TXTATR_CJK_RUBY, // 48
- 0, // RES_TXTATR_UNKNOWN_CONTAINER, // 49
- 0, // RES_TXTATR_DUMMY5 // 50
+ 0, // RES_CHRATR_BIDIRTL // 41
+ 0, // RES_CHRATR_IDCTHINT // 42
+ 36, // RES_TXTATR_REFMARK, // 43
+ 37, // RES_TXTATR_TOXMARK, // 44
+ 38, // RES_TXTATR_META, // 45
+ 38, // RES_TXTATR_METAFIELD, // 46
+ 0, // RES_TXTATR_AUTOFMT, // 47
+ 0, // RES_TXTATR_INETFMT // 48
+ 0, // RES_TXTATR_CHARFMT, // 49
+ 39, // RES_TXTATR_CJK_RUBY, // 50
+ 0, // RES_TXTATR_UNKNOWN_CONTAINER, // 51
+ 0, // RES_TXTATR_DUMMY5 // 52
};
/*************************************************************************
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 241f536..8ce5d67 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -772,7 +772,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
}
case RES_TXTATR_FIELD :
{
- SwField *pFld = (SwField*)pHint->GetFld().GetFld();
+ SwField *pFld = (SwField*)pHint->GetFmtFld().GetField();
const String aTxt = pFld->ExpandField(true);
if( lcl_MinMaxString( aArg, aIter.GetFnt(), aTxt, 0,
aTxt.Len() ) )
@@ -975,7 +975,7 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd
}
case RES_TXTATR_FIELD :
{
- SwField *pFld = (SwField*)pHint->GetFld().GetFld();
+ SwField *pFld = (SwField*)pHint->GetFmtFld().GetField();
String const aTxt = pFld->ExpandField(true);
SwDrawTextInfo aDrawInf( pSh, *pOut, 0, aTxt, 0, aTxt.Len() );
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 8e855da..9c95883 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -84,7 +84,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;
@@ -98,7 +98,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 ) );
}
ViewShell *pSh = rInf.GetVsh();
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 0462da6..e531761 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -845,8 +845,7 @@ SwTOXAuthority::SwTOXAuthority( const SwCntntNode& rNd,
sal_uInt16 SwTOXAuthority::GetLevel() const
{
- String sText(((SwAuthorityField*)m_rField.GetFld())->
- GetFieldText(AUTH_FIELD_AUTHORITY_TYPE));
+ String sText(((SwAuthorityField*)m_rField.GetField())->GetFieldText(AUTH_FIELD_AUTHORITY_TYPE));
//#i18655# the level '0' is the heading level therefor the values are incremented here
sal_uInt16 nRet = 1;
if( pTOXIntl->IsNumeric( sText ) )
@@ -864,7 +863,7 @@ sal_uInt16 SwTOXAuthority::GetLevel() const
-----------------------------------------------------------------------*/
static String lcl_GetText(SwFmtFld const& rField)
{
- return rField.GetFld()->ExpandField(true);
+ return rField.GetField()->ExpandField(true);
}
void SwTOXAuthority::GetText_Impl( String& rTxt, String& ) const
@@ -878,7 +877,7 @@ void SwTOXAuthority::GetText_Impl( String& rTxt, String& ) const
void SwTOXAuthority::FillText( SwTxtNode& rNd,
const SwIndex& rInsPos, sal_uInt16 nAuthField ) const
{
- SwAuthorityField* pField = (SwAuthorityField*)m_rField.GetFld();
+ SwAuthorityField* pField = (SwAuthorityField*)m_rField.GetField();
String sText;
if(AUTH_FIELD_IDENTIFIER == nAuthField)
{
@@ -907,8 +906,8 @@ void SwTOXAuthority::FillText( SwTxtNode& rNd,
sal_Bool SwTOXAuthority::operator==( const SwTOXSortTabBase& rCmp)
{
return nType == rCmp.nType &&
- ((SwAuthorityField*)m_rField.GetFld())->GetHandle() ==
- ((SwAuthorityField*)((SwTOXAuthority&)rCmp).m_rField.GetFld())->GetHandle();
+ ((SwAuthorityField*)m_rField.GetField())->GetHandle() ==
+ ((SwAuthorityField*)((SwTOXAuthority&)rCmp).m_rField.GetField())->GetHandle();
}
/* -----------------21.10.99 09:52-------------------
@@ -916,15 +915,15 @@ sal_Bool SwTOXAuthority::operator==( const SwTOXSortTabBase& rCmp)
sal_Bool SwTOXAuthority::operator<( const SwTOXSortTabBase& rBase)
{
sal_Bool bRet = sal_False;
- SwAuthorityField* pField = (SwAuthorityField*)m_rField.GetFld();
+ SwAuthorityField* pField = (SwAuthorityField*)m_rField.GetField();
SwAuthorityFieldType* pType = (SwAuthorityFieldType*)
pField->GetTyp();
if(pType->IsSortByDocument())
bRet = SwTOXSortTabBase::operator<(rBase);
else
{
- SwAuthorityField* pCmpField = (SwAuthorityField*)
- ((SwTOXAuthority&)rBase).m_rField.GetFld();
+ SwAuthorityField* pCmpField =
+ (SwAuthorityField*)((SwTOXAuthority&)rBase).m_rField.GetField();
for(sal_uInt16 i = 0; i < pType->GetSortKeyCount(); i++)
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index dcaf7fe..1679228 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -53,17 +53,20 @@ TYPEINIT1(SwFmtFldHint, SfxHint);
// Konstruktor fuers Default vom Attribut-Pool
SwFmtFld::SwFmtFld()
- : SfxPoolItem( RES_TXTATR_FIELD ),
- SwClient( 0 ),
- pField( 0 ),
- pTxtAttr( 0 )
+ : SfxPoolItem( RES_TXTATR_FIELD )
+ , SwClient( 0 )
+ , SfxBroadcaster()
+ , pField( 0 )
+ , pTxtAttr( 0 )
{
}
SwFmtFld::SwFmtFld( const SwField &rFld )
- : SfxPoolItem( RES_TXTATR_FIELD ),
- SwClient( rFld.GetTyp() ),
- pTxtAttr( 0 )
+ : SfxPoolItem( RES_TXTATR_FIELD )
+ , SwClient( rFld.GetTyp() )
+ , SfxBroadcaster()
+ , pField( 0 )
+ , pTxtAttr( 0 )
{
pField = rFld.CopyField();
}
@@ -73,14 +76,16 @@ SwFmtFld::SwFmtFld( const SwField &rFld )
// full pool range, all items need to be clonable. Thus, this one needed to be
// corrected
SwFmtFld::SwFmtFld( const SwFmtFld& rAttr )
- : SfxPoolItem( RES_TXTATR_FIELD ), SwClient(), SfxBroadcaster(),
- pField( 0 ),
- pTxtAttr( 0 )
+ : SfxPoolItem( RES_TXTATR_FIELD )
+ , SwClient()
+ , SfxBroadcaster()
+ , pField( 0 )
+ , pTxtAttr( 0 )
{
- if(rAttr.GetFld())
+ if(rAttr.GetField())
{
- rAttr.GetFld()->GetTyp()->Add(this);
- pField = rAttr.GetFld()->CopyField();
+ rAttr.GetField()->GetTyp()->Add(this);
+ pField = rAttr.GetField()->CopyField();
}
}
@@ -141,13 +146,10 @@ void SwFmtFld::SetFld(SwField * _pField)
int SwFmtFld::operator==( const SfxPoolItem& rAttr ) const
{
ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
- // OD 2004-05-14 #i29146# - correction: check, if <pField> and
- // <((SwFmtFld&)rAttr).GetFld()> are set.
- // OD 2004-05-14 #i29146# - items are equal, if both fields aren't set.
- return ( pField && ((SwFmtFld&)rAttr).GetFld() &&
- pField->GetTyp() == ((SwFmtFld&)rAttr).GetFld()->GetTyp() &&
- pField->GetFormat() == ((SwFmtFld&)rAttr).GetFld()->GetFormat() ) ||
- ( !pField && !((SwFmtFld&)rAttr).GetFld() );
+ return ( ( pField && ((SwFmtFld&)rAttr).GetField()
+ && pField->GetTyp() == ((SwFmtFld&)rAttr).GetField()->GetTyp()
+ && pField->GetFormat() == ((SwFmtFld&)rAttr).GetField()->GetFormat() ) )
+ || ( !pField && !((SwFmtFld&)rAttr).GetField() );
}
SfxPoolItem* SwFmtFld::Clone( SfxItemPool* ) const
@@ -170,7 +172,7 @@ void SwFmtFld::SwClientNotify( const SwModify&, const SfxHint& rHint )
pPaM->GetPoint()->nNode = rTxtNode;
pPaM->GetPoint()->nContent.Assign( (SwTxtNode*)&rTxtNode, *pTxtAttr->GetStart() );
- String const aEntry( GetFld()->ExpandField( pDoc->IsClipBoard() ) );
+ String const aEntry( GetField()->ExpandField( pDoc->IsClipBoard() ) );
pPaM->SetMark();
pPaM->Move( fnMoveForward );
pDoc->DeleteRange( *pPaM );
@@ -200,11 +202,11 @@ void SwFmtFld::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
return;
case RES_REFMARKFLD_UPDATE:
// GetReferenz-Felder aktualisieren
- if( RES_GETREFFLD == GetFld()->GetTyp()->Which() )
+ if( RES_GETREFFLD == GetField()->GetTyp()->Which() )
{
// --> OD 2007-09-06 #i81002#
// ((SwGetRefField*)GetFld())->UpdateField();
- dynamic_cast<SwGetRefField*>(GetFld())->UpdateField( pTxtAttr );
+ dynamic_cast<SwGetRefField*>(GetField())->UpdateField( pTxtAttr );
// <--
}
break;
@@ -222,7 +224,7 @@ void SwFmtFld::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
}
}
- switch (GetFld()->GetTyp()->Which())
+ switch (GetField()->GetTyp()->Which())
{
case RES_HIDDENPARAFLD:
if( !pOld || RES_HIDDENPARA_PRINT != pOld->Which() )
@@ -235,9 +237,9 @@ void SwFmtFld::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
return;
}
- if( RES_USERFLD == GetFld()->GetTyp()->Which() )
+ if( RES_USERFLD == GetField()->GetTyp()->Which() )
{
- SwUserFieldType* pType = (SwUserFieldType*)GetFld()->GetTyp();
+ SwUserFieldType* pType = (SwUserFieldType*)GetField()->GetTyp();
if(!pType->IsValid())
{
SwCalc aCalc( *pTxtNd->GetDoc() );
@@ -286,7 +288,7 @@ sal_Bool SwFmtFld::IsProtect() const
SwTxtFld::SwTxtFld(SwFmtFld & rAttr, xub_StrLen const nStartPos)
: SwTxtAttr( rAttr, nStartPos )
- , m_aExpand( rAttr.GetFld()->ExpandField(true) )
+ , m_aExpand( rAttr.GetField()->ExpandField(true) )
, m_pTxtNode( 0 )
{
rAttr.pTxtAttr = this;
@@ -317,9 +319,8 @@ void SwTxtFld::Expand() const
// Wenn das expandierte Feld sich nicht veraendert hat, wird returnt
ASSERT( m_pTxtNode, "SwTxtFld: where is my TxtNode?" );
- const SwField* pFld = GetFld().GetFld();
- XubString aNewExpand(
- pFld->ExpandField(m_pTxtNode->GetDoc()->IsClipBoard()) );
+ const SwField* pFld = GetFmtFld().GetField();
+ XubString aNewExpand( pFld->ExpandField(m_pTxtNode->GetDoc()->IsClipBoard()) );
if( aNewExpand == m_aExpand )
{
@@ -348,7 +349,7 @@ void SwTxtFld::Expand() const
m_aExpand = aNewExpand;
// 0, this for formatting
- m_pTxtNode->ModifyNotification( 0, const_cast<SwFmtFld*>( &GetFld() ) );
+ m_pTxtNode->ModifyNotification( 0, const_cast<SwFmtFld*>( &GetFmtFld() ) );
}
/*************************************************************************
@@ -363,8 +364,8 @@ void SwTxtFld::CopyFld( SwTxtFld *pDest ) const
IDocumentFieldsAccess* pIDFA = m_pTxtNode->getIDocumentFieldsAccess();
IDocumentFieldsAccess* pDestIDFA = pDest->m_pTxtNode->getIDocumentFieldsAccess();
- SwFmtFld& rFmtFld = (SwFmtFld&)pDest->GetFld();
- const sal_uInt16 nFldWhich = rFmtFld.GetFld()->GetTyp()->Which();
+ SwFmtFld& rFmtFld = (SwFmtFld&)pDest->GetFmtFld();
+ const sal_uInt16 nFldWhich = rFmtFld.GetField()->GetTyp()->Which();
if( pIDFA != pDestIDFA )
{
@@ -377,19 +378,19 @@ void SwTxtFld::CopyFld( SwTxtFld *pDest ) const
RES_AUTHORITY != nFldWhich )
pFldType = pDestIDFA->GetSysFldType( nFldWhich );
else
- pFldType = pDestIDFA->InsertFldType( *rFmtFld.GetFld()->GetTyp() );
+ pFldType = pDestIDFA->InsertFldType( *rFmtFld.GetField()->GetTyp() );
// Sonderbehandlung fuer DDE-Felder
if( RES_DDEFLD == nFldWhich )
{
if( rFmtFld.GetTxtFld() )
- ((SwDDEFieldType*)rFmtFld.GetFld()->GetTyp())->DecRefCnt();
+ ((SwDDEFieldType*)rFmtFld.GetField()->GetTyp())->DecRefCnt();
((SwDDEFieldType*)pFldType)->IncRefCnt();
}
ASSERT( pFldType, "unbekannter FieldType" );
pFldType->Add( &rFmtFld ); // ummelden
- rFmtFld.GetFld()->ChgTyp( pFldType );
+ rFmtFld.GetField()->ChgTyp( pFldType );
}
// Expressionfelder Updaten
@@ -401,12 +402,12 @@ void SwTxtFld::CopyFld( SwTxtFld *pDest ) const
}
// Tabellenfelder auf externe Darstellung
else if( RES_TABLEFLD == nFldWhich &&
- ((SwTblField*)rFmtFld.GetFld())->IsIntrnlName() )
+ ((SwTblField*)rFmtFld.GetField())->IsIntrnlName() )
{
// erzeuge aus der internen (fuer CORE) die externe (fuer UI) Formel
const SwTableNode* pTblNd = m_pTxtNode->FindTableNode();
if( pTblNd ) // steht in einer Tabelle
- ((SwTblField*)rFmtFld.GetFld())->PtrToBoxNm( &pTblNd->GetTable() );
+ ((SwTblField*)rFmtFld.GetField())->PtrToBoxNm( &pTblNd->GetTable() );
}
}
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 129facb..01842f3 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1313,7 +1313,7 @@ void lcl_CopyHint( const sal_uInt16 nWhich, const SwTxtAttr * const pHt,
// TabellenFormel muessen relativ kopiert werden.
case RES_TXTATR_FIELD :
{
- const SwFmtFld& rFld = pHt->GetFld();
+ const SwFmtFld& rFld = pHt->GetFmtFld();
if( pOtherDoc )
{
static_cast<const SwTxtFld*>(pHt)->CopyFld(
@@ -1321,18 +1321,16 @@ void lcl_CopyHint( const sal_uInt16 nWhich, const SwTxtAttr * const pHt,
}
// Tabellenformel ??
- if( RES_TABLEFLD == rFld.GetFld()->GetTyp()->Which()
- && static_cast<const SwTblField*>(rFld.GetFld())->IsIntrnlName())
+ if( RES_TABLEFLD == rFld.GetField()->GetTyp()->Which()
+ && static_cast<const SwTblField*>(rFld.GetField())->IsIntrnlName())
{
// wandel die interne in eine externe Formel um
const SwTableNode* const pDstTblNd =
- static_cast<const SwTxtFld*>(pHt)->
- GetTxtNode().FindTableNode();
+ static_cast<const SwTxtFld*>(pHt)->GetTxtNode().FindTableNode();
if( pDstTblNd )
{
SwTblField* const pTblFld = const_cast<SwTblField*>(
- static_cast<const SwTblField*>(
- pNewHt->GetFld().GetFld()));
+ static_cast<const SwTblField*>(pNewHt->GetFmtFld().GetField()));
pTblFld->PtrToBoxNm( &pDstTblNd->GetTable() );
}
}
@@ -3041,8 +3039,7 @@ void SwTxtNode::Replace0xFF( XubString& rTxt, xub_StrLen& rTxtStt,
if( bExpandFlds )
{
const XubString aExpand(
- static_cast<SwTxtFld const*>(pAttr)->GetFld()
- .GetFld()->ExpandField(true));
+ static_cast<SwTxtFld const*>(pAttr)->GetFmtFld().GetField()->ExpandField(true));
rTxt.Insert( aExpand, nPos );
nPos = nPos + aExpand.Len();
nEndPos = nEndPos + aExpand.Len();
@@ -3190,8 +3187,7 @@ sal_Bool SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx,
case RES_TXTATR_FIELD:
{
XubString const aExpand(
- static_cast<SwTxtFld const*>(pHt)->GetFld().GetFld()
- ->ExpandField(true));
+ static_cast<SwTxtFld const*>(pHt)->GetFmtFld().GetField()->ExpandField(true) );
if( aExpand.Len() )
{
aDestIdx++; // dahinter einfuegen;
@@ -3288,8 +3284,7 @@ const ModelToViewHelper::ConversionMap*
if ( RES_TXTATR_FIELD == pAttr->Which() )
{
const XubString aExpand(
- static_cast<SwTxtFld const*>(pAttr)->GetFld().GetFld()
- ->ExpandField(true));
+ static_cast<SwTxtFld const*>(pAttr)->GetFmtFld().GetField()->ExpandField(true));
if ( aExpand.Len() > 0 )
{
const xub_StrLen nFieldPos = *pAttr->GetStart();
@@ -5083,9 +5078,9 @@ bool SwTxtNode::HasPageNumberField()
xub_StrLen nEnd = Len();
for(xub_StrLen nStart=0;nStart<nEnd;nStart++)
{
- SwTxtFld* pFld = GetTxtFld(nStart);
+ const SwTxtFld* pFld = GetTxtFld(nStart);
const SwField* pSwField = pFld
- ? pFld->GetFld().GetFld()
+ ? pFld->GetFmtFld().GetField()
: NULL;
const SwFieldType* pType = pSwField
? pSwField->GetTyp()
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index f8885cd..451f57f 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1130,7 +1130,7 @@ void SwTxtNode::DestroyAttr( SwTxtAttr* pAttr )
{
// Wenn wir ein HiddenParaField sind, dann muessen wir
// ggf. fuer eine Neuberechnung des Visible-Flags sorgen.
- const SwField* pFld = pAttr->GetFld().GetFld();
+ const SwField* pFld = pAttr->GetFmtFld().GetField();
//JP 06-08-95: DDE-Felder bilden eine Ausnahme
ASSERT( RES_DDEFLD == pFld->GetTyp()->Which() ||
@@ -1160,7 +1160,7 @@ void SwTxtNode::DestroyAttr( SwTxtAttr* pAttr )
break;
case RES_POSTITFLD:
{
- const_cast<SwFmtFld&>(pAttr->GetFld()).Broadcast( SwFmtFldHint( &((SwTxtFld*)pAttr)->GetFld(), SWFMTFLD_REMOVED ) );
+ const_cast<SwFmtFld&>(pAttr->GetFmtFld()).Broadcast( SwFmtFldHint( &((SwTxtFld*)pAttr)->GetFmtFld(), SWFMTFLD_REMOVED ) );
break;
}
}
@@ -1435,7 +1435,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
// fuer HiddenParaFields Benachrichtigungsmechanismus
// anwerfen
if( RES_HIDDENPARAFLD ==
- pAttr->GetFld().GetFld()->GetTyp()->Which() )
+ pAttr->GetFmtFld().GetField()->GetTyp()->Which() )
bHiddenPara = sal_True;
}
break;
@@ -2438,7 +2438,7 @@ void SwpHints::CalcFlags()
break;
case RES_TXTATR_FIELD:
{
- const SwField* pFld = pAttr->GetFld().GetFld();
+ const SwField* pFld = pAttr->GetFmtFld().GetField();
if( RES_DDEFLD == pFld->GetTyp()->Which() )
{
m_bDDEFields = true;
@@ -2470,10 +2470,10 @@ bool SwpHints::CalcHiddenParaField()
if( RES_TXTATR_FIELD == nWhich )
{
- const SwFmtFld& rFld = pTxtHt->GetFld();
- if( RES_HIDDENPARAFLD == rFld.GetFld()->GetTyp()->Which() )
+ const SwFmtFld& rFld = pTxtHt->GetFmtFld();
+ if( RES_HIDDENPARAFLD == rFld.GetField()->GetTyp()->Which() )
{
- if( !((SwHiddenParaField*)rFld.GetFld())->IsHidden() )
+ if( !((SwHiddenParaField*)rFld.GetField())->IsHidden() )
{
SetHiddenParaField(false);
return bOldHasHiddenParaField != bNewHasHiddenParaField;
@@ -2706,7 +2706,7 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode,
sal_Bool bDelFirst = 0 != ((SwTxtFld*)pHint)->GetpTxtNode();
((SwTxtFld*)pHint)->ChgTxtNode( &rNode );
SwDoc* pDoc = rNode.GetDoc();
- const SwField* pFld = ((SwTxtFld*)pHint)->GetFld().GetFld();
+ const SwField* pFld = ((SwTxtFld*)pHint)->GetFmtFld().GetField();
if( !pDoc->IsNewFldLst() )
{
@@ -2750,10 +2750,9 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode,
pDoc->InsertFldType( *pFld->GetTyp() );
if( pFldType != pFld->GetTyp() )
{
- SwFmtFld* pFmtFld = (SwFmtFld*)&((SwTxtFld*)pHint)
- ->GetFld();
+ SwFmtFld* pFmtFld = (SwFmtFld*)&((SwTxtFld*)pHint)->GetFmtFld();
pFmtFld->RegisterToFieldType( *pFldType );
- pFmtFld->GetFld()->ChgTyp( pFldType );
+ pFmtFld->GetField()->ChgTyp( pFldType );
}
pFldType->SetSeqRefNo( *(SwSetExpField*)pFld );
}
@@ -2770,7 +2769,7 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode,
case RES_POSTITFLD:
if ( pDoc->GetDocShell() )
- pDoc->GetDocShell()->Broadcast( SwFmtFldHint( &((SwTxtFld*)pHint)->GetFld(), SWFMTFLD_INSERTED ) );
+ pDoc->GetDocShell()->Broadcast( SwFmtFldHint( &((SwTxtFld*)pHint)->GetFmtFld(), SWFMTFLD_INSERTED ) );
break;
}
if( bInsFldType )
@@ -2972,7 +2971,7 @@ void SwpHints::DeleteAtPos( const sal_uInt16 nPos )
if( RES_TXTATR_FIELD == pHint->Which() )
{
- SwFieldType* pFldTyp = ((SwTxtFld*)pHint)->GetFld().GetFld()->GetTyp();
+ const SwFieldType* pFldTyp = ((SwTxtFld*)pHint)->GetFmtFld().GetField()->GetTyp();
if( RES_DDEFLD == pFldTyp->Which() )
{
const SwTxtNode* pNd = ((SwTxtFld*)pHint)->GetpTxtNode();
@@ -2982,7 +2981,7 @@ void SwpHints::DeleteAtPos( const sal_uInt16 nPos )
}
else if( RES_POSTITFLD == pFldTyp->Which() )
{
- const_cast<SwFmtFld&>(((SwTxtFld*)pHint)->GetFld()).Broadcast( SwFmtFldHint( &((SwTxtFld*)pHint)->GetFld(), SWFMTFLD_REMOVED ) );
+ const_cast<SwFmtFld&>(((SwTxtFld*)pHint)->GetFmtFld()).Broadcast( SwFmtFldHint( &((SwTxtFld*)pHint)->GetFmtFld(), SWFMTFLD_REMOVED ) );
}
else if ( m_bHasHiddenParaField &&
RES_HIDDENPARAFLD == pFldTyp->Which() )
@@ -3125,7 +3124,7 @@ sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr )
// #i78149: PostIt fields should not break words for spell and grammar checking
if (rAttr.Which() == RES_TXTATR_FIELD &&
- RES_POSTITFLD == rAttr.GetFld().GetFld()->GetTyp()->Which())
+ RES_POSTITFLD == rAttr.GetFmtFld().GetField()->GetTyp()->Which())
cRet = CH_TXTATR_INWORD;
}
break;
diff --git a/sw/source/core/undo/SwUndoField.cxx b/sw/source/core/undo/SwUndoField.cxx
index 6697094..59a081a 100644
--- a/sw/source/core/undo/SwUndoField.cxx
+++ b/sw/source/core/undo/SwUndoField.cxx
@@ -85,7 +85,7 @@ SwUndoFieldFromDoc::~SwUndoFieldFromDoc()
void SwUndoFieldFromDoc::UndoImpl(::sw::UndoRedoContext &)
{
SwTxtFld * pTxtFld = SwDoc::GetTxtFld(GetPosition());
- const SwField * pField = pTxtFld->GetFld().GetFld();
+ const SwField * pField = pTxtFld->GetFmtFld().GetField();
if (pField)
{
@@ -96,14 +96,14 @@ void SwUndoFieldFromDoc::UndoImpl(::sw::UndoRedoContext &)
void SwUndoFieldFromDoc::DoImpl()
{
SwTxtFld * pTxtFld = SwDoc::GetTxtFld(GetPosition());
- const SwField * pField = pTxtFld->GetFld().GetFld();
+ const SwField * pField = pTxtFld->GetFmtFld().GetField();
if (pField)
{
pDoc->UpdateFld(pTxtFld, *pNewField, pHnt, bUpdate);
- SwFmtFld* pDstFmtFld = (SwFmtFld*)&pTxtFld->GetFld();
+ SwFmtFld* pDstFmtFld = (SwFmtFld*)&pTxtFld->GetFmtFld();
- if ( pDoc->GetFldType(RES_POSTITFLD, aEmptyStr,false) == pDstFmtFld->GetFld()->GetTyp() )
+ if ( pDoc->GetFldType(RES_POSTITFLD, aEmptyStr,false) == pDstFmtFld->GetField()->GetTyp() )
pDoc->GetDocShell()->Broadcast( SwFmtFldHint( pDstFmtFld, SWFMTFLD_INSERTED ) );
}
}
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index f2f9443..386211f9 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -266,20 +266,20 @@ void SwHistorySetTxt::SetInDoc( SwDoc* pDoc, bool )
SwHistorySetTxtFld::SwHistorySetTxtFld( SwTxtFld* pTxtFld, sal_uLong nNodePos )
: SwHistoryHint( HSTRY_SETTXTFLDHNT )
, m_pFldType( 0 )
- , m_pFld( new SwFmtFld( *pTxtFld->GetFld().GetFld() ) )
+ , m_pFld( new SwFmtFld( *pTxtFld->GetFmtFld().GetField() ) )
{
// only copy if not Sys-FieldType
SwDoc* pDoc = pTxtFld->GetTxtNode().GetDoc();
- m_nFldWhich = m_pFld->GetFld()->GetTyp()->Which();
+ m_nFldWhich = m_pFld->GetField()->GetTyp()->Which();
if (m_nFldWhich == RES_DBFLD ||
m_nFldWhich == RES_USERFLD ||
m_nFldWhich == RES_SETEXPFLD ||
m_nFldWhich == RES_DDEFLD ||
!pDoc->GetSysFldType( m_nFldWhich ))
{
- m_pFldType.reset( m_pFld->GetFld()->GetTyp()->Copy() );
- m_pFld->GetFld()->ChgTyp( m_pFldType.get() ); // change field type
+ m_pFldType.reset( m_pFld->GetField()->GetTyp()->Copy() );
+ m_pFld->GetField()->ChgTyp( m_pFldType.get() ); // change field type
}
m_nNodeIndex = nNodePos;
m_nPos = *pTxtFld->GetStart();
@@ -287,7 +287,7 @@ SwHistorySetTxtFld::SwHistorySetTxtFld( SwTxtFld* pTxtFld, sal_uLong nNodePos )
String SwHistorySetTxtFld::GetDescription() const
{
- return m_pFld->GetFld()->GetDescription();;
+ return m_pFld->GetField()->GetDescription();;
}
SwHistorySetTxtFld::~SwHistorySetTxtFld()
@@ -311,7 +311,7 @@ void SwHistorySetTxtFld::SetInDoc( SwDoc* pDoc, bool )
pNewFldType = pDoc->InsertFldType( *m_pFldType );
}
- m_pFld->GetFld()->ChgTyp( pNewFldType ); // change field type
+ m_pFld->GetField()->ChgTyp( pNewFldType ); // change field type
SwTxtNode * pTxtNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTxtNode();
ASSERT( pTxtNd, "SwHistorySetTxtFld: no TextNode" );
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 3185d44..c53a8e6 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -382,8 +382,8 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
{
if( pAny )
{
- SwXTextField* pField = SwXTextField::CreateSwXTextField(*rPam.GetDoc(),
- pTxtAttr->GetFld());
+ SwXTextField* pField =
+ SwXTextField::CreateSwXTextField( *rPam.GetDoc(),pTxtAttr->GetFmtFld() );
*pAny <<= uno::Reference< XTextField >( pField );
}
}
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index b07b585..363096c 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1002,7 +1002,7 @@ OUString SwXFieldMaster::LocalizeFormula(
SwXTextField* SwXTextField::CreateSwXTextField(SwDoc & rDoc, SwFmtFld const& rFmt)
{
- SwIterator<SwXTextField,SwFieldType> aIter(*rFmt.GetFld()->GetTyp());
+ SwIterator<SwXTextField,SwFieldType> aIter(*rFmt.GetField()->GetTyp());
SwXTextField * pField = 0;
SwXTextField * pTemp = aIter.First();
while (pTemp)
@@ -1116,7 +1116,7 @@ SwXTextField::SwXTextField(const SwFmtFld& rFmt, SwDoc* pDc) :
m_pTextObject(0),
m_bIsDescriptor(sal_False),
m_bCallUpdate(sal_False),
- m_nServiceId( lcl_GetServiceForField( *pFmtFld->GetFld() ) ),
+ m_nServiceId( lcl_GetServiceForField( *pFmtFld->GetField() ) ),
m_pProps(0)
{
pDc->GetUnoCallBack()->Add(this);
@@ -1168,7 +1168,7 @@ uno::Reference< beans::XPropertySet > SwXTextField::getTextFieldMaster(void) th
{
if(!GetRegisteredIn())
throw uno::RuntimeException();
- pType = pFmtFld->GetFld()->GetTyp();
+ pType = pFmtFld->GetField()->GetTyp();
}
SwXFieldMaster* pMaster = SwIterator<SwXFieldMaster,SwFieldType>::FirstElement( *pType );
@@ -1748,7 +1748,7 @@ void SwXTextField::attachToRange(
// was passiert mit dem Update der Felder ? (siehe fldmgr.cxx)
if(pTxtAttr)
{
- const SwFmtFld& rFld = pTxtAttr->GetFld();
+ const SwFmtFld& rFld = pTxtAttr->GetFmtFld();
pFmtFld = &rFld;
}
}
@@ -2366,8 +2366,10 @@ void SwXTextField::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
const SwField* SwXTextField::GetField() const
{
- if(GetRegisteredIn() && pFmtFld)
- return pFmtFld->GetFld();
+ if ( GetRegisteredIn() && pFmtFld )
+ {
+ return pFmtFld->GetField();
+ }
return 0;
}
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 78e3f76..edd2952 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -757,7 +757,7 @@ lcl_ExportHints(
xRef = pPortion = new SwXTextPortion(
pUnoCrsr, xParent, PORTION_FIELD);
Reference<XTextField> xField =
- SwXTextField::CreateSwXTextField(*pDoc, pAttr->GetFld());
+ SwXTextField::CreateSwXTextField(*pDoc, pAttr->GetFmtFld());
pPortion->SetTextField(xField);
}
break;
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 9d4b88e..13d8e2b 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2167,7 +2167,7 @@ lcl_ApplyCellProperties(
{
xCellPS->setPropertyValue(rName, rValue);
}
- catch (uno::Exception const& e)
+ catch (uno::Exception const& )
{
// Apply the paragraph and char properties to the cell's content
const uno::Reference< text::XText > xCellText(xCell,
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 19a5dbd..018a41f 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -666,10 +666,13 @@ sal_Bool ViewShell::IsAnyFieldInDoc() const
{
const SwFmtFld* pFmtFld = (SwFmtFld*)pItem;
const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
- //#i101026# mod: do not include postits in field check
- const SwField* pFld = pFmtFld->GetFld();
- if( pTxtFld && pTxtFld->GetTxtNode().GetNodes().IsDocNodes() && (pFld->Which() != RES_POSTITFLD))
+ // do not include postits in field check
+ const SwField* pFld = pFmtFld->GetField();
+ if( pTxtFld && pTxtFld->GetTxtNode().GetNodes().IsDocNodes()
+ && (pFld->Which() != RES_POSTITFLD))
+ {
return sal_True;
+ }
}
return sal_False;
}
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx
index 40fbe86..bbba284 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -120,8 +120,8 @@ sal_Bool SwASC_AttrIter::OutAttr( xub_StrLen nSwPos )
switch( pHt->Which() )
{
case RES_TXTATR_FIELD:
- sOut = static_cast<SwTxtFld const*>(pHt)->GetFld().GetFld()
- ->ExpandField(true);
+ sOut =
+ static_cast<SwTxtFld const*>(pHt)->GetFmtFld().GetField()->ExpandField(true);
break;
case RES_TXTATR_FTN:
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index f73c10c..910b661 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -2588,7 +2588,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
pTxtHt = pHt;
sal_uInt16 nFldWhich;
if( RES_TXTATR_FIELD != pHt->Which() ||
- ( RES_POSTITFLD != (nFldWhich = ((const SwFmtFld&)pHt->GetAttr()).GetFld()->Which()) &&
+ ( RES_POSTITFLD != (nFldWhich = ((const SwFmtFld&)pHt->GetAttr()).GetField()->Which()) &&
RES_SCRIPTFLD != nFldWhich ) )
bWriteBreak = sal_False;
}
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index 423ca263..5e9edb2 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -643,8 +643,7 @@ void SwHTMLParser::InsertComment( const String& rComment, const sal_Char *pTag )
break;
if( RES_TXTATR_FIELD == pAttr->pItem->Which() &&
- RES_SCRIPTFLD == ((const SwFmtFld *)pAttr->pItem)->GetFld()
- ->GetTyp()->Which() )
+ RES_SCRIPTFLD == ((const SwFmtFld *)pAttr->pItem)->GetField()->GetTyp()->Which() )
{
bMoveFwd = sal_False;
break;
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 5d7908a..8d82456 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -422,7 +422,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
{
SwFmtFld & rFld = (SwFmtFld&)rHt;
- const SwField* pFld = rFld.GetFld();
+ const SwField* pFld = rFld.GetField();
const SwFieldType* pFldTyp = pFld->GetTyp();
if( RES_SETEXPFLD == pFldTyp->Which() &&
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 0cb1cbf..fc835a5 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -2778,8 +2778,9 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable,
case RES_TXTATR_FIELD:
{
sal_uInt16 nFldWhich =
- pPostIts ? ((const SwFmtFld *)pAttr->pItem)
- ->GetFld()->GetTyp()->Which() : 0;
+ pPostIts
+ ? ((const SwFmtFld *)pAttr->pItem)->GetField()->GetTyp()->Which()
+ : 0;
if( pPostIts && (RES_POSTITFLD == nFldWhich ||
RES_SCRIPTFLD == nFldWhich) )
{
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index bad5aac..14bd9bd 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -897,8 +897,8 @@ sal_uInt16 SwHTMLWriter::OutHeaderAttrs()
if( nPos-nOldPos > 1 || RES_TXTATR_FIELD != pHt->Which() )
break;
- sal_uInt16 nFldWhich = ((const SwFmtFld&)pHt->GetAttr()).GetFld()
- ->GetTyp()->Which();
+ const sal_uInt16 nFldWhich =
+ ((const SwFmtFld&)pHt->GetAttr()).GetField()->GetTyp()->Which();
if( RES_POSTITFLD!=nFldWhich &&
RES_SCRIPTFLD!=nFldWhich )
break;
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx
index cb5d471..408f261 100644
--- a/sw/source/filter/rtf/rtffld.cxx
+++ b/sw/source/filter/rtf/rtffld.cxx
@@ -1056,7 +1056,7 @@ void SwRTFParser::ReadField()
if (pFldAttr)
{
- const SwField *pFld = pFldAttr->GetFld().GetFld();
+ const SwField *pFld = pFldAttr->GetFmtFld().GetField();
SwFieldType *pTyp = pFld ? pFld->GetTyp() : 0;
ASSERT(pTyp->Which() == RES_USERFLD, "expected a user field");
if (pTyp->Which() == RES_USERFLD)
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index cabe0ae..2c66db6 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -878,13 +878,13 @@ bool MSWordExportBase::HasRefToObject( sal_uInt16 nTyp, const String* pName, sal
SwFieldType* pType = pDoc->GetSysFldType( RES_GETREFFLD );
SwIterator<SwFmtFld, SwFieldType> aFmtFlds( *pType );
- for ( SwFmtFld* pFld = aFmtFlds.First(); pFld; pFld = aFmtFlds.Next() )
+ for ( SwFmtFld* pFmtFld = aFmtFlds.First(); pFmtFld; pFmtFld = aFmtFlds.Next() )
{
- if ( pFld->GetTxtFld() && nTyp == pFld->GetFld()->GetSubType() &&
- 0 != ( pNd = pFld->GetTxtFld()->GetpTxtNode() ) &&
+ if ( pFmtFld->GetTxtFld() && nTyp == pFmtFld->GetField()->GetSubType() &&
+ 0 != ( pNd = pFmtFld->GetTxtFld()->GetpTxtNode() ) &&
pNd->GetNodes().IsDocNodes() )
{
- const SwGetRefField& rRFld = *static_cast< SwGetRefField* >( pFld->GetFld() );
+ const SwGetRefField& rRFld = *static_cast< SwGetRefField* >( pFmtFld->GetField() );
switch ( nTyp )
{
case REF_BOOKMARK:
@@ -2616,7 +2616,7 @@ void WW8AttributeOutput::WriteExpand( const SwField* pFld )
void AttributeOutputBase::TextField( const SwFmtFld& rField )
{
- const SwField* pFld = rField.GetFld();
+ const SwField* pFld = rField.GetField();
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list