[Libreoffice-commits] core.git: vcl/inc vcl/source

[Tor Lillqvist]

 vcl/inc/vcl/svapp.hxx    |    4 ++++
 vcl/source/app/svapp.cxx |    4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 7a754444505d6a4b0f1c02603fcc7559819f7d65
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Apr 19 14:04:55 2013 +0300

    Make Application::PostZoomEvent() and PostScrollEvent() non-DESKTOP only
    
    That is where they are used anyway. Avoids misleading entries in
    unusedcode.easy.
    
    Change-Id: I2ce06ebca55998dc1df7df1f40b08b496adfbc64

diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 3198a3d..b4acc57 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -20,6 +20,8 @@
 #ifndef _SV_SVAPP_HXX
 #define _SV_SVAPP_HXX
 
+#include <config_features.h>
+
 #include <sal/config.h>
 
 #include <stdexcept>
@@ -211,8 +213,10 @@ public:
 
     static sal_uLong                PostKeyEvent( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent );
     static sal_uLong                PostMouseEvent( sal_uLong nEvent, Window *pWin, MouseEvent* pMouseEvent );
+#if !HAVE_FEATURE_DESKTOP
     static sal_uLong            PostZoomEvent( sal_uLong nEvent, Window *pWin, ZoomEvent* pZoomEvent );
     static sal_uLong            PostScrollEvent( sal_uLong nEvent, Window *pWin, ScrollEvent* pScrollEvent );
+#endif
     static void                 RemoveMouseAndKeyEvents( Window *pWin );
 
     static sal_uLong                PostUserEvent( const Link& rLink, void* pCaller = NULL );
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index b3ebdf5..9792f14 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -880,6 +880,8 @@ sal_uLong Application::PostMouseEvent( sal_uLong nEvent, Window *pWin, MouseEven
     return nEventId;
 }
 
+#if !HAVE_FEATURE_DESKTOP
+
 sal_uLong Application::PostZoomEvent( sal_uLong nEvent, Window *pWin, ZoomEvent* pZoomEvent )
 {
     const SolarMutexGuard aGuard;
@@ -937,7 +939,7 @@ sal_uLong Application::PostScrollEvent( sal_uLong nEvent, Window *pWin, ScrollEv
     return nEventId;
 }
 
-// -----------------------------------------------------------------------------
+#endif // !HAVE_FEATURE_DESKTOP
 
 IMPL_STATIC_LINK_NOINSTANCE( Application, PostEventHandler, void*, pCallData )
 {