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

Noel Grandin noel at peralex.com
Thu Jul 30 01:13:08 PDT 2015


 include/vcl/svapp.hxx    |   26 --------------------
 vcl/source/app/svapp.cxx |   60 -----------------------------------------------
 2 files changed, 1 insertion(+), 85 deletions(-)

New commits:
commit c45dc832dde14b8c8573c6feb3b8cac0a57b66a6
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Jul 30 10:11:57 2015 +0200

    remove PostScrollEvent and PostZoomEvent
    
    not used anymore
    
    Change-Id: I9db73a1bfcdb6669310d606b101b1ffdbb2df07f

diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 7acca91..e7808c0 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -834,36 +834,12 @@ public:
     */
     static ImplSVEvent *        PostMouseEvent( sal_uLong nEvent, vcl::Window *pWin, MouseEvent* pMouseEvent );
 
-#if !HAVE_FEATURE_DESKTOP
-    /** Send zoom event
-
-     Experimental work in progress. Available only for iOS and Android, and unclear whether actually
-     is needed now with tiled rendering.
-
-     @param     nEvent          Event ID for zoom event
-     @param     pWin            Pointer to window to which the event is sent
-     @param     pZoomEvent      Zoom event to send
-    */
-    static ImplSVEvent *        PostZoomEvent( sal_uLong nEvent, vcl::Window *pWin, ZoomEvent* pZoomEvent );
-
-    /* Send scroll event
-
-     Experimental work in progress. Available only for iOS and Android, and unclear whether actually
-     is needed now with tiled rendering.
-
-     @param      nEvent          Event ID for scroll event
-     @param      pWin            Pointer to window to which the event is sent
-     @param      pScrollEvent    Scroll event to send
-    */
-    static ImplSVEvent *         PostScrollEvent( sal_uLong nEvent, vcl::Window *pWin, ScrollEvent* pScrollEvent );
-#endif
-
     /** Remove mouse and keypress events from a window... any also zoom and scroll events
      if the platform supports it.
 
      @param     pWin            Window to remove events from
 
-     @see HandleKey, PostKeyEvent, PostMouseEvent, PostZoomEvent, PostScrollEvent
+     @see HandleKey, PostKeyEvent, PostMouseEvent
     */
     static void                 RemoveMouseAndKeyEvents( vcl::Window *pWin );
 
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 5562170..73c9175 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -772,66 +772,6 @@ ImplSVEvent * Application::PostMouseEvent( sal_uLong nEvent, vcl::Window *pWin,
     return nEventId;
 }
 
-#if !HAVE_FEATURE_DESKTOP
-
-ImplSVEvent * Application::PostZoomEvent( sal_uLong nEvent, vcl::Window *pWin, ZoomEvent* pZoomEvent )
-{
-    const SolarMutexGuard aGuard;
-    ImplSVEvent * nEventId = 0;
-
-    if( pWin && pZoomEvent )
-    {
-        Point aTransformedPos( pZoomEvent->GetCenter() );
-
-        aTransformedPos.X() += pWin->GetOutOffXPixel();
-        aTransformedPos.Y() += pWin->GetOutOffYPixel();
-
-        const ZoomEvent aTransformedEvent( aTransformedPos, pZoomEvent->GetScale() );
-
-        ImplPostEventData* pPostEventData = new ImplPostEventData( nEvent, pWin, aTransformedEvent );
-
-        nEventId = PostUserEvent(
-                       LINK( NULL, Application, PostEventHandler ),
-                       pPostEventData );
-
-        if( nEventId )
-        {
-            pPostEventData->mnEventId = nEventId;
-            aPostedEventList.push_back( ImplPostEventPair( pWin, pPostEventData ) );
-        }
-        else
-            delete pPostEventData;
-    }
-
-    return nEventId;
-}
-
-ImplSVEvent * Application::PostScrollEvent( sal_uLong nEvent, vcl::Window *pWin, ScrollEvent* pScrollEvent )
-{
-    const SolarMutexGuard aGuard;
-    ImplSVEvent * nEventId = 0;
-
-    if( pWin && pScrollEvent )
-    {
-        ImplPostEventData* pPostEventData = new ImplPostEventData( nEvent, pWin, *pScrollEvent );
-
-        nEventId = PostUserEvent(
-                       LINK( NULL, Application, PostEventHandler ),
-                       pPostEventData );
-
-        if( nEventId )
-        {
-            pPostEventData->mnEventId = nEventId;
-            aPostedEventList.push_back( ImplPostEventPair( pWin, pPostEventData ) );
-        }
-        else
-            delete pPostEventData;
-    }
-
-    return nEventId;
-}
-
-#endif // !HAVE_FEATURE_DESKTOP
 
 IMPL_STATIC_LINK( Application, PostEventHandler, void*, pCallData )
 {


More information about the Libreoffice-commits mailing list