[Libreoffice-commits] .: Branch 'feature/android' - vcl/android vcl/inc

[Michael Meeks]

 vcl/android/androidinst.cxx   |   10 +++++-----
 vcl/inc/headless/svpframe.hxx |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 436e2f870144342aa6bcc28a3a5cea32680eaacf
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Jan 31 19:53:49 2012 +0000

    android: undo broken AnyInput method causing app startup to fail.

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index b20d7c4..dfb8855 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -572,11 +572,11 @@ void AndroidSalInstance::DoReleaseYield (int nTimeoutMS)
 
 bool AndroidSalInstance::AnyInput( sal_uInt16 nType )
 {
-    (void) nType;
-    // FIXME: ideally we should check the input queue to avoid being busy ...
-    fprintf (stderr, "FIXME: AnyInput returns true\n");
-    // mpApp->inputQueue ? ...
-    return true;
+    if( (nType & VCL_INPUT_TIMER) != 0 )
+        return CheckTimeout( false );
+    // FIXME: ideally we should check our input queue here ...
+    fprintf (stderr, "FIXME: AnyInput returns false\n");
+    return false;
 }
 
 class AndroidSalSystem : public SvpSalSystem {
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 8de4054..fc923af 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -74,7 +74,7 @@ public:
     virtual SalGraphics*        GetGraphics();
     virtual void                ReleaseGraphics( SalGraphics* pGraphics );
 
-    virtual sal_Bool                PostEvent( void* pData );
+    virtual sal_Bool            PostEvent( void* pData );
 
     virtual void                SetTitle( const rtl::OUString& rTitle );
     virtual void                SetIcon( sal_uInt16 nIcon );