duplicate surrogate code

Change-Id: I9fad024e4b5c8a4ca272f2387df07351198cf5dc

4 files changed, 3 insertions, 53 deletions

diff --git a/sal/rtl/string.cxx b/sal/rtl/string.cxx
index 89459dbc2c0c..68a85f0ae841 100644
--- a/sal/rtl/string.cxx
+++ b/sal/rtl/string.cxx
@@ -32,7 +32,7 @@
 #include <rtl/tencinfo.h>
 
 #include "strimp.hxx"
-#include "surrogates.hxx"
+#include <rtl/surrogates.h>
 #include <rtl/string.h>
 
 #include "rtl/math.h"
diff --git a/sal/rtl/surrogates.hxx b/sal/rtl/surrogates.hxx
deleted file mode 100644
index b100597d5da0..000000000000
--- a/sal/rtl/surrogates.hxx
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SAL_RTL_SURROGATES_HXX
-#define INCLUDED_SAL_RTL_SURROGATES_HXX
-
-#include <sal/config.h>
-
-#include <sal/types.h>
-
-#define SAL_RTL_FIRST_HIGH_SURROGATE 0xD800
-#define SAL_RTL_LAST_HIGH_SURROGATE 0xDBFF
-#define SAL_RTL_FIRST_LOW_SURROGATE 0xDC00
-#define SAL_RTL_LAST_LOW_SURROGATE 0xDFFF
-
-inline bool isHighSurrogate(sal_uInt32 utf16) {
-    return utf16 >= SAL_RTL_FIRST_HIGH_SURROGATE
-        && utf16 <= SAL_RTL_LAST_HIGH_SURROGATE;
-}
-
-inline bool isLowSurrogate(sal_uInt32 utf16) {
-    return utf16 >= SAL_RTL_FIRST_LOW_SURROGATE
-        && utf16 <= SAL_RTL_LAST_LOW_SURROGATE;
-}
-
-inline sal_uInt32 combineSurrogates(sal_uInt32 high, sal_uInt32 low) {
-    return ((high - SAL_RTL_FIRST_HIGH_SURROGATE) << 10)
-        + (low - SAL_RTL_FIRST_LOW_SURROGATE) + 0x10000;
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx
index f7c62649ca00..a90b40ba83d3 100644
--- a/sal/rtl/uri.cxx
+++ b/sal/rtl/uri.cxx
@@ -17,11 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "surrogates.hxx"
-
 #include "osl/diagnose.h"
 #include "rtl/character.hxx"
 #include "rtl/strbuf.hxx"
+#include "rtl/surrogates.h"
 #include "rtl/textenc.h"
 #include "rtl/textcvt.h"
 #include "rtl/uri.h"
diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx
index d91aaad8ffe1..a418c6ad5841 100644
--- a/sal/rtl/ustring.cxx
+++ b/sal/rtl/ustring.cxx
@@ -39,7 +39,7 @@
 
 #include "hash.hxx"
 #include "strimp.hxx"
-#include "surrogates.hxx"
+#include <rtl/surrogates.h>
 #include <rtl/ustring.h>
 
 #include "rtl/math.h"