longparas: xub_StrLen to sal_Int32

Change-Id: Ib3eb5f9df112696b326bb30e4deed49d37f30c86

6 files changed, 6 insertions, 7 deletions

diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 6fc79170b89b..87db7c1c6ca7 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -233,7 +233,7 @@ public:
     virtual Size        CalcMinimumSize() const;
     virtual Size        CalcMinimumSizeForText(const OUString &rString) const;
     virtual Size        GetOptimalSize() const;
-    virtual Size        CalcSize( sal_uInt16 nChars ) const;
+    virtual Size        CalcSize(sal_Int32 nChars) const;
     virtual sal_Int32   GetMaxVisChars() const;
 
     sal_Int32           GetCharPos( const Point& rWindowPos ) const;
diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx
index a31b1ae465d8..9e51a6f96eb9 100644
--- a/include/vcl/spinfld.hxx
+++ b/include/vcl/spinfld.hxx
@@ -103,7 +103,7 @@ public:
     virtual Size    CalcMinimumSize() const;
     virtual Size    CalcMinimumSizeForText(const OUString &rString) const;
     virtual Size    GetOptimalSize() const;
-    virtual Size    CalcSize( sal_uInt16 nChars ) const;
+    virtual Size    CalcSize(sal_Int32 nChars) const;
 };
 
 #endif // INCLUDED_VCL_SPINFLD_HXX
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 18dfee8bebcb..d01c3260fce6 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -347,7 +347,7 @@ public:
     bool            IsMouseMoveSelectEnabled() const    { return mbMouseMoveSelect; }
     bool            IsMouseMoveSelect() const   { return mbMouseMoveSelect||mbStackMode; }
 
-    Size            CalcSize( sal_uInt16 nMaxLines ) const;
+    Size            CalcSize(sal_Int32 nMaxLines) const;
     Rectangle       GetBoundingRectangle( sal_uInt16 nItem ) const;
 
     long            GetEntryHeight() const              { return mnMaxHeight; }
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index d260b078f708..3a5e5791b47d 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2942,7 +2942,7 @@ Size Edit::GetOptimalSize() const
 
 // -----------------------------------------------------------------------
 
-Size Edit::CalcSize( xub_StrLen nChars ) const
+Size Edit::CalcSize(sal_Int32 nChars) const
 {
     // width for N characters, independent from content.
     // works only correct for fixed fonts, average otherwise
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index e15898defa45..972447458935 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2154,12 +2154,11 @@ void ImplListBoxWindow::ScrollHorz( long n )
 
 // -----------------------------------------------------------------------
 
-Size ImplListBoxWindow::CalcSize( sal_uInt16 nMaxLines ) const
+Size ImplListBoxWindow::CalcSize(sal_Int32 nMaxLines) const
 {
     // FIXME: LISTBOX_ENTRY_FLAG_MULTILINE
 
     Size aSz;
-//  sal_uInt16 nL = Min( nMaxLines, mpEntryList->GetEntryCount() );
     aSz.Height() =  nMaxLines * mnMaxHeight;
     aSz.Width() = mnMaxWidth + 2*mnBorder;
     return aSz;
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index f070dfa2cfd4..6f619ccc62cc 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -1005,7 +1005,7 @@ Size SpinField::GetOptimalSize() const
 
 // -----------------------------------------------------------------------
 
-Size SpinField::CalcSize( sal_uInt16 nChars ) const
+Size SpinField::CalcSize(sal_Int32 nChars) const
 {
     Size aSz = Edit::CalcSize( nChars );