l10ntools/source/xmlparse.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 49538c5bcd3cfa933b73d471ef4825ca793ad910
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Thu Jun 27 19:24:44 2019 +0200
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Thu Jun 27 22:19:20 2019 +0200
Ditch "using namespace U_ICU_NAMESPACE;", qualify icu:: instead
geez.. for two places..
Change-Id: I4855fc92290547b0e1ca6ff5b2f10a333c6caa3f
Reviewed-on: https://gerrit.libreoffice.org/74815
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index b6df209ed896..088729aaf051 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -33,7 +33,6 @@
#include <rtl/strbuf.hxx>
#include <unicode/regex.h>
-using namespace U_ICU_NAMESPACE;
using namespace std;
using namespace osl;
@@ -1082,14 +1081,14 @@ OString XMLUtil::QuotHTML( const OString &rString )
UErrorCode nIcuErr = U_ZERO_ERROR;
static const sal_uInt32 nSearchFlags =
UREGEX_DOTALL | UREGEX_CASE_INSENSITIVE;
- static const UnicodeString sSearchPat( "<[/]\?\?[a-z_-]+?(?:|
+[a-z]+?=\".*?\") *[/]\?\?>" );
+ static const icu::UnicodeString sSearchPat( "<[/]\?\?[a-z_-]+?(?:|
+[a-z]+?=\".*?\") *[/]\?\?>" );
const OUString sOUSource = OStringToOUString(rString,
RTL_TEXTENCODING_UTF8);
icu::UnicodeString sSource(
reinterpret_cast<const UChar*>(
sOUSource.getStr()), sOUSource.getLength() );
- RegexMatcher aRegexMatcher( sSearchPat, nSearchFlags, nIcuErr );
+ icu::RegexMatcher aRegexMatcher( sSearchPat, nSearchFlags, nIcuErr );
aRegexMatcher.reset( sSource );
icu::UnicodeString sReturn;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
