Task #3237: Allow usage of accented characters in ObjectBrowser

[modules/shaper.git] / src / Locale / Locale_Convert.cpp

diff --git a/src/Locale/Locale_Convert.cpp b/src/Locale/Locale_Convert.cpp
index f3263d8e4983ff1ca52d965730c66dee0716a8ec..5808883472aa188750205206ab54bc9a776fa116 100644 (file)
--- a/src/Locale/Locale_Convert.cpp
+++ b/src/Locale/Locale_Convert.cpp
@@ -21,35 +21,10 @@
 
 #include <boost/locale/encoding_utf.hpp>
 
-////// To support old types of GCC (less than 5.0), check the wide-string conversion is working
-////#if (__cplusplus >= 201103L || _MSVC_LANG >= 201103L)  && \
-////    (__cplusplus >= 201402L || !defined(__GLIBCXX__)   || \
-////    (defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE > 4))
-////#define HAVE_WORKING_WIDESTRING 1
-////#else
-////#define HAVE_WORKING_WIDESTRING 0
-////#endif
-////
-////#if HAVE_WORKING_WIDESTRING
-////#include <codecvt>
-////#endif
-
 namespace Locale
 {
   std::string Convert::toString(const std::wstring& theWStr)
   {
-////#if HAVE_WORKING_WIDESTRING
-////    static std::wstring_convert<std::codecvt_utf8<wchar_t> > aConvertor;
-////    return aConvertor.to_bytes(theWStr);
-////#else
-////    char* aBuf = new char[2 * (theWStr.size() + 1)];
-////    size_t aNbChars = std::wcstombs(aBuf, theWStr.c_str(), theWStr.size());
-////    if (aNbChars != (size_t)-1)
-////      aBuf[aNbChars] = '\0';
-////    std::string aStr(aBuf);
-////    delete[] aBuf;
-////    return aStr;
-////#endif
     return boost::locale::conv::utf_to_utf<char>(theWStr);
   }
 
@@ -60,18 +35,6 @@ namespace Locale
 
   std::wstring Convert::toWString(const std::string& theStr)
   {
-////#if HAVE_WORKING_WIDESTRING
-////    static std::wstring_convert<std::codecvt_utf8<wchar_t> > aConvertor;
-////    return aConvertor.from_bytes(theStr);
-////#else
-////    wchar_t* aBuf = new wchar_t[theStr.size() + 1];
-////    size_t aNbWChars = std::mbstowcs(aBuf, theStr.c_str(), theStr.size());
-////    if (aNbWChars != (size_t)-1)
-////      aBuf[aNbWChars] = L'\0';
-////    std::wstring aWStr(aBuf);
-////    delete[] aBuf;
-////    return aWStr;
-////#endif
     return boost::locale::conv::utf_to_utf<wchar_t>(theStr);
   }