chart2/qa/extras/chart2export.cxx | 2 +-
chart2/qa/extras/chart2import.cxx | 2 +-
configure.ac | 6 +++---
oox/source/export/chartexport.cxx | 2 +-
vcl/Library_vcl.mk | 6 ++++++
5 files changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 2d55b2e5ae0d4f1a05e1ce5b20a7b342d6ea8b1d
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sun May 19 10:45:21 2013 -0500
enable coretext by default on Mac
use --disable-coretext explicitely to turn it off (and revert to ATSUI)
Change-Id: I86685482a08cd62665a94eb6e241b59a217d0b52
diff --git a/configure.ac b/configure.ac
index 05a44fb..337af8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10663,7 +10663,7 @@ dnl
===================================================================
ENABLE_CORETEXT=NO
if test "$_os" = "Darwin"; then
AC_MSG_CHECKING([whether to use CoreText framework])
- if test "$enable_coretext" = yes -o "$BITNESS_OVERRIDE" = 64; then
+ if test "$enable_coretext" != no -o "$BITNESS_OVERRIDE" = 64; then
AC_MSG_RESULT([yes])
ENABLE_CORETEXT=YES
else
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a4a6957..dfaecc7 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -381,10 +381,16 @@ $(eval $(call
gb_Library_use_system_darwin_frameworks,vcl,\
ApplicationServices \
))
else
+ifeq ($(MACOSX_SDK_VERSION),1060)
+$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
+ ApplicationServices \
+))
+else
$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
CoreText \
))
endif
+endif
else # ATSUI
commit 123c226af5b529e5b4fdb9d930eac089706049c5
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sun May 19 08:38:40 2013 -0500
build gallery does not work on Mac, disable it by default
Change-Id: I94bf2aea81dfdeb5e70672092e89acc1e4ceabf7
diff --git a/configure.ac b/configure.ac
index 7174b9c..05a44fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2226,12 +2226,12 @@ if test -n "${with_galleries}"; then
AC_MSG_ERROR([unknown value --with-galleries=$with_galleries])
fi
else
- if test $_os != iOS -a $_os != Android; then
+ if test $_os != iOS -a $_os != Android -a $_os != Darwin; then
WITH_GALLERY_BUILD=YES
AC_MSG_RESULT([internal src images for desktop])
else
WITH_GALLERY_BUILD=
- AC_MSG_RESULT([disable src imgage build for non-desktop])
+ AC_MSG_RESULT([disable src imgage build])
fi
fi
AC_SUBST(WITH_GALLERY_BUILD)
commit e84a04273b08bf4527155d348f2aebe840696b4e
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Wed May 15 14:40:01 2013 -0500
WaE on mac osx build
Change-Id: Ief28d2563b66754d00fdc09d6d68ea3a73aff22a
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index 3e645ab..3a6cd81 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -49,7 +49,7 @@ void testErrorBar( Reference< XPropertySet > xErrorBar )
CPPUNIT_ASSERT(
xErrorBar->getPropertyValue("ShowNegativeError") >>= bShowNegative);
CPPUNIT_ASSERT(bShowNegative);
- double nVal;
+ double nVal = 0.0;
CPPUNIT_ASSERT(xErrorBar->getPropertyValue("PositiveError") >>= nVal);
CPPUNIT_ASSERT_DOUBLES_EQUAL(nVal, 10.0, 1e-10);
}
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index decd18e..074b232 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -56,7 +56,7 @@ void Chart2ImportTest::Fdo60083()
static_cast<sal_Int32>(chart::ErrorBarStyle::RELATIVE),
nErrorBarStyle);
- double nVal;
+ double nVal = 0.0;
CPPUNIT_ASSERT(
xErrorBarYProps->getPropertyValue("PositiveError") >>= nVal);
CPPUNIT_ASSERT_DOUBLES_EQUAL(5.0, nVal, 1e-8);
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 0921156..c52a3b1 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2684,7 +2684,7 @@ void ChartExport::exportErrorBar(Reference< XPropertySet>
xErrorBarProps, bool b
}
else
{
- double nVal;
+ double nVal = 0.0;
if(nErrorBarStyle == cssc::ErrorBarStyle::STANDARD_DEVIATION)
{
xErrorBarProps->getPropertyValue("Weight") >>= nVal;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
