diff options
author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-08-03 22:39:57 +0200 |
---|---|---|
committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-08-16 09:10:16 +0200 |
commit | 666685511b99acc561cc0a60bd39da7c509cf305 (patch) | |
tree | f5a02d75349ab2aac47ac8e83255f8d777eb0cf7 | |
parent | c65d64a56bbc1ea7f0dc9a39b0a5da6e82e347f2 (diff) |
sal_uInt16/short to sal_Int32
Change-Id: Ib69bdfd66328c1e4e3d8a0a03e4360b23e69a476
-rw-r--r-- | vcl/source/edit/textdat2.hxx | 14 | ||||
-rw-r--r-- | vcl/source/edit/textdata.cxx | 17 | ||||
-rw-r--r-- | vcl/source/edit/texteng.cxx | 8 |
3 files changed, 20 insertions, 19 deletions
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx index 801d55843cfe..499069103d6b 100644 --- a/vcl/source/edit/textdat2.hxx +++ b/vcl/source/edit/textdat2.hxx @@ -168,8 +168,8 @@ private: TETextPortionList maTextPortions; std::vector<TEWritingDirectionInfo> maWritingDirectionInfos; - sal_uInt16 mnInvalidPosStart; - short mnInvalidDiff; + sal_Int32 mnInvalidPosStart; + sal_Int32 mnInvalidDiff; bool mbInvalid; bool mbSimple; // only type linearly @@ -185,18 +185,18 @@ public: void SetNotSimpleInvalid() { mbSimple = false; } void SetValid() { mbInvalid = false; mbSimple = true;} - void MarkInvalid( sal_uInt16 nStart, short nDiff); - void MarkSelectionInvalid( sal_uInt16 nStart, sal_uInt16 nEnd ); + void MarkInvalid( sal_Int32 nStart, sal_Int32 nDiff ); + void MarkSelectionInvalid( sal_Int32 nStart, sal_Int32 nEnd ); - sal_uInt16 GetInvalidPosStart() const { return mnInvalidPosStart; } - short GetInvalidDiff() const { return mnInvalidDiff; } + sal_Int32 GetInvalidPosStart() const { return mnInvalidPosStart; } + sal_Int32 GetInvalidDiff() const { return mnInvalidDiff; } TextNode* GetNode() const { return mpNode; } boost::ptr_vector<TextLine>& GetLines() { return maLines; } TETextPortionList& GetTextPortions() { return maTextPortions; } std::vector<TEWritingDirectionInfo>& GetWritingDirectionInfos() { return maWritingDirectionInfos; } - sal_uInt16 GetLineNumber( sal_uInt16 nIndex, bool bInclEnd ); + sal_uInt16 GetLineNumber( sal_Int32 nIndex, bool bInclEnd ); void CorrectValuesBehindLastFormattedLine( sal_uInt16 nLastFormattedLine ); }; diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx index 80d1680d14e5..6e011432ca9a 100644 --- a/vcl/source/edit/textdata.cxx +++ b/vcl/source/edit/textdata.cxx @@ -93,18 +93,19 @@ sal_uInt16 TETextPortionList::FindPortion( sal_uInt16 nCharPos, sal_uInt16& nPor } TEParaPortion::TEParaPortion( TextNode* pN ) + : mpNode {pN} + , mnInvalidPosStart {0} + , mnInvalidDiff {0} + , mbInvalid {true} + , mbSimple {false} { - mpNode = pN; - mnInvalidPosStart = mnInvalidDiff = 0; - mbInvalid = true; - mbSimple = false; } TEParaPortion::~TEParaPortion() { } -void TEParaPortion::MarkInvalid( sal_uInt16 nStart, short nDiff ) +void TEParaPortion::MarkInvalid( sal_Int32 nStart, sal_Int32 nDiff ) { if ( !mbInvalid ) { @@ -128,7 +129,7 @@ void TEParaPortion::MarkInvalid( sal_uInt16 nStart, short nDiff ) else { DBG_ASSERT( ( nDiff >= 0 ) || ( (nStart+nDiff) >= 0 ), "MarkInvalid: Diff out of Range" ); - mnInvalidPosStart = std::min( mnInvalidPosStart, (sal_uInt16) ( (nDiff < 0) ? nStart+nDiff : nDiff ) ); + mnInvalidPosStart = std::min( mnInvalidPosStart, nDiff < 0 ? nStart+nDiff : nDiff ); mnInvalidDiff = 0; mbSimple = false; } @@ -139,7 +140,7 @@ void TEParaPortion::MarkInvalid( sal_uInt16 nStart, short nDiff ) mbInvalid = true; } -void TEParaPortion::MarkSelectionInvalid( sal_uInt16 nStart, sal_uInt16 /*nEnd*/ ) +void TEParaPortion::MarkSelectionInvalid( sal_Int32 nStart, sal_Int32 /*nEnd*/ ) { if ( !mbInvalid ) { @@ -159,7 +160,7 @@ void TEParaPortion::MarkSelectionInvalid( sal_uInt16 nStart, sal_uInt16 /*nEnd*/ mbSimple = false; } -sal_uInt16 TEParaPortion::GetLineNumber( sal_uInt16 nChar, bool bInclEnd ) +sal_uInt16 TEParaPortion::GetLineNumber( sal_Int32 nChar, bool bInclEnd ) { for ( size_t nLine = 0; nLine < maLines.size(); nLine++ ) { diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 754fea7fcc09..12f19fefc3f2 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -2154,9 +2154,9 @@ bool TextEngine::CreateLines( sal_uLong nPara ) pTEParaPortion->GetLines().push_back( pL ); } - const int nInvalidDiff = pTEParaPortion->GetInvalidDiff(); - const sal_uInt16 nInvalidStart = pTEParaPortion->GetInvalidPosStart(); - const sal_uInt16 nInvalidEnd = nInvalidStart + std::abs( nInvalidDiff ); + const sal_Int32 nInvalidDiff = pTEParaPortion->GetInvalidDiff(); + const sal_Int32 nInvalidStart = pTEParaPortion->GetInvalidPosStart(); + const sal_Int32 nInvalidEnd = nInvalidStart + std::abs( nInvalidDiff ); bool bQuickFormat = false; if ( pTEParaPortion->GetWritingDirectionInfos().empty() ) @@ -2168,7 +2168,7 @@ bool TextEngine::CreateLines( sal_uLong nPara ) if ( nInvalidDiff < 0 ) { // check if deleting across Portion border - sal_uInt16 nPos = 0; + sal_Int32 nPos = 0; for ( const auto pTP : pTEParaPortion->GetTextPortions() ) { // there must be no Start/End in the deleted region |