diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-07-22 16:15:56 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-07-22 23:50:43 +0200 |
| commit | 1a6bc665eb727763265483132db43aee87288deb (patch) | |
| tree | 94dcf75f7714e598ea1fae9495e7bb339a3b8931 /sw/source | |
| parent | 6f6c8a045c5983658666b4df0a5eb02df3c9d1df (diff) | |
SwpHintsArray/SwpHints to size_t: fixes after failed local merge
Change-Id: I6617770fbca7316396639b6d5778bbdcbb208337
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/doc/DocumentContentOperationsManager.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index be6ef44e1033..70221d1f0bb3 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -895,8 +895,8 @@ namespace if( pHints && pHints->HasFtn() ) //...with footnotes { bUpdateFtn = true; // Heureka - sal_uInt16 nCount = pHints->Count(); - for( sal_uInt16 i = 0; i < nCount; ++i ) + const size_t nCount = pHints->Count(); + for( size_t i = 0; i < nCount; ++i ) { SwTxtAttr *pAttr = pHints->GetTextHint( i ); if ( pAttr->Which() == RES_TXTATR_FTN ) @@ -2303,7 +2303,7 @@ bool DocumentContentOperationsManager::Overwrite( const SwPaM &rRg, const OUStri m_rSwdoc.GetIDocumentUndoRedo().ClearRedo(); // AppendUndo not always called } - sal_uInt16 nOldAttrCnt = pNode->GetpSwpHints() + const size_t nOldAttrCnt = pNode->GetpSwpHints() ? pNode->GetpSwpHints()->Count() : 0; SwDataChanged aTmp( rRg ); SwIndex& rIdx = rPt.nContent; @@ -2357,7 +2357,7 @@ bool DocumentContentOperationsManager::Overwrite( const SwPaM &rRg, const OUStri } pNode->SetIgnoreDontExpand( bOldExpFlg ); - sal_uInt16 nNewAttrCnt = pNode->GetpSwpHints() + const size_t nNewAttrCnt = pNode->GetpSwpHints() ? pNode->GetpSwpHints()->Count() : 0; if( nOldAttrCnt != nNewAttrCnt ) { @@ -3572,7 +3572,7 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam) { const sal_Int32 *pEndIdx; const sal_Int32 nMkCntPos = rPam.GetMark()->nContent.GetIndex(); - for( sal_uInt16 n = pHts->Count(); n; ) + for( size_t n = pHts->Count(); n; ) { const SwTxtAttr* pAttr = (*pHts)[ --n ]; if( nMkCntPos > pAttr->GetStart() ) |