[Libreoffice-commits] core.git: desktop/source

Miklos Vajna vmiklos at collabora.co.uk
Wed Aug 31 15:08:35 UTC 2016


 desktop/source/lib/init.cxx |   13 +++++++++++++
 1 file changed, 13 insertions(+)

New commits:
commit 6330590e7aeeeaccd305bfd23f00badb59a43d8f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Aug 31 17:07:30 2016 +0200

    desktop: fix Android build
    
    to_string() is missing in the std namespace on the broken Android
    toolchain, work it around.
    
    Change-Id: I77fd06f869291e04c265b6b6d38b2e60b0d48caf

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9f32bcf..f4f4622 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -99,6 +99,19 @@ using namespace vcl;
 using namespace desktop;
 using namespace utl;
 
+#if defined(ANDROID)
+namespace std
+{
+template<typename T>
+std::string to_string(T x)
+{
+    std::ostringstream stream;
+    stream << x;
+    return stream.str();
+}
+}
+#endif
+
 static LibLibreOffice_Impl *gImpl = nullptr;
 static std::weak_ptr< LibreOfficeKitClass > gOfficeClass;
 static std::weak_ptr< LibreOfficeKitDocumentClass > gDocumentClass;


More information about the Libreoffice-commits mailing list