[Libreoffice-commits] core.git: 5 commits - bridges/source vcl/headless vcl/inc vcl/ios vcl/source

[Tor Lillqvist]

 bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx |    1 +
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx |    2 ++
 vcl/headless/svpframe.cxx                           |    8 +++++++-
 vcl/inc/salprn.hxx                                  |    1 +
 vcl/ios/iosinst.cxx                                 |    2 +-
 vcl/source/opengl/OpenGLHelper.cxx                  |    4 ++++
 6 files changed, 16 insertions(+), 2 deletions(-)

New commits:
commit f3346b1fc568f044aa02b01758a9598aed0c95e7
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Aug 9 10:58:03 2016 +0300

    Intermediate iOS hack
    
    Just to get this one file to compile. More errors come later.  I just
    spent a short time on this while waiting for something else.
    
    Actually I have no idea what we should do on iOS nowadays. Do we want
    to use cairo? Do we want to use OpenGL? Would it make sense to mimic
    what we do on Android as much as possible? (But what do we do on
    Android, and is that by choice or accident?) Even if that might mean
    not using APIs native to iOS, but slower (not HW accelerated) FLOSS
    alternatives that perform the same functionality, broadly speaking?
    
    Change-Id: Id88a895b90f753417eced744141376656bcf72c3

diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 7eac6b3..0ce76cf 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -26,7 +26,9 @@
 
 #include <basegfx/vector/b2ivector.hxx>
 
+#ifndef IOS
 #include <cairo.h>
+#endif
 
 using namespace basegfx;
 
@@ -44,7 +46,9 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
     m_pParent( static_cast<SvpSalFrame*>(pParent) ),
     m_nStyle( nSalFrameStyle ),
     m_bVisible( false ),
+#ifndef IOS
     m_pSurface( nullptr ),
+#endif
     m_nMinWidth( 0 ),
     m_nMinHeight( 0 ),
     m_nMaxWidth( 0 ),
@@ -55,7 +59,7 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
     memset( static_cast<void *>(&m_aSystemChildData), 0, sizeof( SystemEnvData ) );
     m_aSystemChildData.nSize        = sizeof( SystemEnvData );
 #ifdef IOS
-    (void) nScanlineFormat;
+    // Nothing
 #elif defined ANDROID
     // Nothing
 #else
@@ -111,8 +115,10 @@ SvpSalFrame::~SvpSalFrame()
             }
         }
     }
+#ifndef IOS
     if (m_pSurface)
         cairo_surface_destroy(m_pSurface);
+#endif
 }
 
 void SvpSalFrame::GetFocus()
commit 8778a3e03945f5bafabb0274e3bd79aab6ee92f4
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Aug 9 10:54:11 2016 +0300

    Surround PaintScope code with ifdefs matching declaration in include file
    
    Change-Id: Iede85fc847b330b5586b95facafb690df7209d1b

diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 8642844..d904009 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -1072,6 +1072,8 @@ void OpenGLHelper::debugMsgPrint(const int nType, const char *pFormat, ...)
     va_end (aArgs);
 }
 
+#if HAVE_FEATURE_OPENGL || defined(ANDROID)
+
 OutputDevice::PaintScope::PaintScope(OutputDevice *pDev)
     : pHandle( nullptr )
 {
@@ -1108,4 +1110,6 @@ OutputDevice::PaintScope::~PaintScope()
     flush();
 }
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 237ff9c497b5ad166032f567aaa1fcde91c81ed1
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Aug 9 10:53:40 2016 +0300

    Include <vcl/dllapi.h> for VCL_PLUGIN_PUBLIC
    
    Change-Id: I5e248ed670502a2702f08e31739a8c82c29d5302

diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index 5472684..e11eaff 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_VCL_INC_SALPRN_HXX
 
 #include <vcl/prntypes.hxx>
+#include <vcl/dllapi.h>
 
 #include "salptype.hxx"
 
commit c4e89590c6e043c80576e26b61ef444f864359d9
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Aug 9 10:53:15 2016 +0300

    gendata.hxx has moved
    
    Change-Id: I55223078e189416c4181141a7a904e93d5c6a01e

diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 6ca639e..fa821a2 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -23,7 +23,7 @@
 
 #include "ios/iosinst.hxx"
 #include "headless/svpdummies.hxx"
-#include "generic/gendata.hxx"
+#include "unx/gendata.hxx"
 #include "quartz/utils.h"
 #include <vcl/layout.hxx>
 #include <vcl/settings.hxx>
commit 5a833144b516f75e8f2ea1297dd0327c84010cc6
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Aug 9 10:05:48 2016 +0300

    SAL_FALLTHROUGH
    
    Change-Id: I347c13b282ccbd40a5e2e4a504f0c8ee1882d602

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
index 64a214f..e81c17f 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
@@ -408,6 +408,7 @@ namespace
                     TYPELIB_DANGER_RELEASE( pTD );
                 }
             } // else perform queryInterface()
+            SAL_FALLTHROUGH;
             default:
                 eRet = cpp2uno_call(
                     pCppI, aMemberDescr.get(),
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
index a48d88a..40bd621 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
@@ -114,6 +114,7 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference *
         case typelib_TypeClass_HYPER:
         case typelib_TypeClass_UNSIGNED_HYPER:
             pRegisterReturn[1] = r1;
+            SAL_FALLTHROUGH;
         case typelib_TypeClass_LONG:
         case typelib_TypeClass_UNSIGNED_LONG:
         case typelib_TypeClass_ENUM:
@@ -654,6 +655,7 @@ void unoInterfaceProxyDispatch(
                 TYPELIB_DANGER_RELEASE( pTD );
             }
         } // else perform queryInterface()
+        SAL_FALLTHROUGH;
         default:
             // dependent dispatch
             cpp_call(