diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-27 00:38:36 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-27 01:48:59 +0200 |
| commit | baeccb02dabe525217593f9f575d36882c36be76 (patch) | |
| tree | 5d95f6cdc6b8383b765b794583f7434c006aeee0 /toolkit | |
| parent | 5ea1466c4f06737669bedbaa4ee608d6a6060bf9 (diff) | |
Bypass fields that are meaningless for iOS
Change-Id: I66acafc1f7302242a2a43271b909bba331062bce
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 e156879bae0a..b54cca2b8787 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 IOS) + // Nothing + (void) SystemType; #elif (defined UNX) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW ) { diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 31fdb3a87743..862014491cee 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 IOS + // Nothing #elif defined UNX aParentData.aWindow = nWindowHandle; aParentData.bXEmbedSupport = bXEmbed; @@ -1181,6 +1183,8 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( aParentData.nSize = sizeof( aParentData ); #if defined MACOSX aParentData.pView = reinterpret_cast<NSView*>(nWindowHandle); + #elif defined IOS + // Nothing #elif defined UNX aParentData.aWindow = nWindowHandle; aParentData.bXEmbedSupport = bXEmbed; diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index a4758ac69844..0f61b49fa1c7 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 IOS) + // Nothing + (void) SystemType; #elif (defined UNX) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW ) { diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index 029c3bccf25c..ce5efb1a40fc 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( IOS ) + // Nothing #elif defined( UNX ) aSysParentData.aWindow = (long)nHandle; aSysParentData.bXEmbedSupport = bXEmbed; |