summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/inc/editsh.hxx2
-rw-r--r--sw/inc/expfld.hxx10
-rw-r--r--sw/inc/ftnidx.hxx2
-rw-r--r--sw/source/core/crsr/trvlfnfl.cxx6
-rw-r--r--sw/source/core/doc/DocumentContentOperationsManager.cxx12
-rw-r--r--sw/source/core/doc/docftn.cxx14
-rw-r--r--sw/source/core/doc/ftnidx.cxx28
-rw-r--r--sw/source/core/docnode/ndsect.cxx2
-rw-r--r--sw/source/core/edit/edattr.cxx6
-rw-r--r--sw/source/core/fields/expfld.cxx11
-rw-r--r--sw/source/core/text/txtfrm.cxx2
-rw-r--r--sw/source/core/undo/undobj.cxx2
-rw-r--r--sw/source/ui/fldui/fldref.cxx18
13 files changed, 60 insertions, 55 deletions
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 60f0f2d7a053..e9a5a343be9b 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -802,7 +802,7 @@ public:
bool SetCurFtn( const SwFmtFtn& rFillFtn );
bool HasFtns( bool bEndNotes = false ) const;
- sal_uInt16 GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes = false );
+ size_t GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes = false );
/// @return list of all footnotes and their first portions of text.
SwSection const* InsertSection(
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 071967e0dd18..ff324a831fc7 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -62,11 +62,11 @@ public:
}
bool InsertSort(_SeqFldLstElem* pNew);
- bool SeekEntry(const _SeqFldLstElem& rNew, sal_uInt16* pPos) const;
+ bool SeekEntry(const _SeqFldLstElem& rNew, size_t* pPos) const;
- sal_uInt16 Count() { return maData.size(); }
- _SeqFldLstElem* operator[](sal_uInt16 nIndex) { return maData[nIndex]; }
- const _SeqFldLstElem* operator[](sal_uInt16 nIndex) const { return maData[nIndex]; }
+ size_t Count() { return maData.size(); }
+ _SeqFldLstElem* operator[](size_t nIndex) { return maData[nIndex]; }
+ const _SeqFldLstElem* operator[](size_t nIndex) const { return maData[nIndex]; }
void Clear() { maData.clear(); }
};
@@ -177,7 +177,7 @@ public:
sal_uInt16 SetSeqRefNo( SwSetExpField& rFld );
- sal_uInt16 GetSeqFldList( SwSeqFldList& rList );
+ size_t GetSeqFldList( SwSeqFldList& rList );
OUString MakeSeqName( sal_uInt16 nSeqNo );
/// Number sequence fields chapterwise if required.
diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx
index 8c08be3b2e64..ee695e18ff06 100644
--- a/sw/inc/ftnidx.hxx
+++ b/sw/inc/ftnidx.hxx
@@ -45,7 +45,7 @@ public:
void UpdateFtn( const SwNodeIndex& rStt ); // Update all from pos.
void UpdateAllFtn(); // Update all footnotes.
- SwTxtFtn* SeekEntry( const SwNodeIndex& rIdx, sal_uInt16* pPos = 0 ) const;
+ SwTxtFtn* SeekEntry( const SwNodeIndex& rIdx, size_t* pPos = 0 ) const;
};
class SwUpdFtnEndNtAtEnd
diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx
index dc220d9eae3d..d9c7cd35e7dc 100644
--- a/sw/source/core/crsr/trvlfnfl.cxx
+++ b/sw/source/core/crsr/trvlfnfl.cxx
@@ -130,7 +130,7 @@ bool SwCursor::GotoFtnAnchor()
// search in all footnotes in document for this StartIndex
const SwTxtFtn* pTxtFtn;
const SwFtnIdxs& rFtnArr = pSttNd->GetDoc()->GetFtnIdxs();
- for( sal_uInt16 n = 0; n < rFtnArr.size(); ++n )
+ for( size_t n = 0; n < rFtnArr.size(); ++n )
if( 0 != ( pTxtFtn = rFtnArr[ n ])->GetStartNode() &&
pSttNd == &pTxtFtn->GetStartNode()->GetNode() )
{
@@ -178,7 +178,7 @@ bool SwCursor::GotoNextFtnAnchor()
{
const SwFtnIdxs& rFtnArr = GetDoc()->GetFtnIdxs();
const SwTxtFtn* pTxtFtn = 0;
- sal_uInt16 nPos;
+ size_t nPos = 0;
if( rFtnArr.SeekEntry( GetPoint()->nNode, &nPos ))
{
@@ -237,7 +237,7 @@ bool SwCursor::GotoPrevFtnAnchor()
{
const SwFtnIdxs& rFtnArr = GetDoc()->GetFtnIdxs();
const SwTxtFtn* pTxtFtn = 0;
- sal_uInt16 nPos;
+ size_t nPos = 0;
if( rFtnArr.SeekEntry( GetPoint()->nNode, &nPos ) )
{
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 49bbef118b32..4bbe194c6de6 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -85,7 +85,7 @@ namespace
{
const SwFrmFmts& rFrmFmtTbl = *pDoc->GetSpzFrmFmts();
- for( sal_uInt16 n = 0; n < rFrmFmtTbl.size(); ++n )
+ for( size_t n = 0; n < rFrmFmtTbl.size(); ++n )
{
SwFrmFmt const*const pFmt = rFrmFmtTbl[n];
SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
@@ -815,7 +815,7 @@ namespace
if( !rFtnArr.empty() )
{
- sal_uInt16 nPos;
+ size_t nPos = 0;
rFtnArr.SeekEntry( rSttNd, &nPos );
SwTxtFtn* pSrch;
const SwNode* pFtnNd;
@@ -1849,7 +1849,7 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam )
// What's with Flys?
{
// If there are FlyFrames left, delete these too
- for( sal_uInt16 n = 0; n < m_rSwdoc.GetSpzFrmFmts()->size(); ++n )
+ for( size_t n = 0; n < m_rSwdoc.GetSpzFrmFmts()->size(); ++n )
{
SwFrmFmt* pFly = (*m_rSwdoc.GetSpzFrmFmts())[n];
const SwFmtAnchor* pAnchor = &pFly->GetAnchor();
@@ -2222,7 +2222,7 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
if( !aSavRedlInsPosArr.empty() )
{
SwNode* pNewNd = &aIdx.GetNode();
- for( sal_uInt16 n = 0; n < aSavRedlInsPosArr.size(); ++n )
+ for( size_t n = 0; n < aSavRedlInsPosArr.size(); ++n )
{
SwRangeRedline* pTmp = aSavRedlInsPosArr[ n ];
if( m_rSwdoc.getIDocumentRedlineAccess().GetRedlineTbl().Contains( pTmp ) )
@@ -3180,13 +3180,13 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
// managed in the DrawModel).
SwDoc *const pDest = rStartIdx.GetNode().GetDoc();
::std::set< _ZSortFly > aSet;
- sal_uInt16 nArrLen = m_rSwdoc.GetSpzFrmFmts()->size();
+ const size_t nArrLen = m_rSwdoc.GetSpzFrmFmts()->size();
SwTextBoxHelper::SavedLink aOldTextBoxes;
SwTextBoxHelper::saveLinks(*m_rSwdoc.GetSpzFrmFmts(), aOldTextBoxes);
SwTextBoxHelper::SavedContent aOldContent;
- for ( sal_uInt16 n = 0; n < nArrLen; ++n )
+ for ( size_t n = 0; n < nArrLen; ++n )
{
SwFrmFmt* pFmt = (*m_rSwdoc.GetSpzFrmFmts())[n];
SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index 8814552e3041..e9fbc4e17665 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -186,7 +186,7 @@ void SwEndNoteInfo::SetAnchorCharFmt( SwCharFmt* pChFmt )
void SwEndNoteInfo::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
{
- sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0 ;
+ const sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0 ;
if( RES_ATTRSET_CHG == nWhich ||
RES_FMT_CHG == nWhich )
@@ -197,7 +197,7 @@ void SwEndNoteInfo::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
else
pDoc = ((SwCharFmt*)aAnchorCharFmtDep.GetRegisteredIn())->GetDoc();
SwFtnIdxs& rFtnIdxs = pDoc->GetFtnIdxs();
- for( sal_uInt16 nPos = 0; nPos < rFtnIdxs.size(); ++nPos )
+ for( size_t nPos = 0; nPos < rFtnIdxs.size(); ++nPos )
{
SwTxtFtn *pTxtFtn = rFtnIdxs[ nPos ];
const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
@@ -290,7 +290,7 @@ void SwDoc::SetFtnInfo(const SwFtnInfo& rInfo)
// For messages regarding ErgoSum etc. we save the extra code and use the
// available methods.
SwFtnIdxs& rFtnIdxs = GetFtnIdxs();
- for( sal_uInt16 nPos = 0; nPos < rFtnIdxs.size(); ++nPos )
+ for( size_t nPos = 0; nPos < rFtnIdxs.size(); ++nPos )
{
SwTxtFtn *pTxtFtn = rFtnIdxs[ nPos ];
const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
@@ -359,7 +359,7 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo)
// For messages regarding ErgoSum etc. we save the extra code and use the
// available methods.
SwFtnIdxs& rFtnIdxs = GetFtnIdxs();
- for( sal_uInt16 nPos = 0; nPos < rFtnIdxs.size(); ++nPos )
+ for( size_t nPos = 0; nPos < rFtnIdxs.size(); ++nPos )
{
SwTxtFtn *pTxtFtn = rFtnIdxs[ nPos ];
const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
@@ -398,7 +398,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const OUString& rNumStr,
const sal_uLong nEndNd = pEnd->nNode.GetIndex();
const sal_Int32 nEndCnt = pEnd->nContent.GetIndex();
- sal_uInt16 nPos;
+ size_t nPos = 0;
rFtnArr.SeekEntry( pStt->nNode, &nPos );
SwUndoChangeFootNote* pUndo = 0;
@@ -412,7 +412,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const OUString& rNumStr,
sal_uLong nIdx;
bool bChg = false;
bool bTypeChgd = false;
- sal_uInt16 n = nPos; // save
+ const size_t nPosSave = nPos;
while( nPos < rFtnArr.size() &&
(( nIdx = _SwTxtFtn_GetIndex((pTxtFtn = rFtnArr[ nPos++ ] )))
< nEndNd || ( nIdx == nEndNd &&
@@ -442,7 +442,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const OUString& rNumStr,
}
}
- nPos = n; // There are more in the front!
+ nPos = nPosSave; // There are more in the front!
while( nPos &&
(( nIdx = _SwTxtFtn_GetIndex((pTxtFtn = rFtnArr[ --nPos ] )))
> nSttNd || ( nIdx == nSttNd &&
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index c0b57cdad171..fd8fa56c07b8 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -60,9 +60,9 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
if( !rOutlNds.empty() )
{
// Find the Chapter's start, which contains rStt
- sal_uInt16 n;
+ size_t n = 0;
- for( n = 0; n < rOutlNds.size(); ++n )
+ for( ; n < rOutlNds.size(); ++n )
if( rOutlNds[ n ]->GetIndex() > rStt.GetIndex() )
break; // found it!
else if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 )
@@ -76,7 +76,8 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
}
}
- sal_uInt16 nPos, nFtnNo = 1;
+ size_t nPos = 0;
+ size_t nFtnNo = 1;
if( SeekEntry( *pCapStt, &nPos ) && nPos )
{
// Step forward until the Index is not the same anymore
@@ -112,7 +113,9 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
// unless we have per-document numbering, only look at endnotes here
const bool bEndNoteOnly = FTNNUM_DOC != rFtnInfo.eNum;
- sal_uInt16 nPos, nFtnNo = 1, nEndNo = 1;
+ size_t nPos;
+ size_t nFtnNo = 1;
+ size_t nEndNo = 1;
sal_uLong nUpdNdIdx = rStt.GetIndex();
for( nPos = 0; nPos < size(); ++nPos )
{
@@ -174,9 +177,9 @@ void SwFtnIdxs::UpdateAllFtn()
if( FTNNUM_CHAPTER == rFtnInfo.eNum )
{
const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds();
- sal_uInt16 nNo = 1, // Number for the Footnotes
- nFtnIdx = 0; // Index into theFtnIdx array
- for( sal_uInt16 n = 0; n < rOutlNds.size(); ++n )
+ sal_uInt16 nNo = 1; // Number for the Footnotes
+ size_t nFtnIdx = 0; // Index into theFtnIdx array
+ for( size_t n = 0; n < rOutlNds.size(); ++n )
{
if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 )
{
@@ -217,7 +220,7 @@ void SwFtnIdxs::UpdateAllFtn()
// We use bool here, so that we also iterate through the Endnotes with a chapter setting.
const bool bEndNoteOnly = FTNNUM_DOC != rFtnInfo.eNum;
sal_uInt16 nFtnNo = 0, nEndNo = 0;
- for( sal_uInt16 nPos = 0; nPos < size(); ++nPos )
+ for( size_t nPos = 0; nPos < size(); ++nPos )
{
pTxtFtn = (*this)[ nPos ];
const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
@@ -240,17 +243,18 @@ void SwFtnIdxs::UpdateAllFtn()
std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFtnNums));
}
-SwTxtFtn* SwFtnIdxs::SeekEntry( const SwNodeIndex& rPos, sal_uInt16* pFndPos ) const
+SwTxtFtn* SwFtnIdxs::SeekEntry( const SwNodeIndex& rPos, size_t* pFndPos ) const
{
sal_uLong nIdx = rPos.GetIndex();
- sal_uInt16 nO = size(), nM, nU = 0;
+ size_t nO = size();
+ size_t nU = 0;
if( nO > 0 )
{
nO--;
while( nU <= nO )
{
- nM = nU + ( nO - nU ) / 2;
+ const size_t nM = nU + ( nO - nU ) / 2;
sal_uLong nNdIdx = _SwTxtFtn_GetIndex( (*this)[ nM ] );
if( nNdIdx == nIdx )
{
@@ -310,7 +314,7 @@ sal_uInt16 SwUpdFtnEndNtAtEnd::GetNumber( const SwTxtFtn& rTxtFtn,
nWh = RES_FTN_AT_TXTEND;
}
- for( sal_uInt16 n = pArr->size(); n; )
+ for( size_t n = pArr->size(); n; )
if( (*pArr)[ --n ] == &rNd )
{
nRet = ++((*pNum)[ n ]);
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index db469f6a7f19..f8680b44b61d 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -752,7 +752,7 @@ void sw_DeleteFtn( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd )
SwFtnIdxs& rFtnArr = pNd->GetDoc()->GetFtnIdxs();
if( rFtnArr.size() )
{
- sal_uInt16 nPos;
+ size_t nPos = 0;
rFtnArr.SeekEntry( SwNodeIndex( *pNd ), &nPos );
SwTxtFtn* pSrch;
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 1c0ac183b1b5..4cf668780d66 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -330,13 +330,13 @@ bool SwEditShell::HasFtns( bool bEndNotes ) const
}
/// Give a List of all footnotes and their beginning texts
-sal_uInt16 SwEditShell::GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes )
+size_t SwEditShell::GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes )
{
rList.Clear();
- sal_uInt16 n, nFtnCnt = mpDoc->GetFtnIdxs().size();
+ const size_t nFtnCnt = mpDoc->GetFtnIdxs().size();
SwTxtFtn* pTxtFtn;
- for( n = 0; n < nFtnCnt; ++n )
+ for( size_t n = 0; n < nFtnCnt; ++n )
{
pTxtFtn = mpDoc->GetFtnIdxs()[ n ];
const SwFmtFtn& rFtn = pTxtFtn->GetFtn();
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 46c06207cc7e..24e58f138167 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -576,7 +576,7 @@ sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rFld )
return n;
}
-sal_uInt16 SwSetExpFieldType::GetSeqFldList( SwSeqFldList& rList )
+size_t SwSetExpFieldType::GetSeqFldList( SwSeqFldList& rList )
{
rList.Clear();
@@ -699,16 +699,17 @@ bool SwSeqFldList::InsertSort( _SeqFldLstElem* pNew )
}
pNew->sDlgEntry = aBuf.makeStringAndClear();
- sal_uInt16 nPos;
+ size_t nPos = 0;
bool bRet = SeekEntry( *pNew, &nPos );
if( !bRet )
maData.insert( maData.begin() + nPos, pNew );
return bRet;
}
-bool SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, sal_uInt16* pP ) const
+bool SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, size_t* pP ) const
{
- sal_uInt16 nO = maData.size(), nM, nU = 0;
+ size_t nO = maData.size();
+ size_t nU = 0;
if( nO > 0 )
{
CollatorWrapper & rCaseColl = ::GetAppCaseCollator(),
@@ -725,7 +726,7 @@ bool SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, sal_uInt16* pP ) const
nO--;
while( nU <= nO )
{
- nM = nU + ( nO - nU ) / 2;
+ const size_t nM = nU + ( nO - nU ) / 2;
//#59900# Sorting should sort number correctly (e.g. "10" after "9" not after "1")
const OUString rTmp1 = maData[nM]->sDlgEntry;
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 015d24612b9e..a1d8f86435a9 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -377,7 +377,7 @@ SwTxtFrm::~SwTxtFrm()
{
SwTxtNode *pTxtNd = ((SwTxtFrm*)this)->GetTxtNode();
const SwFtnIdxs &rFtnIdxs = pCNd->GetDoc()->GetFtnIdxs();
- sal_uInt16 nPos;
+ size_t nPos = 0;
sal_uLong nIndex = pCNd->GetIndex();
rFtnIdxs.SeekEntry( *pTxtNd, &nPos );
SwTxtFtn* pTxtFtn;
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 6c94f665abca..4eeccd4b0e92 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -490,7 +490,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark,
if( !rFtnArr.empty() )
{
const SwNode* pFtnNd;
- sal_uInt16 nPos;
+ size_t nPos = 0;
rFtnArr.SeekEntry( pStt->nNode, &nPos );
SwTxtFtn* pSrch;
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 031b6308c6e0..f9f3fb479a62 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -492,9 +492,9 @@ void SwFldRefPage::UpdateSubType()
{
m_pSelectionLB->SetStyle(m_pSelectionLB->GetStyle() & ~WB_SORT);
SwSeqFldList aArr;
- const sal_uInt16 nCnt = pSh->GetSeqFtnList( aArr );
+ const size_t nCnt = pSh->GetSeqFtnList( aArr );
- for( sal_uInt16 n = 0; n < nCnt; ++n )
+ for( size_t n = 0; n < nCnt; ++n )
{
m_pSelectionLB->InsertEntry( aArr[ n ]->sDlgEntry );
if (IsFldEdit() && pRefFld->GetSeqNo() == aArr[ n ]->nSeqNo)
@@ -505,9 +505,9 @@ void SwFldRefPage::UpdateSubType()
{
m_pSelectionLB->SetStyle(m_pSelectionLB->GetStyle() & ~WB_SORT);
SwSeqFldList aArr;
- const sal_uInt16 nCnt = pSh->GetSeqFtnList( aArr, true );
+ const size_t nCnt = pSh->GetSeqFtnList( aArr, true );
- for( sal_uInt16 n = 0; n < nCnt; ++n )
+ for( size_t n = 0; n < nCnt; ++n )
{
m_pSelectionLB->InsertEntry( aArr[ n ]->sDlgEntry );
if (IsFldEdit() && pRefFld->GetSeqNo() == aArr[ n ]->nSeqNo)
@@ -585,8 +585,8 @@ void SwFldRefPage::UpdateSubType()
if(IsFldEdit())
sOldSel = "";
- const sal_uInt16 nCnt = pType->GetSeqFldList( aArr );
- for( sal_uInt16 n = 0; n < nCnt; ++n )
+ const size_t nCnt = pType->GetSeqFldList( aArr );
+ for( size_t n = 0; n < nCnt; ++n )
{
m_pSelectionLB->InsertEntry( aArr[ n ]->sDlgEntry );
if (IsFldEdit() && sOldSel.isEmpty() &&
@@ -808,7 +808,7 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* )
SwSeqFldList aArr;
_SeqFldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 );
- sal_uInt16 nPos;
+ size_t nPos = 0;
nTypeId = TYP_GETREFFLD;
nSubType = REF_FOOTNOTE;
@@ -829,7 +829,7 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* )
SwSeqFldList aArr;
_SeqFldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 );
- sal_uInt16 nPos;
+ size_t nPos = 0;
nTypeId = TYP_GETREFFLD;
nSubType = REF_ENDNOTE;
@@ -898,7 +898,7 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* )
SwSeqFldList aArr;
_SeqFldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 );
- sal_uInt16 nPos;
+ size_t nPos = 0;
nTypeId = TYP_GETREFFLD;
nSubType = REF_SEQUENCEFLD;