Bin ATSUI code

TDF has been shipping a CoreText-using LO since 4.1 and the sky hasn't
fallen. Getting rid of the ATSUI code will make other needed
refactoring easier.

Change-Id: I494096c3988ea26fa2b336621857d32b64b040f0

config_host.mk.in

@@ -105,7 +105,6 @@ export EBOOK_CFLAGS=$(gb_SPACE)@EBOOK_CFLAGS@
 export EBOOK_LIBS=$(gb_SPACE)@EBOOK_LIBS@
 export ENABLE_AVAHI=@ENABLE_AVAHI@
 export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
-export ENABLE_CORETEXT=@ENABLE_CORETEXT@
 export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
 export ENABLE_CUPS=@ENABLE_CUPS@
 export ENABLE_DBGUTIL=@ENABLE_DBGUTIL@

configure.ac

@@ -1272,12 +1272,6 @@ AC_ARG_ENABLE(firebird-sdbc,
         [Disable the build of the Firebird-SDBC driver if it doesn't compile for you.]),
 ,enable_firebird_sdbc=yes)
 
-AC_ARG_ENABLE(coretext,
-    AS_HELP_STRING([--disable-coretext],
-        [Don't use CoreText on Mac (but the obsolete ATSU instead).
-         In a 64-bit LibreOffice CoreText is by necessity always used.]),
-)
-
 AC_ARG_ENABLE(winegcc,
     AS_HELP_STRING([--enable-winegcc],
         [Enable use of winegcc during the build, in order to create msi* tools
@@ -11348,21 +11342,6 @@ else
 fi
 AC_SUBST(WITH_HELPPACK_INTEGRATION)
 
-dnl ===================================================================
-dnl Test whether to use CoreText framework
-dnl ===================================================================
-ENABLE_CORETEXT=
-if test "$_os" = "Darwin"; then
-    AC_MSG_CHECKING([whether to use CoreText framework])
-    if test "$enable_coretext" != no -o "$BITNESS_OVERRIDE" = 64; then
-        AC_MSG_RESULT([yes])
-        ENABLE_CORETEXT=TRUE
-    else
-        AC_MSG_RESULT([no])
-    fi
-fi
-AC_SUBST(ENABLE_CORETEXT)
-
 ###############################################################################
 # Extensions checking
 ###############################################################################

include/sal/log-areas.dox

@@ -332,7 +332,6 @@ certain functionality.
 @li @c vcl
 @li @c vcl.a11y
 @li @c vcl.app
-@li @c vcl.atsui - ATSUI (obsolete) -using code for Mac OS X
 @li @c vcl.control
 @li @c vcl.coretext - CoreText-using code for Mac OS X and iOS
 @li @c vcl.emf - EMF/EMF+ processing

include/vcl/sysdata.hxx

@@ -27,9 +27,7 @@
 // predeclare the native classes to avoid header/include problems
 typedef struct CGContext *CGContextRef;
 typedef struct CGLayer   *CGLayerRef;
-#ifdef ENABLE_CORETEXT
 typedef const struct __CTFont * CTFontRef;
-#endif
 #ifdef __OBJC__
 @class NSView;
 #else
@@ -214,9 +212,6 @@ struct SystemFontData
 #if defined( WNT )
     HFONT           hFont;          // native font object
 #elif defined( MACOSX )
-#ifndef ENABLE_CORETEXT
-    void*           aATSUFontID;    // native font object
-#endif
 #elif defined( UNX )
     void*           nFontId;        // native font id
     int             nFontFlags;     // native font flags
@@ -231,9 +226,6 @@ struct SystemFontData
 #if defined( WNT )
         , hFont( 0 )
 #elif defined( MACOSX )
-#ifndef ENABLE_CORETEXT
-        , aATSUFontID( NULL )
-#endif
 #elif defined( UNX )
         , nFontId( NULL )
         , nFontFlags( 0 )

vcl/Library_vcl.mk

@@ -357,12 +357,6 @@ $(eval $(call gb_Library_add_defs,vcl,\
 	-DMACOSX_BUNDLE_IDENTIFIER=\"$(MACOSX_BUNDLE_IDENTIFIER)\" \
 ))
 
-ifeq ($(ENABLE_CORETEXT),TRUE)
-
-$(eval $(call gb_Library_add_defs,vcl,\
-    -DENABLE_CORETEXT \
-))
-
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     $(vcl_coretext_code) \
 ))
@@ -371,15 +365,6 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
 	ApplicationServices \
 ))
 
-else # ATSUI
-
-$(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/aqua/source/gdi/atsui/salatslayout \
-    vcl/aqua/source/gdi/atsui/salatsuifontutils \
-    vcl/aqua/source/gdi/atsui/salgdi \
-))
-endif
-
 $(eval $(call gb_Library_add_objcxxobjects,vcl,\
     vcl/aqua/source/a11y/aqua11yactionwrapper \
     vcl/aqua/source/a11y/aqua11ycomponentwrapper \

vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm

@@ -20,7 +20,7 @@
 
 #include "aqua/salinst.h"
 #include "quartz/utils.h"
-#include "aqua/salgdi.h"
+#include "coretext/salgdi2.h"
 
 #include "aqua11ytextattributeswrapper.h"
 

vcl/aqua/source/gdi/salgdicommon.cxx

@@ -28,7 +28,7 @@
 #include "basegfx/polygon/b2dpolygon.hxx"
 
 #include "quartz/salbmp.h"
-#include "aqua/salgdi.h"
+#include "coretext/salgdi2.h"
 
 #include "fontsubset.hxx"
 #include "sft.hxx"

vcl/aqua/source/gdi/salgdiutils.cxx

@@ -29,7 +29,7 @@
 
 #include "vcl/svapp.hxx"
 
-#include "aqua/salgdi.h"
+#include "coretext/salgdi2.h"
 #include "aqua/salframe.h"
 #include "aqua/saldata.hxx"
 

vcl/aqua/source/gdi/salnativewidgets.cxx

@@ -22,7 +22,7 @@
 #include "vcl/svapp.hxx"
 #include "vcl/timer.hxx"
 
-#include "aqua/salgdi.h"
+#include "coretext/salgdi2.h"
 #include "aqua/salnativewidgets.h"
 #include "aqua/saldata.hxx"
 #include "aqua/salframe.h"

vcl/aqua/source/gdi/salprn.cxx

@@ -27,7 +27,7 @@
 #include "aqua/salinst.h"
 #include "aqua/salprn.h"
 #include "aqua/aquaprintview.h"
-#include "aqua/salgdi.h"
+#include "coretext/salgdi2.h"
 #include "aqua/saldata.hxx"
 #include "quartz/utils.h"
 

vcl/aqua/source/gdi/salvd.cxx

@@ -23,7 +23,7 @@
 
 #include "aqua/salvd.h"
 #include "aqua/salinst.h"
-#include "aqua/salgdi.h"
+#include "coretext/salgdi2.h"
 #include "aqua/saldata.hxx"
 #include "aqua/salframe.h"
 

vcl/aqua/source/window/salframe.cxx

@@ -29,7 +29,7 @@
 #include "vcl/syswin.hxx"
 
 #include "aqua/saldata.hxx"
-#include "aqua/salgdi.h"
+#include "coretext/salgdi2.h"
 #include "aqua/salframe.h"
 #include "aqua/salmenu.h"
 #include "aqua/salinst.h"

vcl/aqua/source/window/salframeview.mm

@@ -25,7 +25,7 @@
 #include "vcl/svapp.hxx"
 
 #include "aqua/salinst.h"
-#include "aqua/salgdi.h"
+#include "coretext/salgdi2.h"
 #include "aqua/salframe.h"
 #include "aqua/salframeview.h"
 #include "aqua/aqua11yfactory.h"

vcl/inc/aqua/atsui/salatsuifontutils.hxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_VCL_INC_AQUA_ATSUI_SALATSUIFONTUTILS_HXX
-#define INCLUDED_VCL_INC_AQUA_ATSUI_SALATSUIFONTUTILS_HXX
-
-class ImplMacFontData;
-class ImplDevFontList;
-
-#include <premac.h>
-#include <ApplicationServices/ApplicationServices.h>
-#include <postmac.h>
-
-#include <map>
-
-/* This class has the responsibility of assembling a list
-   of atsui compatible fonts available on the system and
-   enabling access to that list.
- */
-class SystemFontList
-{
-public:
-    SystemFontList();
-    ~SystemFontList();
-
-    void AnnounceFonts( ImplDevFontList& ) const;
-    ImplMacFontData* GetFontDataFromId( ATSUFontID ) const;
-
-    ATSUFontFallbacks maFontFallbacks;
-
-private:
-    typedef boost::unordered_map<ATSUFontID,ImplMacFontData*> MacFontContainer;
-    MacFontContainer maFontContainer;
-
-    void InitGlyphFallbacks();
-};
-
-#endif // INCLUDED_VCL_INC_AQUA_ATSUI_SALATSUIFONTUTILS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/aqua/salgdi.h

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifdef ENABLE_CORETEXT
-#  include "coretext/salgdi2.h"
-#else
-#  include "aqua/atsui/salgdi.h"
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-

vcl/inc/aqua/salvd.h

@@ -24,7 +24,7 @@
 #include <ApplicationServices/ApplicationServices.h>
 #include "postmac.h"
 
-#include "aqua/salgdi.h"
+#include "coretext/salgdi2.h"
 
 #include "salvd.hxx"
 

vcl/inc/quartz/salbmp.h

@@ -27,7 +27,7 @@
 #include "vcl/salbtype.hxx"
 
 #ifdef MACOSX
-#include "aqua/salgdi.h"
+#include "coretext/salgdi2.h"
 #else
 #include "headless/svpgdi.hxx"
 #endif