diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-27 02:11:39 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-27 02:12:30 +0200 |
| commit | 2b520e7d8a0cf12c71b8fc09d6d83dda8a3b6c32 (patch) | |
| tree | dc492c46e496ab424b0e378bc0fa5ee99d30241a /toolkit | |
| parent | 839a61c48c191ba9b9455bc9a64b1cd3f232d2f8 (diff) | |
Bypass X11-specific fields for Android
Change-Id: Ic8bfd4467b2fbcdcfa2caeb04d4ebe95f13863a2
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxsystemdependentwindow.cxx | 3 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 4 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxtopwindow.cxx | 3 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxwindow1.cxx | 2 |
4 files changed, 12 insertions, 0 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 ) |