From 9561c2f6793bede6e5092c36a4f1c8dbb782c4f4 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 20 Apr 2015 13:50:52 +0200
Subject: Clean up new rtl/surrogates.h

Change-Id: Iec781bdbbf216cb14c9ba5be5955123273d7699c
---
 tools/source/fsys/urlobj.cxx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 4dfe58895bce..08c0c6da5a7e 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -31,7 +31,6 @@
 #include <osl/file.hxx>
 #include <rtl/character.hxx>
 #include <rtl/string.h>
-#include <rtl/surrogates.h>
 #include <rtl/textenc.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
@@ -4778,9 +4777,9 @@ sal_uInt32 INetURLObject::getUTF32(sal_Unicode const *& rBegin,
                                     nShift -= 6;
                                 }
                                 if (bUTF8 && nEncoded >= nMin
-                                    && !isHighSurrogate(nEncoded)
-                                    && !isLowSurrogate(nEncoded)
-                                    && nEncoded <= 0x10FFFF)
+                                    && nEncoded <= 0x10FFFF
+                                    && !rtl::isHighSurrogate(nEncoded)
+                                    && !rtl::isLowSurrogate(nEncoded))
                                 {
                                     rBegin = p;
                                     nUTF32 = nEncoded;
-- 
cgit v1.2.3