Add rtl::OUString::fromUtf8()

Note that this should be used only at places legitimately assuming that
the OString contains valid UTF-8.

Change-Id: I9e8ecef9928975fe0737553f5b2a19ff2dd40861

1 files changed, 20 insertions, 0 deletions

diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index f59d646dc41d..45508695a4b4 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -2075,6 +2075,26 @@ public:
     }
 
     /**
+     * Convert an OString to an OUString, assuming that the OString is
+     * UTF-8-encoded.
+     *
+     * @param rStr
+     * an OString to convert
+     *
+     * @param convertFlags
+     * flags which control the conversion.
+     *
+     * @see rtl::OStringToOUString for more info on convertFlags.
+     *
+     * @since LibreOffice 4.4
+     */
+    static inline OUString fromUtf8(const OString& rStr,
+                                    sal_uInt32 convertFlags = OSTRING_TO_OUSTRING_CVTFLAGS)
+    {
+        return OUString(rStr.getStr(), rStr.getLength(), RTL_TEXTENCODING_UTF8, convertFlags);
+    }
+
+    /**
       Returns the string representation of the integer argument.
 
       This function can't be used for language specific conversion.