[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - svl/source

[Stephan Bergmann]

 svl/source/misc/urihelper.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d665191382645b5678aa8acd796b08b0fe43e7c5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 9 11:55:59 2016 +0100

    UIDNA_CHECK_CONTEXTO is only available in ICU >= 49
    
    ...unlike the rest of the createUTS46Instance stuff, which is available in 4.6.
    While it is desirable to have that check here, it probably doesn't make much of
    a difference in practice, and Rico Tzschichholz would like to have this working
    on Ubuntu 12.04, where only ICU 4.8.1 is available.
    
    Change-Id: I5bbd2ed296c6e068e175e7f8353cea37ed4d9e44
    (cherry picked from commit f1cb83cef59c3b1d5ee780e8916832483468fab7)
    Reviewed-on: https://gerrit.libreoffice.org/22227
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 0746cb2..a27e5b3 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -761,7 +761,10 @@ OUString URIHelper::resolveIdnaHost(OUString const & url) {
     std::unique_ptr<icu::IDNA> idna(
         icu::IDNA::createUTS46Instance(
             (UIDNA_USE_STD3_RULES | UIDNA_CHECK_BIDI | UIDNA_CHECK_CONTEXTJ
-             | UIDNA_CHECK_CONTEXTO),
+#if U_ICU_VERSION_MAJOR_NUM >= 49
+             | UIDNA_CHECK_CONTEXTO
+#endif
+             ),
             e));
     if (U_FAILURE(e)) {
         SAL_WARN("vcl.gdi", "icu::IDNA::createUTS46Instance " << e);