diff options
| -rw-r--r-- | svtools/source/control/scriptedtext.cxx | 12 | ||||
| -rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx index 46f40fc1a1b9..29eab5febe7e 100644 --- a/svtools/source/control/scriptedtext.cxx +++ b/svtools/source/control/scriptedtext.cxx @@ -145,8 +145,8 @@ void SvtScriptedTextHelper_Impl::CalculateSizes() DBG_ASSERT( maPosVec.size() - 1 == maScriptVec.size(), "SvtScriptedTextHelper_Impl::CalculateWidth - invalid vectors" ); - xub_StrLen nThisPos = static_cast< xub_StrLen >( maPosVec[ 0 ] ); - xub_StrLen nNextPos; + sal_Int32 nThisPos = maPosVec[ 0 ]; + sal_Int32 nNextPos; sal_Int32 nPosVecSize = maPosVec.size(); sal_Int32 nPosVecIndex = 1; @@ -157,7 +157,7 @@ void SvtScriptedTextHelper_Impl::CalculateSizes() while( nPosVecIndex < nPosVecSize ) { - nNextPos = static_cast< xub_StrLen >( maPosVec[ nPosVecIndex++ ] ); + nNextPos = maPosVec[ nPosVecIndex++ ]; nScript = maScriptVec[ nScriptVecIndex++ ]; SetOutDevFont( nScript ); @@ -284,8 +284,8 @@ void SvtScriptedTextHelper_Impl::DrawText( const Point& _rPos ) maDefltFont = mrOutDevice.GetFont(); Point aCurrPos( _rPos ); - xub_StrLen nThisPos = static_cast< xub_StrLen >( maPosVec[ 0 ] ); - xub_StrLen nNextPos; + sal_Int32 nThisPos = maPosVec[ 0 ]; + sal_Int32 nNextPos; sal_Int32 nPosVecSize = maPosVec.size(); sal_Int32 nPosVecIndex = 1; @@ -294,7 +294,7 @@ void SvtScriptedTextHelper_Impl::DrawText( const Point& _rPos ) while( nPosVecIndex < nPosVecSize ) { - nNextPos = static_cast< xub_StrLen >( maPosVec[ nPosVecIndex++ ] ); + nNextPos = maPosVec[ nPosVecIndex++ ]; nScript = maScriptVec[ nVecIndex ]; SetOutDevFont( nScript ); diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 81d3584c8152..54c154838a14 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -239,8 +239,8 @@ void HTMLOption::GetColor( Color& rColor ) const if( SAL_MAX_UINT32 == nColor ) { nColor = 0; - xub_StrLen nPos = 0; - for( sal_uInt32 i=0; i<6; i++ ) + sal_Int32 nPos = 0; + for (sal_uInt32 i=0; i<6; ++i) { // Whatever Netscape does to get color values, // at maximum three characters < '0' are ignored. @@ -1162,7 +1162,7 @@ int HTMLParser::_GetNextToken() sal_uLong nCStreamPos = 0; sal_uLong nCLineNr = 0; sal_uLong nCLinePos = 0; - xub_StrLen nCStrLen = 0; + sal_Int32 nCStrLen = 0; bool bDone = false; // Read until closing -->. If not found restart at first > @@ -1421,7 +1421,7 @@ scan_text: void HTMLParser::UnescapeToken() { - xub_StrLen nPos=0; + sal_Int32 nPos=0; bool bEscape = false; while( nPos < aToken.getLength() ) @@ -1447,7 +1447,7 @@ const HTMLOptions& HTMLParser::GetOptions( sal_uInt16 *pNoConvertToken ) if (!maOptions.empty()) return maOptions; - xub_StrLen nPos = 0; + sal_Int32 nPos = 0; while( nPos < aToken.getLength() ) { // A letter? Option beginning here. @@ -1455,7 +1455,7 @@ const HTMLOptions& HTMLParser::GetOptions( sal_uInt16 *pNoConvertToken ) { int nToken; OUString aValue; - xub_StrLen nStt = nPos; + sal_Int32 nStt = nPos; sal_Unicode cChar = 0; // Actually only certain characters allowed. @@ -1492,7 +1492,7 @@ const HTMLOptions& HTMLParser::GetOptions( sal_uInt16 *pNoConvertToken ) if( nPos != aToken.getLength() ) { - xub_StrLen nLen = 0; + sal_Int32 nLen = 0; nStt = nPos; if( ('"'==cChar) || ('\'')==cChar ) { |