[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
Michael Stahl
mstahl at redhat.com
Mon Oct 14 03:44:26 PDT 2013
sw/source/core/crsr/findtxt.cxx | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 386d0c5d663fe50295be3714977a54b86212f766
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Oct 12 01:53:51 2013 +0200
fdo#64495: sw: fix regex search for soft hyphen \xAD
The problem is that the soft hyphen apparently needs special handling,
and SwPaM::DoSearch() looked for the no longer supported legacy syntax,
not for any of the unicode character syntax that ICU regex supports.
Change-Id: I754296d2cf9286242e083cc7906ce3b8fda78dd5
(cherry picked from commit dca5163b6ef206ceb1f2d56feb7546c1929afe60)
Reviewed-on: https://gerrit.libreoffice.org/6229
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index cb6ec35..eb66500 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -420,9 +420,14 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
bool bRemoveSoftHyphens = true;
if ( bRegSearch )
{
- const OUString a00AD("\\x00AD");
- if ( -1 != rSearchOpt.searchString.indexOf( a00AD ) )
+ if ( -1 != rSearchOpt.searchString.indexOf("\\xAD")
+ || -1 != rSearchOpt.searchString.indexOf("\\x{00AD}")
+ || -1 != rSearchOpt.searchString.indexOf("\\u00AD")
+ || -1 != rSearchOpt.searchString.indexOf("\\U000000AD")
+ || -1 != rSearchOpt.searchString.indexOf("\\N{SOFT HYPHEN}"))
+ {
bRemoveSoftHyphens = false;
+ }
}
else
{
More information about the Libreoffice-commits
mailing list