summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-12 01:53:51 +0200
committerMichael Stahl <mstahl@redhat.com>2013-10-12 02:03:37 +0200
commitdca5163b6ef206ceb1f2d56feb7546c1929afe60 (patch)
tree61fd36df7a108fb27dc9fde0696a337e7639ae07
parent57f394688449e8feacb480440900cc50e1d58280 (diff)
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
-rw-r--r--sw/source/core/crsr/findtxt.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index d4110e6c7b15..c41be1285d1f 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -416,9 +416,14 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
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
{