sw/source/core/crsr/findtxt.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 54a8a941c0c5f0a11c8c4fd40617bfdbb40c07ed
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jan 17 23:09:50 2014 +0100
fdo#73660: sw: fix Find of words containing soft-hyphen
Soft hyphen was not detected if there is no hint (-1).
(regression from ebeff3f074dd94dce4ce6cc55abd0495103684bd)
Change-Id: I09108796a32429a01eff93f797a6de521ab1d08a
(cherry picked from commit 156a0235bd8ff06840cecad1e70a57ffc5b8e7e1)
Reviewed-on: https://gerrit.libreoffice.org/7511
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 22183794b50d3d55094e1363755af74a10a4b555)
Reviewed-on: https://gerrit.libreoffice.org/7542
Reviewed-by: Eike Rathke <er...@redhat.com>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 796da83..5567cfa 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -89,7 +89,9 @@ lcl_CleanStr(const SwTxtNode& rNd, sal_Int32 const nStart,
sal_Int32& rEnd,
bNewHint = true;
}
// Check if next stop is a soft hyphen.
- else if (-1 != nSoftHyphen && nSoftHyphen < nHintStart && nSoftHyphen
< nEnd)
+ else if ( -1 != nSoftHyphen
+ && (-1 == nHintStart || nSoftHyphen < nHintStart)
+ && nSoftHyphen < nEnd)
{
nStt = nSoftHyphen;
bNewSoftHyphen = true;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
