duplicate surrogate code

Change-Id: I9fad024e4b5c8a4ca272f2387df07351198cf5dc

2 files changed, 57 insertions, 30 deletions

diff --git a/include/rtl/surrogates.h b/include/rtl/surrogates.h
new file mode 100644
index 000000000000..ab98cd666ca3
--- /dev/null
+++ b/include/rtl/surrogates.h
@@ -0,0 +1,57 @@
+/* -*- 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_RTL_SURROGATES_H
+#define INCLUDED_RTL_SURROGATES_H
+
+#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
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+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;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx
index 020e16a2e13c..45bf02a5878e 100644
--- a/include/tools/inetmime.hxx
+++ b/include/tools/inetmime.hxx
@@ -262,13 +262,6 @@ public:
      */
     static sal_uInt32 getHexDigit(int nWeight);
 
-    static inline bool isHighSurrogate(sal_uInt32 nUTF16);
-
-    static inline bool isLowSurrogate(sal_uInt32 nUTF16);
-
-    static inline sal_uInt32 toUTF32(sal_Unicode cHighSurrogate,
-                                     sal_Unicode cLowSurrogate);
-
     /** Check two US-ASCII strings for equality, ignoring case.
 
         @param pBegin1  Points to the start of the first string, must not be
@@ -531,29 +524,6 @@ inline int INetMIME::getBase64Weight(sal_uInt32 nChar)
 }
 
 // static
-inline bool INetMIME::isHighSurrogate(sal_uInt32 nUTF16)
-{
-    return nUTF16 >= 0xD800 && nUTF16 <= 0xDBFF;
-}
-
-// static
-inline bool INetMIME::isLowSurrogate(sal_uInt32 nUTF16)
-{
-    return nUTF16 >= 0xDC00 && nUTF16 <= 0xDFFF;
-}
-
-// static
-inline sal_uInt32 INetMIME::toUTF32(sal_Unicode cHighSurrogate,
-                                    sal_Unicode cLowSurrogate)
-{
-    DBG_ASSERT(isHighSurrogate(cHighSurrogate)
-               && isLowSurrogate(cLowSurrogate),
-               "INetMIME::toUTF32(): Bad chars");
-    return ((sal_uInt32(cHighSurrogate) & 0x3FF) << 10)
-               | (sal_uInt32(cLowSurrogate) & 0x3FF);
-}
-
-// static
 inline bool INetMIME::startsWithLineBreak(const sal_Char * pBegin,
                                           const sal_Char * pEnd)
 {