sw/source/core/doc/DocumentLayoutManager.cxx | 2 +- sw/source/uibase/app/docstyle.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit f01c61a70dca72e4e66f0e6f9df5c2ad52bb778f Author: Katarina Behrens <katarina.behr...@cib.de> Date: Wed Apr 29 10:16:19 2015 +0200 tdf#89783: avoid endless loop with >65k style names Change-Id: I09be0ade1cd66253f420c2158ef6c093758ca493 diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 1b9c81c..549cd54 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -2969,7 +2969,7 @@ void SwStyleSheetIterator::AppendStyleList(const ::std::vector<OUString>& rList, { SwDoc& rDoc = static_cast<SwDocStyleSheetPool*>(pBasePool)->GetDoc(); bool bUsed = false; - for ( sal_uInt16 i=0; i < rList.size(); ++i ) + for ( size_t i=0; i < rList.size(); ++i ) { bool bHidden = false; sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(rList[i], (SwGetPoolIdFromName)nSection); commit 1fe1fb546889d824b7331ca0f4731fdf58aea829 Author: Katarina Behrens <katarina.behr...@cib.de> Date: Wed Apr 29 10:13:18 2015 +0200 tdf#89783: fix another potential endless loop the same pattern as in 4de83e2c322509c0fb1b989f7e4898728fc4a Change-Id: I38d48b9c1302f23a0d2537f8e5eced2ee64ddf4e diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx index 88fabca..fbb2646 100644 --- a/sw/source/core/doc/DocumentLayoutManager.cxx +++ b/sw/source/core/doc/DocumentLayoutManager.cxx @@ -265,7 +265,7 @@ void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt ) std::vector<SwFrmFmt*> aToDeleteFrmFmts; const sal_uLong nNodeIdxOfFlyFmt( pCntntIdx->GetIndex() ); - for ( sal_uInt16 i = 0; i < pTbl->size(); ++i ) + for ( size_t i = 0; i < pTbl->size(); ++i ) { SwFrmFmt* pTmpFmt = (*pTbl)[i]; const SwFmtAnchor &rAnch = pTmpFmt->GetAnchor(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits