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 /basctl | |
parent | 8353793c94416a9a3a5af074d881624e43e5ec2f (diff) |
sal_uLong to sal_uInt32
Change-Id: Ifcde090747127680a9e4b810ff062d024663632c
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/basicide/baside2.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/baside2b.cxx | 6 | ||||
-rw-r--r-- | basctl/source/basicide/linenumberwindow.cxx | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index aa68f51908eb..65b6bf491351 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -848,14 +848,14 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage ) long nXTextWidth = pPrinter->approximate_char_width(); sal_Int32 nCharspLine = aPaperSz.Width() / (nXTextWidth > 1 ? nXTextWidth : 1); - sal_uLong nParas = GetEditEngine()->GetParagraphCount(); + const sal_uInt32 nParas = GetEditEngine()->GetParagraphCount(); sal_Int32 nPages = nParas/nLinespPage+1; sal_Int32 nCurPage = 1; lcl_PrintHeader( pPrinter, nPages, nCurPage, aTitle, nPrintPage == 0 ); Point aPos( Print::nLeftMargin, Print::nTopMargin ); - for ( sal_uLong nPara = 0; nPara < nParas; nPara++ ) + for ( sal_uInt32 nPara = 0; nPara < nParas; ++nPara ) { OUString aLine( GetEditEngine()->GetText( nPara ) ); lcl_ConvertTabsToSpaces( aLine ); diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 560d56965dd3..106e923a47d5 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -767,7 +767,7 @@ void EditorWindow::HandleProcedureCompletion() } else { - for( sal_uLong i = nLine+1; i < pEditEngine->GetParagraphCount(); ++i ) + for( sal_uInt32 i = nLine+1; i < pEditEngine->GetParagraphCount(); ++i ) {//searching forward for end token, or another sub/function definition OUString aCurrLine = pEditEngine->GetText( i ); std::vector<HighlightPortion> aCurrPortions; @@ -1222,8 +1222,8 @@ void EditorWindow::ImpDoHighlight( sal_uLong nLine ) void EditorWindow::UpdateSyntaxHighlighting () { - unsigned nCount = pEditEngine->GetParagraphCount(); - for (unsigned i = 0; i < nCount; ++i) + const sal_uInt32 nCount = pEditEngine->GetParagraphCount(); + for (sal_uInt32 i = 0; i < nCount; ++i) DoDelayedSyntaxHighlight(i); } diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx index 20689734e1b1..d1b96102adc2 100644 --- a/basctl/source/basicide/linenumberwindow.cxx +++ b/basctl/source/basicide/linenumberwindow.cxx @@ -59,10 +59,10 @@ void LineNumberWindow::Paint( vcl::RenderContext& rRenderContext, const Rectangl } int startY = txtView->GetStartDocPos().Y(); - int nStartLine = startY / nLineHeight + 1; - int nEndLine = (startY + windowHeight) / nLineHeight + 1; + const sal_uInt32 nStartLine = startY / nLineHeight + 1; + sal_uInt32 nEndLine = (startY + windowHeight) / nLineHeight + 1; - if (txtEngine->GetParagraphCount() + 1 < (unsigned int)nEndLine) + if (txtEngine->GetParagraphCount() + 1 < nEndLine) nEndLine = txtEngine->GetParagraphCount() + 1; // FIXME: it would be best if we could get notified of a font change @@ -71,7 +71,7 @@ void LineNumberWindow::Paint( vcl::RenderContext& rRenderContext, const Rectangl // reserve enough for 3 digit minimum, with a bit to spare for confort m_nWidth = m_nBaseWidth * 3 + m_nBaseWidth / 2; - int i = (nEndLine + 1) / 1000; + sal_uInt32 i = (nEndLine + 1) / 1000; while (i) { i /= 10; @@ -79,7 +79,7 @@ void LineNumberWindow::Paint( vcl::RenderContext& rRenderContext, const Rectangl } sal_Int64 y = (nStartLine - 1) * (sal_Int64)nLineHeight; - for (sal_Int32 n = nStartLine; n <= nEndLine; ++n, y += nLineHeight) + for (sal_uInt32 n = nStartLine; n <= nEndLine; ++n, y += nLineHeight) rRenderContext.DrawText(Point(0, y - m_nCurYOffset), OUString::number(n)); } |