Skip to content

C
core
Kaydet (Commit) 259784c1 authored tarafından Matteo Casalin's avatar Matteo Casalin
Dosyalara gözat
Seçenekler

sal_uInt16 to sal_Int32 

Change-Id: I5b2f0e0a0c75eea14903e333eb17613d0499f458
üst f395482b
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
include/vcl/texteng.hxx
Dosyayı görüntüle @ 259784c1
...@@ -202,7 +202,7 @@ protected: ...@@ -202,7 +202,7 @@ protected:
long ImpGetPortionXOffset( sal_uLong nPara, TextLine* pLine, sal_uInt16 nTextPortion ); long ImpGetPortionXOffset( sal_uLong nPara, TextLine* pLine, sal_uInt16 nTextPortion );
long ImpGetXPos( sal_uLong nPara, TextLine* pLine, sal_Int32 nIndex, bool bPreferPortionStart = false ); long ImpGetXPos( sal_uLong nPara, TextLine* pLine, sal_Int32 nIndex, bool bPreferPortionStart = false );
long ImpGetOutputOffset( sal_uLong nPara, TextLine* pLine, sal_Int32 nIndex, sal_Int32 nIndex2 ); long ImpGetOutputOffset( sal_uLong nPara, TextLine* pLine, sal_Int32 nIndex, sal_Int32 nIndex2 );
sal_uInt8 ImpGetRightToLeft( sal_uLong nPara, sal_Int32 nPos, sal_uInt16* pStart = NULL, sal_uInt16* pEnd = NULL ); sal_uInt8 ImpGetRightToLeft( sal_uLong nPara, sal_Int32 nPos, sal_Int32* pStart = NULL, sal_Int32* pEnd = NULL );
static void ImpInitLayoutMode( OutputDevice* pOutDev, bool bDrawingR2LPortion = false ); static void ImpInitLayoutMode( OutputDevice* pOutDev, bool bDrawingR2LPortion = false );
TxtAlign ImpGetAlign() const; TxtAlign ImpGetAlign() const;
......
vcl/source/edit/textdat2.hxx
Dosyayı görüntüle @ 259784c1
...@@ -89,9 +89,9 @@ public: ...@@ -89,9 +89,9 @@ public:
struct TEWritingDirectionInfo struct TEWritingDirectionInfo
{ {
sal_uInt8 nType; sal_uInt8 nType;
sal_uInt16 nStartPos; sal_Int32 nStartPos;
sal_uInt16 nEndPos; sal_Int32 nEndPos;
TEWritingDirectionInfo( sal_uInt8 _Type, sal_uInt16 _Start, sal_uInt16 _End ) TEWritingDirectionInfo( sal_uInt8 _Type, sal_Int32 _Start, sal_Int32 _End )
: nType {_Type} : nType {_Type}
, nStartPos {_Start} , nStartPos {_Start}
, nEndPos {_End} , nEndPos {_End}
......
vcl/source/edit/texteng.cxx
Dosyayı görüntüle @ 259784c1
...@@ -2920,7 +2920,7 @@ void TextEngine::ImpInitWritingDirections( sal_uLong nPara ) ...@@ -2920,7 +2920,7 @@ void TextEngine::ImpInitWritingDirections( sal_uLong nPara )
for ( long nIdx = 0; nIdx < nCount; ++nIdx ) for ( long nIdx = 0; nIdx < nCount; ++nIdx )
{ {
ubidi_getLogicalRun( pBidi, nStart, &nEnd, &nCurrDir ); ubidi_getLogicalRun( pBidi, nStart, &nEnd, &nCurrDir );
rInfos.push_back( TEWritingDirectionInfo( nCurrDir, (sal_uInt16)nStart, (sal_uInt16)nEnd ) ); rInfos.push_back( TEWritingDirectionInfo( nCurrDir, nStart, nEnd ) );
nStart = nEnd; nStart = nEnd;
} }
...@@ -2929,11 +2929,11 @@ void TextEngine::ImpInitWritingDirections( sal_uLong nPara ) ...@@ -2929,11 +2929,11 @@ void TextEngine::ImpInitWritingDirections( sal_uLong nPara )
// No infos mean no CTL and default dir is L2R... // No infos mean no CTL and default dir is L2R...
if ( rInfos.empty() ) if ( rInfos.empty() )
rInfos.push_back( TEWritingDirectionInfo( 0, 0, (sal_uInt16)pParaPortion->GetNode()->GetText().getLength() ) ); rInfos.push_back( TEWritingDirectionInfo( 0, 0, pParaPortion->GetNode()->GetText().getLength() ) );
} }
sal_uInt8 TextEngine::ImpGetRightToLeft( sal_uLong nPara, sal_Int32 nPos, sal_uInt16* pStart, sal_uInt16* pEnd ) sal_uInt8 TextEngine::ImpGetRightToLeft( sal_uLong nPara, sal_Int32 nPos, sal_Int32* pStart, sal_Int32* pEnd )
{ {
sal_uInt8 nRightToLeft = 0; sal_uInt8 nRightToLeft = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment