vcl/source/edit/textdat2.hxx | 2 +- vcl/source/edit/textdata.cxx | 2 +- vcl/source/edit/texteng.cxx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit eba8515c779eef24d53a464d9345a9154ca195d6 Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Mar 13 18:05:44 2017 +0100 loplugin:loopvartoosmall Change-Id: Ide32700aab3427a8bf18c806968822cdf3f91bf2 diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx index d461018..0607e1b 100644 --- a/vcl/source/edit/textdat2.hxx +++ b/vcl/source/edit/textdat2.hxx @@ -90,7 +90,7 @@ public: void Reset(); sal_uInt16 FindPortion( sal_Int32 nCharPos, sal_Int32& rPortionStart, bool bPreferStartingPortion = false ); - void DeleteFromPortion( sal_uInt16 nDelFrom ); + void DeleteFromPortion( size_t nDelFrom ); }; struct TEWritingDirectionInfo diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx index 3cbb812..dd8fb43 100644 --- a/vcl/source/edit/textdata.cxx +++ b/vcl/source/edit/textdata.cxx @@ -113,7 +113,7 @@ void TETextPortionList::Reset() maPortions.clear(); } -void TETextPortionList::DeleteFromPortion( sal_uInt16 nDelFrom ) +void TETextPortionList::DeleteFromPortion( size_t nDelFrom ) { SAL_WARN_IF( ( nDelFrom >= maPortions.size() ) && ( (nDelFrom != 0) || (maPortions.size() != 0) ), "vcl", "DeleteFromPortion: Out of range" ); for ( auto it = maPortions.begin() + nDelFrom; it != maPortions.end(); ++it ) diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 2dd9e37..cd17c10 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -1774,8 +1774,8 @@ void TextEngine::CreateTextPortions( sal_uInt32 nPara, sal_Int32 nStartPos ) // Unfortunately, the number of TextPortions does not have to be // equal to aPositions.Count(), because of linebreaks sal_Int32 nPortionStart = 0; - sal_uInt16 nInvPortion = 0; - sal_uInt16 nP; + size_t nInvPortion = 0; + size_t nP; for ( nP = 0; nP < pTEParaPortion->GetTextPortions().size(); nP++ ) { TETextPortion* pTmpPortion = pTEParaPortion->GetTextPortions()[nP]; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits