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

[Libreoffice Gerrit user]

 vcl/headless/svpframe.cxx   |    2 ++
 vcl/headless/svpgdi.cxx     |    2 ++
 vcl/headless/svpinst.cxx    |    3 ++-
 vcl/inc/headless/svpgdi.hxx |   12 ++++--------
 vcl/inc/quartz/ctfonts.hxx  |    3 ---
 vcl/ios/dummies.cxx         |    2 +-
 vcl/quartz/salvd.cxx        |    1 -
 7 files changed, 11 insertions(+), 14 deletions(-)

New commits:
commit 27ad8ca01c9691e539fea37d018d7892377f403f
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Nov 8 15:05:57 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Nov 8 19:40:01 2018 +0100

    Bin some leftover and actually unnecessary iOS crack in vcl
    
    We don't need the '#define SvpSalGraphics AquaSalGraphics' in
    vcl/inc/headless/svpgdi.hxx. The actual AquaSalGraphics we use for iOS
    is in vcl/inc/quartz/salgdi.h. I don't remember the details of the
    convoluted history behind this.
    
    Change-Id: Ie56c3c93acf7ad89e10a05e75aa4ca7fd596ba98
    Reviewed-on: https://gerrit.libreoffice.org/63098
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 0888941b0687..0e7b1bed139c 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -25,7 +25,9 @@
 
 #include <headless/svpframe.hxx>
 #include <headless/svpinst.hxx>
+#ifndef IOS
 #include <headless/svpgdi.hxx>
+#endif
 
 #include <basegfx/vector/b2ivector.hxx>
 
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 1921cde62cef..4e9c4d55e06e 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -18,7 +18,9 @@
  */
 
 #include <memory>
+#ifndef IOS
 #include <headless/svpgdi.hxx>
+#endif
 #include <headless/svpbmp.hxx>
 #include <headless/svpframe.hxx>
 #include <headless/svpcairotextrender.hxx>
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index b7df88e2ce98..5f7176e748d1 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -38,9 +38,10 @@
 #include <quartz/salbmp.h>
 #include <quartz/salgdi.h>
 #include <quartz/salvd.h>
+#else
+#include <headless/svpgdi.hxx>
 #endif
 #include <headless/svpbmp.hxx>
-#include <headless/svpgdi.hxx>
 
 #include <salframe.hxx>
 #include <svdata.hxx>
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 89fe682d3223..3ac06489ea73 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX
 #define INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX
 
+#ifdef IOS
+#error This file is not for iOS
+#endif
+
 #include <osl/endian.h>
 #include <vcl/sysdata.hxx>
 #include <vcl/metric.hxx>
@@ -27,15 +31,9 @@
 
 #include <salgdi.hxx>
 #include <sallayout.hxx>
-#ifndef IOS
 #include "svpcairotextrender.hxx"
-#endif
 #include <impfontmetricdata.hxx>
 
-#ifdef IOS
-#define SvpSalGraphics AquaSalGraphics
-#else
-
 #include <cairo.h>
 
 //Using formats that match cairo's formats. For android we patch cairo,
@@ -276,8 +274,6 @@ public:
     void                    clipRegion(cairo_t* cr);
 };
 
-#endif
-
 #endif // INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/quartz/ctfonts.hxx b/vcl/inc/quartz/ctfonts.hxx
index 78f13242c62d..89cc554439ba 100644
--- a/vcl/inc/quartz/ctfonts.hxx
+++ b/vcl/inc/quartz/ctfonts.hxx
@@ -21,9 +21,6 @@
 #define INCLUDED_VCL_INC_QUARTZ_CTFONTS_HXX
 
 #include <quartz/salgdi.h>
-#ifdef IOS
-#include "headless/svpgdi.hxx"
-#endif
 #include <sallayout.hxx>
 
 SystemFontList* GetCoretextFontList();
diff --git a/vcl/ios/dummies.cxx b/vcl/ios/dummies.cxx
index efb2d251078d..3572baa790ad 100644
--- a/vcl/ios/dummies.cxx
+++ b/vcl/ios/dummies.cxx
@@ -18,7 +18,7 @@
  */
 #include <vcl/svapp.hxx>
 #include "salprn.hxx"
-#include "headless/svpgdi.hxx"
+#include "quartz/salgdi.h"
 #include "headless/svpinst.hxx"
 #include "unx/fontmanager.hxx"
 #include "unx/gendata.hxx"
diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index 5f4c1337d9b8..f376fc4200e2 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -29,7 +29,6 @@
 #include <osx/salframe.h>
 #else
 #include "headless/svpframe.hxx"
-#include "headless/svpgdi.hxx"
 #include "headless/svpinst.hxx"
 #include "headless/svpvd.hxx"
 #endif