[Libreoffice-commits] .: Branch 'libreoffice-3-4' - vcl/unx

[Caolán McNamara]

 vcl/unx/kde4/KDEXLib.cxx |   10 ----------
 1 file changed, 10 deletions(-)

New commits:
commit 180c67523028aed289bb86d823d38e0b44271ab4
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Thu Apr 7 13:11:00 2011 +0200

    Removed duplicate code block (mis-merge, prolly)
    
    This fixes build with --enable-kde4
    (cherry picked from commit ea898caa151fb8e94b6bdb00b1008b6da98fddad)

diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 7757014..ca435c8 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -219,16 +219,6 @@ static bool qt_event_filter( void* m )
     return false;
 }
 
-static bool ( *old_qt_event_filter )( void* );
-static bool qt_event_filter( void* m )
-{
-    if( old_qt_event_filter != NULL && old_qt_event_filter( m ))
-        return true;
-    if( SalKDEDisplay::self() && SalKDEDisplay::self()->checkDirectInputEvent( static_cast< XEvent* >( m )))
-        return true;
-    return false;
-}
-
 void KDEXLib::setupEventLoop()
 {
     old_qt_event_filter = QAbstractEventDispatcher::instance()->setEventFilter( qt_event_filter );