Kaydet (Commit) 93e97e83 authored tarafından Matteo Casalin's avatar Matteo Casalin

sal_uInt16 to size_t

Change-Id: Ide8913930f9f951039cefecf71609c5a2bcc5e82
üst 1577d931
...@@ -91,7 +91,7 @@ void SwDoc::DoUpdateAllCharts() ...@@ -91,7 +91,7 @@ void SwDoc::DoUpdateAllCharts()
if( pVSh ) if( pVSh )
{ {
const SwFrmFmts& rTblFmts = *GetTblFrmFmts(); const SwFrmFmts& rTblFmts = *GetTblFrmFmts();
for( sal_uInt16 n = 0; n < rTblFmts.size(); ++n ) for( size_t n = 0; n < rTblFmts.size(); ++n )
{ {
SwTable* pTmpTbl; SwTable* pTmpTbl;
const SwTableNode* pTblNd; const SwTableNode* pTblNd;
...@@ -151,7 +151,7 @@ void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName ) ...@@ -151,7 +151,7 @@ void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName )
{ {
const SwFrmFmt* pFmt; const SwFrmFmt* pFmt;
const SwFrmFmts& rTbl = *GetTblFrmFmts(); const SwFrmFmts& rTbl = *GetTblFrmFmts();
for( sal_uInt16 i = rTbl.size(); i; ) for( size_t i = rTbl.size(); i; )
if( !( pFmt = rTbl[ --i ] )->IsDefault() && if( !( pFmt = rTbl[ --i ] )->IsDefault() &&
pFmt->GetName() == rNewName && IsUsed( *pFmt ) ) pFmt->GetName() == rNewName && IsUsed( *pFmt ) )
{ {
......
...@@ -60,7 +60,7 @@ SwSortOptions::SwSortOptions(const SwSortOptions& rOpt) : ...@@ -60,7 +60,7 @@ SwSortOptions::SwSortOptions(const SwSortOptions& rOpt) :
bTable( rOpt.bTable ), bTable( rOpt.bTable ),
bIgnoreCase( rOpt.bIgnoreCase ) bIgnoreCase( rOpt.bIgnoreCase )
{ {
for( sal_uInt16 i=0; i < rOpt.aKeys.size(); ++i ) for( size_t i=0; i < rOpt.aKeys.size(); ++i )
{ {
SwSortKey* pNew = new SwSortKey(*rOpt.aKeys[i]); SwSortKey* pNew = new SwSortKey(*rOpt.aKeys[i]);
aKeys.push_back( pNew ); aKeys.push_back( pNew );
......
...@@ -234,7 +234,7 @@ bool SwServerObject::IsLinkInServer( const SwBaseLink* pChkLnk ) const ...@@ -234,7 +234,7 @@ bool SwServerObject::IsLinkInServer( const SwBaseLink* pChkLnk ) const
SwServerObject::ServerModes eSave = eType; SwServerObject::ServerModes eSave = eType;
if( !pChkLnk ) if( !pChkLnk )
const_cast<SwServerObject*>(this)->eType = NONE_SERVER; const_cast<SwServerObject*>(this)->eType = NONE_SERVER;
for( sal_uInt16 n = rLnks.size(); n; ) for( size_t n = rLnks.size(); n; )
{ {
const ::sfx2::SvBaseLink* pLnk = &(*rLnks[ --n ]); const ::sfx2::SvBaseLink* pLnk = &(*rLnks[ --n ]);
if( pLnk && OBJECT_CLIENT_GRF != pLnk->GetObjType() && if( pLnk && OBJECT_CLIENT_GRF != pLnk->GetObjType() &&
......
...@@ -244,7 +244,7 @@ SwTableNode* SwTableNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const ...@@ -244,7 +244,7 @@ SwTableNode* SwTableNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
if( !pDoc->IsCopyIsMove() ) if( !pDoc->IsCopyIsMove() )
{ {
const SwFrmFmts& rTblFmts = *pDoc->GetTblFrmFmts(); const SwFrmFmts& rTblFmts = *pDoc->GetTblFrmFmts();
for( sal_uInt16 n = rTblFmts.size(); n; ) for( size_t n = rTblFmts.size(); n; )
if( rTblFmts[ --n ]->GetName() == sTblName ) if( rTblFmts[ --n ]->GetName() == sTblName )
{ {
sTblName = pDoc->GetUniqueTblName(); sTblName = pDoc->GetUniqueTblName();
......
...@@ -111,12 +111,12 @@ void SwDDETable::ChangeContent() ...@@ -111,12 +111,12 @@ void SwDDETable::ChangeContent()
OUString aExpand = comphelper::string::remove(pDDEType->GetExpansion(), '\r'); OUString aExpand = comphelper::string::remove(pDDEType->GetExpansion(), '\r');
sal_Int32 nExpandTokenPos = 0; sal_Int32 nExpandTokenPos = 0;
for( sal_uInt16 n = 0; n < aLines.size(); ++n ) for( size_t n = 0; n < aLines.size(); ++n )
{ {
OUString aLine = aExpand.getToken( 0, '\n', nExpandTokenPos ); OUString aLine = aExpand.getToken( 0, '\n', nExpandTokenPos );
sal_Int32 nLineTokenPos = 0; sal_Int32 nLineTokenPos = 0;
SwTableLine* pLine = aLines[ n ]; SwTableLine* pLine = aLines[ n ];
for( sal_uInt16 i = 0; i < pLine->GetTabBoxes().size(); ++i ) for( size_t i = 0; i < pLine->GetTabBoxes().size(); ++i )
{ {
SwTableBox* pBox = pLine->GetTabBoxes()[ i ]; SwTableBox* pBox = pLine->GetTabBoxes()[ i ];
OSL_ENSURE( pBox->GetSttIdx(), "no content box" ); OSL_ENSURE( pBox->GetSttIdx(), "no content box" );
......
...@@ -999,7 +999,7 @@ void DelAllGrfCacheEntries( SwDoc* pDoc ) ...@@ -999,7 +999,7 @@ void DelAllGrfCacheEntries( SwDoc* pDoc )
const ::sfx2::SvBaseLinks& rLnks = rLnkMgr.GetLinks(); const ::sfx2::SvBaseLinks& rLnks = rLnkMgr.GetLinks();
SwGrfNode* pGrfNd; SwGrfNode* pGrfNd;
OUString sFileNm; OUString sFileNm;
for( sal_uInt16 n = rLnks.size(); n; ) for( size_t n = rLnks.size(); n; )
{ {
::sfx2::SvBaseLink* pLnk = &(*rLnks[ --n ]); ::sfx2::SvBaseLink* pLnk = &(*rLnks[ --n ]);
if( pLnk && OBJECT_CLIENT_GRF == pLnk->GetObjType() && if( pLnk && OBJECT_CLIENT_GRF == pLnk->GetObjType() &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment