sc/source/filter/excel/xetable.cxx | 11 +++++++++++ 1 file changed, 11 insertions(+)
New commits: commit b87da122f34245dfc573a7c0aaf1ed00051fead5 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Tue Aug 9 10:35:41 2016 +0200 sc: fix Android build trunc() is missing in the std namespace on the broken Android toolchain, work it around. Change-Id: I9715bce8e888a6f35d06753e40ab34ac43642acc (cherry picked from commit 10652c109e732584e43b81ecbd6f97277edb5c7b) Reviewed-on: https://gerrit.libreoffice.org/31661 Reviewed-by: Eike Rathke <er...@redhat.com> Tested-by: Jenkins <c...@libreoffice.org> diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 06170a1..bb553a4 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -37,6 +37,17 @@ #include <thread> #include <comphelper/threadpool.hxx> +#if defined(ANDROID) +namespace std +{ +template<typename T> +T trunc(T x) +{ + return ::trunc(x); +} +} +#endif + using namespace ::oox; namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits