diff options
Diffstat (limited to 'sw/source/core/text/portxt.cxx')
| -rw-r--r-- | sw/source/core/text/portxt.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index a849cbe42f40..f123f6c42c6b 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -68,7 +68,7 @@ using namespace ::com::sun::star::i18n::ScriptType; * (for justified alignment). *************************************************************************/ -USHORT lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr, +sal_uInt16 lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr, const SwLinePortion& rPor ) { xub_StrLen nPos, nEnd; @@ -88,8 +88,8 @@ USHORT lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr, pSI = &((SwParaPortion*)rInf.GetParaPortion())->GetScriptInfo(); } - USHORT nCnt = 0; - BYTE nScript = 0; + sal_uInt16 nCnt = 0; + sal_uInt8 nScript = 0; // If portion consists of Asian characters and language is not // Korean, we add extra space to each character. @@ -97,7 +97,7 @@ USHORT lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr, if ( pSI ) nScript = pSI->ScriptType( nPos ); else if ( pBreakIt->GetBreakIter().is() ) - nScript = (BYTE)pBreakIt->GetBreakIter()->getScriptType( *pStr, nPos ); + nScript = (sal_uInt8)pBreakIt->GetBreakIter()->getScriptType( *pStr, nPos ); // Note: rInf.GetIdx() can differ from nPos, // e.g., when rPor is a field portion. nPos referes to the string passed @@ -135,7 +135,7 @@ USHORT lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr, { if ( SwScriptInfo::IsArabicText( *pStr, nPos, nEnd - nPos ) && pSI->CountKashida() ) { - const USHORT nKashRes = pSI->KashidaJustify( 0, 0, nPos, nEnd - nPos ); + const sal_uInt16 nKashRes = pSI->KashidaJustify( 0, 0, nPos, nEnd - nPos ); // i60591: need to check result of KashidaJustify // determine if kashida justification is applicable if( nKashRes != STRING_LEN ) @@ -192,7 +192,7 @@ USHORT lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr, nPos = rInf.GetIdx() + rPor.GetLen(); if ( nPos < rInf.GetTxt().Len() ) { - BYTE nNextScript = 0; + sal_uInt8 nNextScript = 0; const SwLinePortion* pPor = rPor.GetPortion(); if ( pPor && pPor->IsKernPortion() ) pPor = pPor->GetPortion(); @@ -210,10 +210,10 @@ USHORT lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr, pPor->GetExpTxt( rInf, aStr ); ((SwTxtSizeInfo &)rInf).SetOnWin( bOldOnWin ); - nNextScript = (BYTE)pBreakIt->GetBreakIter()->getScriptType( aStr, 0 ); + nNextScript = (sal_uInt8)pBreakIt->GetBreakIter()->getScriptType( aStr, 0 ); } else - nNextScript = (BYTE)pBreakIt->GetBreakIter()->getScriptType( rInf.GetTxt(), nPos ); + nNextScript = (sal_uInt8)pBreakIt->GetBreakIter()->getScriptType( rInf.GetTxt(), nPos ); if( ASIAN == nNextScript ) { @@ -523,7 +523,7 @@ void SwTxtPortion::FormatEOL( SwTxtFormatInfo &rInf ) { // calculate number of blanks xub_StrLen nX = rInf.GetIdx() - 1; - USHORT nHoleLen = 1; + sal_uInt16 nHoleLen = 1; while( nX && nHoleLen < GetLen() && CH_BLANK == rInf.GetChar( --nX ) ) nHoleLen++; |