summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2014-12-25 17:38:13 +0100
committerMatteo Casalin <matteo.casalin@yahoo.com>2014-12-25 18:21:11 +0100
commit93e97e83d8db7641d32391af7203806d2d26370b (patch)
treeb29e734b498e1881b61933c7b596ec4e21886a81
parent1577d93102ab87952309eafefa497aa88e97de21 (diff)
sal_uInt16 to size_t
Change-Id: Ide8913930f9f951039cefecf71609c5a2bcc5e82
-rw-r--r--sw/source/core/doc/docchart.cxx4
-rw-r--r--sw/source/core/doc/sortopt.cxx2
-rw-r--r--sw/source/core/doc/swserv.cxx2
-rw-r--r--sw/source/core/docnode/ndcopy.cxx2
-rw-r--r--sw/source/core/fields/ddetbl.cxx4
-rw-r--r--sw/source/core/graphic/ndgrf.cxx2
6 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index 1b48a928c886..02fdf9127b9c 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -91,7 +91,7 @@ void SwDoc::DoUpdateAllCharts()
if( pVSh )
{
const SwFrmFmts& rTblFmts = *GetTblFrmFmts();
- for( sal_uInt16 n = 0; n < rTblFmts.size(); ++n )
+ for( size_t n = 0; n < rTblFmts.size(); ++n )
{
SwTable* pTmpTbl;
const SwTableNode* pTblNd;
@@ -151,7 +151,7 @@ void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName )
{
const SwFrmFmt* pFmt;
const SwFrmFmts& rTbl = *GetTblFrmFmts();
- for( sal_uInt16 i = rTbl.size(); i; )
+ for( size_t i = rTbl.size(); i; )
if( !( pFmt = rTbl[ --i ] )->IsDefault() &&
pFmt->GetName() == rNewName && IsUsed( *pFmt ) )
{
diff --git a/sw/source/core/doc/sortopt.cxx b/sw/source/core/doc/sortopt.cxx
index 9aba7fee6536..555e44493175 100644
--- a/sw/source/core/doc/sortopt.cxx
+++ b/sw/source/core/doc/sortopt.cxx
@@ -60,7 +60,7 @@ SwSortOptions::SwSortOptions(const SwSortOptions& rOpt) :
bTable( rOpt.bTable ),
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]);
aKeys.push_back( pNew );
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index ce473a67014e..4487b256d818 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -234,7 +234,7 @@ bool SwServerObject::IsLinkInServer( const SwBaseLink* pChkLnk ) const
SwServerObject::ServerModes eSave = eType;
if( !pChkLnk )
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 ]);
if( pLnk && OBJECT_CLIENT_GRF != pLnk->GetObjType() &&
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 47d5f6231ff1..b26299ccb5f9 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -244,7 +244,7 @@ SwTableNode* SwTableNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
if( !pDoc->IsCopyIsMove() )
{
const SwFrmFmts& rTblFmts = *pDoc->GetTblFrmFmts();
- for( sal_uInt16 n = rTblFmts.size(); n; )
+ for( size_t n = rTblFmts.size(); n; )
if( rTblFmts[ --n ]->GetName() == sTblName )
{
sTblName = pDoc->GetUniqueTblName();
diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index a13560386e2a..be1212d8de01 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -111,12 +111,12 @@ void SwDDETable::ChangeContent()
OUString aExpand = comphelper::string::remove(pDDEType->GetExpansion(), '\r');
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 );
sal_Int32 nLineTokenPos = 0;
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 ];
OSL_ENSURE( pBox->GetSttIdx(), "no content box" );
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 80b0504e7f54..1ae848cde07c 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -999,7 +999,7 @@ void DelAllGrfCacheEntries( SwDoc* pDoc )
const ::sfx2::SvBaseLinks& rLnks = rLnkMgr.GetLinks();
SwGrfNode* pGrfNd;
OUString sFileNm;
- for( sal_uInt16 n = rLnks.size(); n; )
+ for( size_t n = rLnks.size(); n; )
{
::sfx2::SvBaseLink* pLnk = &(*rLnks[ --n ]);
if( pLnk && OBJECT_CLIENT_GRF == pLnk->GetObjType() &&