Bypass X11-specific fields for Android

Change-Id: Ic8bfd4467b2fbcdcfa2caeb04d4ebe95f13863a2

7 files changed, 29 insertions, 6 deletions

diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index b54cca2b8787..10130643f277 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx
@@ -84,6 +84,9 @@ IMPL_XTYPEPROVIDER_END
             {
                  aRet <<= (sal_IntPtr)pSysData->pView;
             }
+#elif (defined ANDROID)
+            // Nothing
+            (void) SystemType;
 #elif (defined IOS)
             // Nothing
             (void) SystemType;
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 862014491cee..ab08d923e8f3 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -936,6 +936,8 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                                     aParentData.nSize   = sizeof( aParentData );
                                     #if defined MACOSX
                                     aParentData.pView   = reinterpret_cast<NSView*>(nWindowHandle);
+                                    #elif defined ANDROID
+                                    // Nothing
                                     #elif defined IOS
                                     // Nothing
                                     #elif defined UNX
@@ -1183,6 +1185,8 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
             aParentData.nSize   = sizeof( aParentData );
             #if defined MACOSX
             aParentData.pView   = reinterpret_cast<NSView*>(nWindowHandle);
+            #elif defined ANDROID
+            // Nothing
             #elif defined IOS
             // Nothing
             #elif defined UNX
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index 0f61b49fa1c7..d8580fe6ed63 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -96,6 +96,9 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException)
             {
                  aRet <<= (sal_IntPtr)pSysData->pView;
             }
+#elif (defined ANDROID)
+            // Nothing
+            (void) SystemType;
 #elif (defined IOS)
             // Nothing
             (void) SystemType;
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index ce5efb1a40fc..32baeb72ff30 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -85,6 +85,8 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle )
     aSysParentData.hWnd = (HWND) nHandle;
 #elif defined( MACOSX )
     aSysParentData.pView = reinterpret_cast<NSView*>(nHandle);
+#elif defined( ANDROID )
+    // Nothing
 #elif defined( IOS )
     // Nothing
 #elif defined( UNX )
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index dfe96a004004..bf679d9bc5d3 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -84,15 +84,12 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
     m_aSystemChildData.nSize        = sizeof( SystemChildData );
 #ifdef IOS
     // Nothing
+#elif defined ANDROID
+    // Nothing
 #else
     m_aSystemChildData.pSalFrame    = this;
-#ifdef ANDROID
-    // We want 32-bit RGBA bitmaps
-    m_aSystemChildData.nDepth       = 32;
-#else
     m_aSystemChildData.nDepth       = 24;
 #endif
-#endif
 
     if( m_pParent )
         m_pParent->m_aChildren.push_back( this );
diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx
index be17b959670d..d06e72aee22f 100644
--- a/vcl/inc/vcl/sysdata.hxx
+++ b/vcl/inc/vcl/sysdata.hxx
@@ -64,6 +64,8 @@ struct SystemEnvData
     HWND                hWnd;           // the window hwnd
 #elif defined( MACOSX )
     NSView*               pView;          // the cocoa (NSView *) implementing this object
+#elif defined( ANDROID )
+    // Nothing
 #elif defined( IOS )
     // Nothing
 #elif defined( UNX )
@@ -94,6 +96,8 @@ struct SystemParentData
     HWND            hWnd;             // the window hwnd
 #elif defined( MACOSX )
     NSView*         pView;            // the cocoa (NSView *) implementing this object
+#elif defined( ANDROID )
+    // Nothing
 #elif defined( IOS )
     // Nothing
 #elif defined( UNX )
@@ -114,6 +118,8 @@ struct SystemMenuData
     HMENU           hMenu;          // the menu handle of the menu bar
 #elif defined( MACOSX )
     // Nothing
+#elif defined( ANDROID )
+    // Nothing
 #elif defined( IOS )
     // Nothing
 #elif defined( UNX )
@@ -132,6 +138,8 @@ struct SystemGraphicsData
     HDC             hDC;            // handle to a device context
 #elif defined( MACOSX )
     CGContextRef    rCGContext;     // CoreGraphics graphic context
+#elif defined( ANDROID )
+    // Nothing
 #elif defined( IOS )
     // Nothing
 #elif defined( UNX )
@@ -149,6 +157,8 @@ struct SystemGraphicsData
         , hDC( 0 )
 #elif defined( MACOSX )
     // Nothing
+#elif defined( ANDROID )
+    // Nothing
 #elif defined( IOS )
     // Nothing
 #elif defined( UNX )
@@ -174,7 +184,9 @@ struct SystemWindowData
 #if defined( WNT )                  // meaningless on Windows
 #elif defined( MACOSX )             // meaningless on Mac OS X
     // Nothing
-#elif defined( IOS )                // and maybe on iOS, too, then
+#elif defined( ANDROID )
+    // Nothing
+#elif defined( IOS )
     // Nothing
 #elif defined( UNX )
     void*           pVisual;        // the visual to be used
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 7cca6792edb5..c2f2f13a6f64 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -224,6 +224,8 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava )
 #elif defined MACOSX
     // FIXME: this is wrong
     nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->pView );
+#elif defined ANDROID
+    // Nothing
 #elif defined IOS
     // Nothing
 #elif defined UNX