sal_uLong to sal_uInt32

Change-Id: Ifcde090747127680a9e4b810ff062d024663632c

14 files changed, 30 insertions, 30 deletions

diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 4d9e8329a45e..657b4fefcdd4 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1757,11 +1757,11 @@ void Document::init()
 {
     if (m_xParagraphs.get() == 0)
     {
-        ::sal_uLong nCount = m_rEngine.GetParagraphCount();
+        const sal_uInt32 nCount = m_rEngine.GetParagraphCount();
         m_xParagraphs.reset(new Paragraphs);
         m_xParagraphs->reserve(static_cast< Paragraphs::size_type >(nCount));
             // numeric overflow is harmless here
-        for (::sal_uLong i = 0; i < nCount; ++i)
+        for (sal_uInt32 i = 0; i < nCount; ++i)
             m_xParagraphs->push_back(ParagraphInfo(static_cast< ::sal_Int32 >(
                                            m_rEngine.GetTextHeight(i))));
                 // XXX  numeric overflow
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));
 }
 
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 754cb7bbf42f..9dbd04461aa6 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1897,11 +1897,11 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore
         // quick partly fix of #i71318. Correct fix needs to patch the TextEngine itself...
         // this one will only prevent text from disappearing. It may to not have the
         // correct language and will probably not spell checked...
-        sal_uLong nPara = pTextEngine->GetParagraphCount();
+        const sal_uInt32 nPara = pTextEngine->GetParagraphCount();
         if (nPara > 1)
         {
             OUString aLeftOverText;
-            for (sal_uLong i = 1;  i < nPara;  ++i)
+            for (sal_uInt32 i = 1; i < nPara; ++i)
             {
                 aLeftOverText += "\x0a";    // the manual line break...
                 aLeftOverText += pTextEngine->GetText(i);
diff --git a/include/svtools/svmedit2.hxx b/include/svtools/svmedit2.hxx
index d6c30d26872b..18471c9a2a8f 100644
--- a/include/svtools/svmedit2.hxx
+++ b/include/svtools/svmedit2.hxx
@@ -36,7 +36,7 @@ public:
                     // methods of TextEngine
     void            SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd );
     void            SetLeftMargin( sal_uInt16 nLeftMargin );
-    sal_uLong       GetParagraphCount() const;
+    sal_uInt32      GetParagraphCount() const;
 };
 
 #endif
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index 2b64ccc35bad..9227e4b202a3 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -259,7 +259,7 @@ public:
     sal_uLong           CalcTextWidth();
     long                GetCharHeight() const { return mnCharHeight; }
 
-    sal_uLong           GetParagraphCount() const;
+    sal_uInt32          GetParagraphCount() const;
     OUString            GetText( sal_uInt32 nParagraph ) const;
     sal_Int32           GetTextLen( sal_uInt32 nParagraph ) const;
     sal_uLong           GetTextHeight( sal_uInt32 nParagraph ) const;
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx
index cf734c0cf6ff..894741f3c8aa 100644
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
+++ b/svtools/source/edit/editsyntaxhighlighter.cxx
@@ -161,7 +161,7 @@ void MultiLineEditSyntaxHighlight::UpdateData()
     // syntax highlighting
     // this must be possible improved by using notifychange correctly
     bool bTempModified = GetTextEngine()->IsModified();
-    for (sal_uLong nLine=0; nLine < GetTextEngine()->GetParagraphCount(); nLine++)
+    for (sal_uInt32 nLine=0; nLine < GetTextEngine()->GetParagraphCount(); ++nLine)
     {
         OUString aLine( GetTextEngine()->GetText( nLine ) );
         GetTextEngine()->RemoveAttribs( nLine );
diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx
index 9301c0d96cd9..65f2c0c19561 100644
--- a/svtools/source/edit/svmedit2.cxx
+++ b/svtools/source/edit/svmedit2.cxx
@@ -46,7 +46,7 @@ void ExtMultiLineEdit::SetLeftMargin( sal_uInt16 nLeftMargin )
     GetTextEngine()->SetLeftMargin( nLeftMargin );
 }
 
-sal_uLong ExtMultiLineEdit::GetParagraphCount() const
+sal_uInt32 ExtMultiLineEdit::GetParagraphCount() const
 {
     return GetTextEngine()->GetParagraphCount();
 }
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 843fbe375c70..30aec2447f77 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -1401,8 +1401,8 @@ void AddressMultiLineEdit::SetText( const OUString& rStr )
 
     ExtTextEngine* pTextEngine = GetTextEngine();
     TextAttribProtect aProtectAttr;
-    sal_uLong  nParaCount = pTextEngine->GetParagraphCount();
-    for(sal_uLong nPara = 0; nPara < nParaCount; ++nPara)
+    const sal_uInt32 nParaCount = pTextEngine->GetParagraphCount();
+    for(sal_uInt32 nPara = 0; nPara < nParaCount; ++nPara)
     {
         sal_Int32 nIndex = 0;
         const OUString sPara = pTextEngine->GetText( nPara );
@@ -1638,8 +1638,8 @@ OUString AddressMultiLineEdit::GetAddress()
 {
     OUString sRet;
     ExtTextEngine* pTextEngine = GetTextEngine();
-    sal_uLong  nParaCount = pTextEngine->GetParagraphCount();
-    for(sal_uLong nPara = nParaCount; nPara; --nPara)
+    const sal_uInt32 nParaCount = pTextEngine->GetParagraphCount();
+    for(sal_uInt32 nPara = nParaCount; nPara; --nPara)
     {
         const OUString sPara = comphelper::string::stripEnd(pTextEngine->GetText(nPara - 1), ' ');
         //don't add empty trailing paragraphs
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 61553bff3291..c928c89e9213 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -725,7 +725,7 @@ sal_Int32 SwSrcView::PrintSource(
     const long nLinespPage = nLineHeight ? aPaperSz.Height() / nLineHeight : 1;
     const long nCharWidth = pOutDev->GetTextWidth("X");
     const sal_Int32 nCharspLine = nCharWidth ? static_cast<sal_Int32>(aPaperSz.Width() / nCharWidth) : 1;
-    const sal_uLong nParas = pTextEngine->GetParagraphCount();
+    const sal_uInt32 nParas = pTextEngine->GetParagraphCount();
 
     const sal_Int32 nPages = static_cast<sal_Int32>(nParas / nLinespPage + 1 );
     sal_Int32 nCurPage = 1;
@@ -735,7 +735,7 @@ sal_Int32 SwSrcView::PrintSource(
         lcl_PrintHeader( *pOutDev, nPages, nCurPage, aTitle );
     const Point aStartPos( LMARGPRN, TMARGPRN );
     Point aPos( aStartPos );
-    for ( sal_uLong nPara = 0; nPara < nParas; ++nPara )
+    for ( sal_uInt32 nPara = 0; nPara < nParas; ++nPara )
     {
         const OUString aLine( lcl_ConvertTabsToSpaces(pTextEngine->GetText( nPara )) );
         const sal_Int32 nLineLen = aLine.getLength();
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;