diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-05-04 08:17:45 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-05-05 23:38:37 +0200 |
| commit | 97911bf9cf1c3d27c9ff1fe7d98f9ae1bbce3c40 (patch) | |
| tree | 22a0feaaca75dda46d4f6ef051c7f0c539ef8ccf /sw | |
| parent | 6da921838f9756608553bd7dd231f4393ee0803d (diff) | |
Use more proper integer types
Change-Id: I8200af6fcb111edd8a00cb77824e84e2231bee1b
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/basflt/fltini.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/basflt/shellio.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 5caa64d0d9af..378a79e46ccb 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -164,7 +164,7 @@ Reader* GetReader( ReaderWriterEnum eReader ) void GetWriter( const OUString& rFltName, const OUString& rBaseURL, WriterRef& xRet ) { - for( sal_uInt16 n = 0; n < MAXFILTER; ++n ) + for( int n = 0; n < MAXFILTER; ++n ) if ( aFilterDetect[n].IsFilter( rFltName ) ) { aReaderWriter[n].GetWriter( rFltName, rBaseURL, xRet ); @@ -175,7 +175,7 @@ void GetWriter( const OUString& rFltName, const OUString& rBaseURL, WriterRef& x SwRead GetReader( const OUString& rFltName ) { SwRead pRead = 0; - for( sal_uInt16 n = 0; n < MAXFILTER; ++n ) + for( int n = 0; n < MAXFILTER; ++n ) { if ( aFilterDetect[n].IsFilter( rFltName ) ) { @@ -573,7 +573,7 @@ OUString NameFromCharSet(rtl_TextEncoding nChrSet) void SwAsciiOptions::ReadUserData( const OUString& rStr ) { sal_Int32 nToken = 0; - sal_uInt16 nCnt = 0; + int nCnt = 0; do { const OUString sToken = rStr.getToken( 0, ',', nToken ); if (!sToken.isEmpty()) diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 0d3796b551bc..b9348732e380 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -220,7 +220,7 @@ sal_uLong SwReader::Read( const Reader& rOptions ) rNd.FindFooterStartNode(); // search all new Fly's, and store them as individual Undo Objects - for( sal_uInt16 n = 0; n < pDoc->GetSpzFrmFmts()->size(); ++n ) + for( SwFrmFmts::size_type n = 0; n < pDoc->GetSpzFrmFmts()->size(); ++n ) { SwFrmFmt* pFrmFmt = (*pDoc->GetSpzFrmFmts())[ n ]; const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor(); @@ -628,7 +628,7 @@ void Reader::ResetFrmFmts( SwDoc& rDoc ) sal_uInt16 const s_ids[3] = { RES_POOLFRM_FRAME, RES_POOLFRM_GRAPHIC, RES_POOLFRM_OLE }; - for (sal_uInt16 i = 0; i < SAL_N_ELEMENTS(s_ids); ++i) + for (size_t i = 0; i < SAL_N_ELEMENTS(s_ids); ++i) { SwFrmFmt *const pFrmFmt = rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( s_ids[i] ); |