drawinglayer/source/primitive2d/polygonprimitive2d.cxx | 4 ++--
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 2 +-
scaddins/source/analysis/analysis.cxx | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 5a94bc910aa4418326aef894fc412ab71b24bd31
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Jan 7 11:23:53 2015 +0100
drawinglayer: fix Android build
Change-Id: Ie214c91f59780db9baa40cea01b6ddef3019febf
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index a4f667e..c6bbfd2 100644
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
@@ -29,7 +29,7 @@
#include <comphelper/random.hxx>
using namespace com::sun::star;
-
+using namespace std;
namespace drawinglayer
@@ -217,7 +217,7 @@ namespace drawinglayer
{
double getRandomColorRange()
{
- return comphelper::rng::uniform_real_distribution(0.0,
std::nextafter(1.0, DBL_MAX));
+ return comphelper::rng::uniform_real_distribution(0.0,
nextafter(1.0, DBL_MAX));
}
}
commit 05850304c98b9365dbd5c5210d06e24ee9c5e13f
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Jan 7 11:12:48 2015 +0100
jvmfwk: fix Android build
Change-Id: Ib183158e51f7bebbb6add92e460a33fa132c1c9d
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index d3ac151..de1d979 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -83,7 +83,7 @@ namespace {
struct PluginMutex: public ::rtl::Static<osl::Mutex, PluginMutex> {};
-#if defined UNX
+#if defined(UNX) && !defined(ANDROID)
OString getPluginJarPath(
const OUString & sVendor,
const OUString& sLocation,
commit f4fadeb63b902fd09227b8a4128c76f6e32a0b71
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Jan 7 11:07:30 2015 +0100
scaddins: fix Android build
_GLIBCXX_USE_C99_MATH_TR1 is defined on Linux, so nextafter() is
imported into the std namespace, but it isn't defined on Android. So
just import the whole namespace to make both happy.
Change-Id: I8a94198ff65557e64d4ea9f833e3eee5e1aa26ec
diff --git a/scaddins/source/analysis/analysis.cxx
b/scaddins/source/analysis/analysis.cxx
index d124a79..20edfc6 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -38,6 +38,7 @@
#define MY_IMPLNAME "com.sun.star.sheet.addin.AnalysisImpl"
using namespace ::com::sun::star;
+using namespace std;
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL analysis_component_getFactory(
const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
@@ -702,7 +703,7 @@ double SAL_CALL AnalysisAddIn::getRandbetween( double fMin,
double fMax ) throw(
if( fMin > fMax )
throw lang::IllegalArgumentException();
- double fRet = floor(comphelper::rng::uniform_real_distribution(fMin,
std::nextafter(fMax+1, -DBL_MAX)));
+ double fRet = floor(comphelper::rng::uniform_real_distribution(fMin,
nextafter(fMax+1, -DBL_MAX)));
RETURN_FINITE( fRet );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
