[Libreoffice-commits] core.git: editeng/source include/editeng

[Caolán McNamara (via logerrit)]

 editeng/source/uno/unotext.cxx |   12 ++++++------
 include/editeng/unotext.hxx    |    4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit cd198a34113e8fa8d1060c815b0320a52b089059
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Nov 24 09:18:41 2021 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Nov 24 20:19:16 2021 +0100

    ofz#41345 Negative-size-param
    
    Change-Id: I7398fc39c84670f455993c80ea6c9defbcf911d4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125752
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 92620d1951d3..5ae3ffac7522 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -1327,13 +1327,13 @@ bool SvxUnoTextRangeBase::IsCollapsed() noexcept
              maSelection.nStartPos  == maSelection.nEndPos );
 }
 
-bool SvxUnoTextRangeBase::GoLeft(sal_Int16 nCount, bool Expand) noexcept
+bool SvxUnoTextRangeBase::GoLeft(sal_Int32 nCount, bool Expand) noexcept
 {
     CheckSelection( maSelection, mpEditSource.get() );
 
     //  #75098# use end position, as in Writer (start is anchor, end is cursor)
-    sal_uInt16 nNewPos = maSelection.nEndPos;
-    sal_Int32  nNewPar = maSelection.nEndPara;
+    sal_Int32 nNewPos = maSelection.nEndPos;
+    sal_Int32 nNewPar = maSelection.nEndPara;
 
     bool bOk = true;
     SvxTextForwarder* pForwarder = nullptr;
@@ -1365,15 +1365,15 @@ bool SvxUnoTextRangeBase::GoLeft(sal_Int16 nCount, bool 
Expand) noexcept
     return bOk;
 }
 
-bool SvxUnoTextRangeBase::GoRight(sal_Int16 nCount, bool Expand)  noexcept
+bool SvxUnoTextRangeBase::GoRight(sal_Int32 nCount, bool Expand)  noexcept
 {
     SvxTextForwarder* pForwarder = mpEditSource ? 
mpEditSource->GetTextForwarder() : nullptr;
     if( pForwarder )
     {
         CheckSelection( maSelection, pForwarder );
 
-        sal_Int32 nNewPos = maSelection.nEndPos + nCount; //! Overflow???
-        sal_Int32  nNewPar = maSelection.nEndPara;
+        sal_Int32 nNewPos = maSelection.nEndPos + nCount;
+        sal_Int32 nNewPar = maSelection.nEndPara;
 
         bool bOk = true;
         sal_Int32 nParCount = pForwarder->GetParagraphCount();
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index a2b4ae7e7181..bd41ffd16940 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -317,8 +317,8 @@ public:
     void            CollapseToStart() noexcept;
     void            CollapseToEnd() noexcept;
     bool            IsCollapsed() noexcept;
-    bool            GoLeft(sal_Int16 nCount, bool Expand) noexcept;
-    bool            GoRight(sal_Int16 nCount, bool Expand) noexcept;
+    bool            GoLeft(sal_Int32 nCount, bool Expand) noexcept;
+    bool            GoRight(sal_Int32 nCount, bool Expand) noexcept;
     void            GotoStart(bool Expand) noexcept;
     void            GotoEnd(bool Expand) noexcept;