include/vcl/edit.hxx | 8 ++++---- vcl/source/control/edit.cxx | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-)
New commits: commit 628a812db0d9a53c1936874028c32c975153941d Author: Noel Grandin <n...@peralex.com> Date: Tue Oct 29 13:54:16 2013 +0200 convert vcl/Edit::Impl* methods from xub_StrLen to sal_Int32 Change-Id: I009dd167d399d817689877a5e7e22dc4ab60ec61 diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index f41908f..f02879b 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -93,8 +93,8 @@ private: SAL_DLLPRIVATE void ImplInitEditData(); SAL_DLLPRIVATE void ImplModified(); SAL_DLLPRIVATE OUString ImplGetText() const; - SAL_DLLPRIVATE void ImplRepaint( xub_StrLen nStart = 0, xub_StrLen nEnd = STRING_LEN, bool bLayout = false ); - SAL_DLLPRIVATE void ImplInvalidateOrRepaint( xub_StrLen nStart = 0, xub_StrLen nEnd = STRING_LEN ); + SAL_DLLPRIVATE void ImplRepaint( sal_Int32 nStart = 0, sal_Int32 nEnd = STRING_LEN, bool bLayout = false ); + SAL_DLLPRIVATE void ImplInvalidateOrRepaint( sal_Int32 nStart = 0, sal_Int32 nEnd = STRING_LEN ); SAL_DLLPRIVATE void ImplDelete( const Selection& rSelection, sal_uInt8 nDirection, sal_uInt8 nMode ); SAL_DLLPRIVATE void ImplSetText( const OUString& rStr, const Selection* pNewSelection = 0 ); SAL_DLLPRIVATE void ImplInsertText( const OUString& rStr, const Selection* pNewSelection = 0, sal_Bool bIsUserInput = sal_False ); @@ -104,8 +104,8 @@ private: SAL_DLLPRIVATE void ImplShowCursor( sal_Bool bOnlyIfVisible = sal_True ); SAL_DLLPRIVATE void ImplAlign(); SAL_DLLPRIVATE void ImplAlignAndPaint(); - SAL_DLLPRIVATE xub_StrLen ImplGetCharPos( const Point& rWindowPos ) const; - SAL_DLLPRIVATE void ImplSetCursorPos( xub_StrLen nChar, sal_Bool bSelect ); + SAL_DLLPRIVATE sal_Int32 ImplGetCharPos( const Point& rWindowPos ) const; + SAL_DLLPRIVATE void ImplSetCursorPos( sal_Int32 nChar, sal_Bool bSelect ); SAL_DLLPRIVATE void ImplShowDDCursor(); SAL_DLLPRIVATE void ImplHideDDCursor(); SAL_DLLPRIVATE sal_Bool ImplHandleKeyEvent( const KeyEvent& rKEvt ); diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 6fd9fd2..98edce1 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -496,7 +496,7 @@ OUString Edit::ImplGetText() const // ----------------------------------------------------------------------- -void Edit::ImplInvalidateOrRepaint( xub_StrLen nStart, xub_StrLen nEnd ) +void Edit::ImplInvalidateOrRepaint( sal_Int32 nStart, sal_Int32 nEnd ) { if( IsPaintTransparent() ) { @@ -522,7 +522,7 @@ long Edit::ImplGetTextYPosition() const // ----------------------------------------------------------------------- -void Edit::ImplRepaint( xub_StrLen nStart, xub_StrLen nEnd, bool bLayout ) +void Edit::ImplRepaint( sal_Int32 nStart, sal_Int32 nEnd, bool bLayout ) { if ( !IsReallyVisible() ) return; @@ -705,7 +705,7 @@ void Edit::ImplRepaint( xub_StrLen nStart, xub_StrLen nEnd, bool bLayout ) nIndex++; } i = nIndex; - aClip.Intersect(aRegion); + aClip.Intersect(aRegion); if( !aClip.IsEmpty() && nAttr ) { Font aFont = GetFont(); @@ -1283,9 +1283,9 @@ void Edit::ImplAlignAndPaint() // ----------------------------------------------------------------------- -xub_StrLen Edit::ImplGetCharPos( const Point& rWindowPos ) const +sal_Int32 Edit::ImplGetCharPos( const Point& rWindowPos ) const { - xub_StrLen nIndex = STRING_LEN; + sal_Int32 nIndex = STRING_LEN; OUString aText = ImplGetText(); sal_Int32 nDXBuffer[256]; @@ -1344,7 +1344,7 @@ xub_StrLen Edit::ImplGetCharPos( const Point& rWindowPos ) const // ----------------------------------------------------------------------- -void Edit::ImplSetCursorPos( xub_StrLen nChar, sal_Bool bSelect ) +void Edit::ImplSetCursorPos( sal_Int32 nChar, sal_Bool bSelect ) { Selection aSelection( maSelection ); aSelection.Max() = nChar; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits