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

Matteo Casalin matteo.casalin at yahoo.com
Tue Feb 17 14:37:41 PST 2015


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

New commits:
commit 620df179e0cc1339017a36840e19280f133b2a1a
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

diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 8b0b33c..c8edd1e 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -504,8 +504,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;
     }


More information about the Libreoffice-commits mailing list