[Libreoffice-commits] core.git: 2 commits - toolkit/source vcl/headless vcl/inc vcl/source
Tor Lillqvist
tml at iki.fi
Tue Mar 26 17:12:55 PDT 2013
toolkit/source/awt/vclxsystemdependentwindow.cxx | 3 +++
toolkit/source/awt/vclxtoolkit.cxx | 4 ++++
toolkit/source/awt/vclxtopwindow.cxx | 3 +++
toolkit/source/awt/vclxwindow1.cxx | 2 ++
vcl/headless/svpframe.cxx | 7 ++-----
vcl/headless/svptext.cxx | 1 +
vcl/inc/vcl/sysdata.hxx | 14 +++++++++++++-
vcl/source/window/syschild.cxx | 2 ++
8 files changed, 30 insertions(+), 6 deletions(-)
New commits:
commit 2b520e7d8a0cf12c71b8fc09d6d83dda8a3b6c32
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed Mar 27 02:11:39 2013 +0200
Bypass X11-specific fields for Android
Change-Id: Ic8bfd4467b2fbcdcfa2caeb04d4ebe95f13863a2
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index b54cca2..1013064 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 8620144..ab08d92 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 0f61b49..d8580fe 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 ce5efb1..32baeb7 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 dfe96a0..bf679d9 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 be17b95..d06e72a 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 7cca679..c2f2f13 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
commit 839a61c48c191ba9b9455bc9a64b1cd3f232d2f8
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed Mar 27 02:06:33 2013 +0200
Need <vcl/sysdata.hxx> here now
Change-Id: I8287f55e283676fb3dc83e7c1f4200e6a3c78f45
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index b4429b2..1e74823 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -29,6 +29,7 @@
#include <impfont.hxx>
#include <rtl/instance.hxx>
+#include "vcl/sysdata.hxx"
#include "generic/geninst.h"
#include "generic/genpspgraphics.h"
#include "generic/glyphcache.hxx"
More information about the Libreoffice-commits
mailing list