diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-28 15:41:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-11-05 15:15:30 +0200 |
| commit | a6dc113734385cbf37db7ff1804f5276530f78f7 (patch) | |
| tree | 91c47dca48541fa297d7a525ab0457302f7a74ed /vcl | |
| parent | bb60c5a877057918b59de08207e83aa284d281cc (diff) | |
convert xub_StrLen to sal_Int32
Convert code like:
xub_StrLen nLen = aStr.getLength();
into
sal_Int32 nLen = aStr.getLength();
Change-Id: Ib0af6b747068257478918fd1cc93e4925f32ac47
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/outdev3.cxx | 6 | ||||
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index cc3096685a2c..8d97a433223e 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -6178,7 +6178,7 @@ void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& r aLastLine = convertLineEnd(aStr.copy(pLineInfo->GetIndex()), LINEEND_LF); // Replace all LineFeeds with Spaces OUStringBuffer aLastLineBuffer(aLastLine); - xub_StrLen nLastLineLen = aLastLineBuffer.getLength(); + sal_Int32 nLastLineLen = aLastLineBuffer.getLength(); for ( i = 0; i < nLastLineLen; i++ ) { if ( aLastLineBuffer[ i ] == '\n' ) @@ -7717,8 +7717,8 @@ xub_StrLen OutputDevice::HasGlyphs( const Font& rTempFont, const OUString& rStr, { if( nIndex >= rStr.getLength() ) return nIndex; - xub_StrLen nEnd = nIndex + nLen; - if( (sal_Int32)nIndex+nLen > rStr.getLength() ) + sal_Int32 nEnd = nIndex + nLen; + if( nIndex+nLen > rStr.getLength() ) nEnd = rStr.getLength(); DBG_ASSERT( nIndex < nEnd, "StartPos >= EndPos?" ); diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 4227430bacc6..771d4980ad4a 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -5240,7 +5240,7 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, if ( pAttrBuf ) { - xub_StrLen nTextLen2 = aEvt.maText.getLength(); + sal_Int32 nTextLen2 = aEvt.maText.getLength(); pSalAttrAry = new sal_uInt16[nTextLen2]; memset( pSalAttrAry, 0, nTextLen2*sizeof( sal_uInt16 ) ); for ( xub_StrLen i = 0; (i < nTextLen2) && (i < nAttrLen); i++ ) |