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

[Michael Meeks]

 vcl/android/androidinst.cxx   |    7 +------
 vcl/inc/generic/geninst.h     |    6 +++---
 vcl/inc/headless/svpframe.hxx |    3 +++
 3 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 29aa585b2ee2af0680eb39749d1797f52e190a3a
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Fri Feb 3 18:49:59 2012 +0100

    android: get the focus window from SvpSalFrame

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 6d70471..50a3040 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -321,11 +321,6 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow *pWindow)
     mbQueueReDraw = false;
 }
 
-SalFrame *AndroidSalInstance::getFocusFrame() const
-{
-    return !getFrames().empty() ? *getFrames().begin() : NULL;
-}
-
 static const char *app_cmd_name(int cmd)
 {
     switch (cmd) {
@@ -436,7 +431,7 @@ int32_t AndroidSalInstance::onInputEvent (struct android_app* app, AInputEvent*
         aEvent.mnCharCode = 'a'; // the unicode of it all ...
         aEvent.mnRepeat = AKeyEvent_getRepeatCount(event);
 
-        SalFrame *pFocus = getFocusFrame();
+        SalFrame *pFocus = SvpSalFrame::GetFocusFrame();
         if (pFocus)
             bHandled = pFocus->CallCallback( nEvent, &aEvent );
         else
diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/generic/geninst.h
index 471b630..240ebe6 100644
--- a/vcl/inc/generic/geninst.h
+++ b/vcl/inc/generic/geninst.h
@@ -103,7 +103,7 @@ public:
     virtual void                GetPrinterQueueInfo    ( ImplPrnQueueList* pList );
     virtual void                GetPrinterQueueState   ( SalPrinterQueueInfo* pInfo );
     virtual void                DeletePrinterQueueInfo ( SalPrinterQueueInfo* pInfo );
-    virtual rtl::OUString              GetDefaultPrinter();
+    virtual rtl::OUString       GetDefaultPrinter();
     virtual void                PostPrintersChanged() = 0;
     virtual void                updatePrinterUpdate();
     virtual void                jobStartedPrinterUpdate();
@@ -117,8 +117,8 @@ public:
 
 protected:
     void configurePspInfoPrinter( PspSalInfoPrinter* pInfoPrinter,
-                           SalPrinterQueueInfo* pQueueInfo,
-                           ImplJobSetup* pSetupData );
+                                  SalPrinterQueueInfo* pQueueInfo,
+                                  ImplJobSetup* pSetupData );
 };
 
 inline SalGenericInstance *GetGenericInstance()
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index fc923af..8c30e23 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -127,6 +127,9 @@ public:
     virtual void                SetScreenNumber( unsigned int nScreen ) { (void)nScreen; }
     virtual void                SetApplicationID(const rtl::OUString &rApplicationID) { (void) rApplicationID; }
     bool IsVisible() { return m_bVisible; }
+
+    static SvpSalFrame*         GetFocusFrame() { return s_pFocusFrame; }
+
 };
 #endif // _SVP_SVPFRAME_HXX