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

[Noel Grandin (via logerrit)]

 vcl/inc/unx/saldisp.hxx         |    4 ++--
 vcl/unx/generic/app/saldisp.cxx |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 7ad41a7767c666f6707adb1449e501f8581d0d3b
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jun 10 11:36:12 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Jun 10 13:22:01 2021 +0200

    loplugin:unnecessaryreturn SalX11Display::Dispatch
    
    Change-Id: I270f6538d921ad2116cc29ada3e4543027531764
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116974
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index c109a4335e62..591423df7683 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -304,7 +304,7 @@ protected:
 
     mutable Time    m_nLastUserEventTime; // mutable because changed on first access
 
-    virtual bool    Dispatch( XEvent *pEvent ) = 0;
+    virtual void    Dispatch( XEvent *pEvent ) = 0;
     void            InitXinerama();
     void            InitRandR( ::Window aRoot ) const;
     static void     DeInitRandR();
@@ -400,7 +400,7 @@ public:
              SalX11Display( Display* pDisp );
     virtual ~SalX11Display() override;
 
-    virtual bool        Dispatch( XEvent *pEvent ) override;
+    virtual void        Dispatch( XEvent *pEvent ) override;
     virtual void        Yield();
     virtual void        TriggerUserEventProcessing() override;
 
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 4272f9e89812..9399cab30527 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -1907,7 +1907,7 @@ void SalX11Display::Yield()
     GetX11SalData()->ResetXErrorOccurred();
 }
 
-bool SalX11Display::Dispatch( XEvent *pEvent )
+void SalX11Display::Dispatch( XEvent *pEvent )
 {
     SalI18N_InputMethod* const pInputMethod =
         pXLib_ ? pXLib_->GetInputMethod() : nullptr;
@@ -1930,7 +1930,7 @@ bool SalX11Display::Dispatch( XEvent *pEvent )
             }
         }
         if( pInputMethod->FilterEvent( pEvent, aFrameWindow ) )
-            return false;
+            return;
     }
 
     SalInstance* pInstance = GetSalData()->m_pInstance;
@@ -1955,7 +1955,7 @@ bool SalX11Display::Dispatch( XEvent *pEvent )
                     {
                         for (auto pSalFrame : m_aFrames )
                              pSalFrame->CallCallback( SalEvent::SettingsChanged, nullptr );
-                        return false;
+                        return;
                     }
                 }
             }
@@ -1981,7 +1981,7 @@ bool SalX11Display::Dispatch( XEvent *pEvent )
                 && GetKbdExtension()->GetEventBase() == pEvent->type )
             {
                 GetKbdExtension()->Dispatch( pEvent );
-                return true;
+                return;
             }
             break;
     }
@@ -1996,11 +1996,13 @@ bool SalX11Display::Dispatch( XEvent *pEvent )
             || pFrame->GetForeignParent() == aDispatchWindow
             )
         {
-            return pFrame->Dispatch( pEvent );
+            pFrame->Dispatch( pEvent );
+            return;
         }
         if( pEvent->type == ConfigureNotify && pEvent->xconfigure.window == pFrame->GetStackingWindow() )
         {
-            return pFrame->Dispatch( pEvent );
+            pFrame->Dispatch( pEvent );
+            return;
         }
     }
 
@@ -2009,8 +2011,6 @@ bool SalX11Display::Dispatch( XEvent *pEvent )
 
     // is this perhaps a root window that changed size ?
     processRandREvent( pEvent );
-
-    return false;
 }
 
 #ifdef DBG_UTIL