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

Norbert Thiebaud nthiebaud at gmail.com
Wed Apr 9 11:49:02 PDT 2014


 vcl/quartz/CTRunData.cxx |    9 ---------
 vcl/quartz/CTRunData.hxx |    4 ++++
 2 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 87ba23f38cc8a71581c0b034c503aedf46aad45f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Apr 9 13:47:43 2014 -0500

    CTRunData fix include mishap
    
    Change-Id: If60a02f42a64ac60fb5be1072bf34efcbfa3cc6b

diff --git a/vcl/quartz/CTRunData.cxx b/vcl/quartz/CTRunData.cxx
index 2406a5d..377615d 100644
--- a/vcl/quartz/CTRunData.cxx
+++ b/vcl/quartz/CTRunData.cxx
@@ -10,15 +10,6 @@
 #include <sal/types.h>
 #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"
 
 CTRunData::CTRunData( CTRunRef pRun, int start)
diff --git a/vcl/quartz/CTRunData.hxx b/vcl/quartz/CTRunData.hxx
index 2fb1912c..043d404 100644
--- a/vcl/quartz/CTRunData.hxx
+++ b/vcl/quartz/CTRunData.hxx
@@ -10,8 +10,12 @@
 #define CTRunData_Included
 
 #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"
 
 class CTRunData


More information about the Libreoffice-commits mailing list