[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-1' - sw/source

[Matteo Casalin]

 sw/source/core/crsr/findtxt.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ba4c4b936951e9ed1ac4edc4e1576ffe3e44f629
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Wed Jan 7 18:50:32 2015 +0100

    tdf#89105: sw: Remove unnecessary downcast
    
    This fixes an infinite loop in SwPaM::DoSearch() that can happen with
    32-bit paragraphs now.
    
    (cherry picked from commit dd9972f5f37063f5fe3eb5e011d2adc73f44d305)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>
    
    Change-Id: I7511862ddf6ed672ba4f09ef6729fb1fa7c1d355
    (cherry picked from commit 77a4ec86caeb0c7958a4b7fef38a3f0e883d0701)
    Reviewed-on: https://gerrit.libreoffice.org/14528
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index c7ac144..cb30dd3 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -506,8 +506,8 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
         }
         else
         {
-            nStart = (sal_uInt16)nProxyStart;
-            nEnd = (sal_uInt16)nProxyEnd;
+            nStart = nProxyStart;
+            nEnd = nProxyEnd;
         }
         nStart = nEnd;
     }