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

Tor Lillqvist tml at collabora.com
Fri Feb 28 05:49:47 PST 2014


 vcl/inc/generic/gendisp.hxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 69a7d9aea25240ababb298e5b8a89d2492057ca6
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 28 15:38:15 2014 +0200

    Unvirtualize a couple of functions
    
    Change-Id: I1df9d7d1f0186a6983e54906c2d1b1684663826d

diff --git a/vcl/inc/generic/gendisp.hxx b/vcl/inc/generic/gendisp.hxx
index 4aa5f35..2c5b5ec 100644
--- a/vcl/inc/generic/gendisp.hxx
+++ b/vcl/inc/generic/gendisp.hxx
@@ -56,17 +56,17 @@ public:
     inline void  EventGuardAcquire() { osl_acquireMutex( m_aEventGuard ); }
     inline void  EventGuardRelease() { osl_releaseMutex( m_aEventGuard ); }
 
-    virtual void registerFrame( SalFrame* pFrame );
+    void registerFrame( SalFrame* pFrame );
     virtual void deregisterFrame( SalFrame* pFrame );
-            void emitDisplayChanged();
+    void emitDisplayChanged();
 
     // Event handling
     virtual void PostUserEvent() = 0;
 
-    virtual void SendInternalEvent( SalFrame* pFrame, void* pData, sal_uInt16 nEvent = SALEVENT_USEREVENT );
-    virtual void CancelInternalEvent( SalFrame* pFrame, void* pData, sal_uInt16 nEvent );
-    virtual bool DispatchInternalEvent();
-    bool         HasUserEvents() const;
+    void SendInternalEvent( SalFrame* pFrame, void* pData, sal_uInt16 nEvent = SALEVENT_USEREVENT );
+    void CancelInternalEvent( SalFrame* pFrame, void* pData, sal_uInt16 nEvent );
+    bool DispatchInternalEvent();
+    bool HasUserEvents() const;
 
     bool     MouseCaptured( const SalFrame *pFrameData ) const
                         { return m_pCapture == pFrameData; }


More information about the Libreoffice-commits mailing list