diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-08-15 17:15:29 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-08-16 09:10:21 +0200 |
| commit | 6917ebc39fb1c4f412ae9fea4e2d858a1b351c47 (patch) | |
| tree | a605ffb98909babaa89b8ac0bad0d22049bbb379 /vcl | |
| parent | 8353793c94416a9a3a5af074d881624e43e5ec2f (diff) | |
sal_uLong to sal_uInt32
Change-Id: Ifcde090747127680a9e4b810ff062d024663632c
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/edit/texteng.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/edit/textview.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/edit/vclmedit.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index e1df6d898274..9f2d3a777008 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -1304,9 +1304,9 @@ Range TextEngine::GetInvalidYOffsets( sal_uInt32 nPortion ) return Range( nFirstInvalid*mnCharHeight, ((nLastInvalid+1)*mnCharHeight)-1 ); } -sal_uLong TextEngine::GetParagraphCount() const +sal_uInt32 TextEngine::GetParagraphCount() const { - return mpDoc->GetNodes().size(); + return static_cast<sal_uInt32>(mpDoc->GetNodes().size()); } void TextEngine::EnableUndo( bool bEnable ) diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index c526ffe5759f..8ad8bd573b8b 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -2026,7 +2026,7 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv // Data for deleting after DROP_MOVE: TextSelection aPrevSel( mpImpl->maSelection ); aPrevSel.Justify(); - sal_uLong nPrevParaCount = mpImpl->mpTextEngine->GetParagraphCount(); + const sal_uInt32 nPrevParaCount = mpImpl->mpTextEngine->GetParagraphCount(); const sal_Int32 nPrevStartParaLen = mpImpl->mpTextEngine->GetTextLen( aPrevSel.GetStart().GetPara() ); bool bStarterOfDD = false; @@ -2076,8 +2076,8 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv ( ( mpImpl->mpDDInfo->maDropPos.GetPara() == aPrevSel.GetStart().GetPara() ) && ( mpImpl->mpDDInfo->maDropPos.GetIndex() < aPrevSel.GetStart().GetIndex() ) ) ) { - sal_uLong nNewParasBeforeSelection = - mpImpl->mpTextEngine->GetParagraphCount() - nPrevParaCount; + const sal_uInt32 nNewParasBeforeSelection = + mpImpl->mpTextEngine->GetParagraphCount() - nPrevParaCount; aPrevSel.GetStart().GetPara() += nNewParasBeforeSelection; aPrevSel.GetEnd().GetPara() += nNewParasBeforeSelection; diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 5a73070ad201..846ac1f0820d 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -173,7 +173,7 @@ void ImpVclMEdit::ImpUpdateSrollBarVis( WinBits nWinStyle ) { TextEngine& rEngine( *mpTextWindow->GetTextEngine() ); sal_uLong nOverallTextHeight(0); - for ( sal_uLong i=0; i<rEngine.GetParagraphCount(); ++i ) + for ( sal_uInt32 i=0; i<rEngine.GetParagraphCount(); ++i ) nOverallTextHeight += rEngine.GetTextHeight( i ); if ( nOverallTextHeight > (sal_uLong)mpTextWindow->GetOutputSizePixel().Height() ) bNeedVScroll = true; |