summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2015-01-07 18:50:32 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-02-19 11:31:50 +0000
commitba4c4b936951e9ed1ac4edc4e1576ffe3e44f629 (patch)
tree6be679ebd9128d4f0a3c1161309b3b8e29e787a1
parent93f807bc15dc6580541f79701ff1561a4a6b9848 (diff)
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@redhat.com> Change-Id: I7511862ddf6ed672ba4f09ef6729fb1fa7c1d355 (cherry picked from commit 77a4ec86caeb0c7958a4b7fef38a3f0e883d0701) Reviewed-on: https://gerrit.libreoffice.org/14528 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/core/crsr/findtxt.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index c7ac1445d427..cb30dd3913c6 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;
}