[Libreoffice-commits] core.git: 2 commits - sw/qa vcl/quartz

[Norbert Thiebaud]

 sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx |    2 +-
 vcl/quartz/CTRunData.cxx                    |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit b2aced2dda51008b2c538711ee65c6443be2e9b1
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Apr 9 12:12:02 2014 -0500

    coretext: what to include is SDK dependant
    
    Change-Id: Ie3cfd1427dfe668c4cf682efa1f728dea764d277

diff --git a/vcl/quartz/CTRunData.cxx b/vcl/quartz/CTRunData.cxx
index 609449b..2406a5d 100644
--- a/vcl/quartz/CTRunData.cxx
+++ b/vcl/quartz/CTRunData.cxx
@@ -11,8 +11,12 @@
 #include <cassert>
 
 #include "premac.h"
+#if defined(MACOSX) && MACOSX_SDK_VERSION < 1080
+#include <ApplicationServices/ApplicationServices.h>
+#else
 #include <CoreGraphics/CoreGraphics.h>
 #include <CoreText/CoreText.h>
+#endif
 #include "postmac.h"
 
 #include "CTRunData.hxx"
commit 066288976bc32321b2547d4dba71654f5657a904
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Mar 31 21:33:58 2014 -0500

    tweak the height value in testDmlRectangleResize once again to pass on Mac
    
    Change-Id: I4d4780bdd8491c00140babc7651fc80a711bcf20

diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index 535ee1a..5f5ecf9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -202,7 +202,7 @@ DECLARE_OOXMLEXPORT_TEST(testDmlRectangleRelsize, "dml-rectangle-relsize.docx")
     // This was around 19560, as we did not read wp14:pctHeight for
     // drawinglayer shapes and the fallback data was invalid.
     OString aMessage("Height is only " + OString::number(getShape(1)->getSize().Height));
-    CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(), getShape(1)->getSize().Height >= 20992);
+    CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(), getShape(1)->getSize().Height >= 20973);
 
     // This was around 0: relative size of 0% was imported as 0, not "fall back to absolute size".
     CPPUNIT_ASSERT(getShape(2)->getSize().Height > 300);