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

[Stephan Bergmann]

 vcl/inc/unx/saldisp.hxx        |    1 +
 vcl/inc/unx/salframe.h         |    1 +
 vcl/unx/kde4/KDESalDisplay.cxx |    9 ++++-----
 vcl/unx/kde4/KDESalDisplay.hxx |    2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 7b2d8deef6580fb28adc02ab2d0fa1b43142543d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jan 18 10:07:43 2016 +0100

    Fix --enable-kde4 again
    
    ...after c88165dfb46c771eba6324ec061bf4455732194e "loplugin: unused return
    values in vcl/"
    
    Change-Id: Ia9acead013d80f5747e2cb7f18d46cd163890eda

diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 1207fa3..99fac24 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -332,6 +332,7 @@ public:
     Time            GetLastUserEventTime( bool bAlwaysReget = false ) const;
 
     bool            XIfEventWithTimeout( XEvent*, XPointer, X_if_predicate, long i_nTimeout = 1000 ) const;
+    SalXLib*        GetXLib() const { return pXLib_; }
 
     SalI18N_InputMethod*        GetInputMethod()  const { return mpInputMethod;  }
     SalI18N_KeyboardExtension*  GetKbdExtension() const { return mpKbdExtension; }
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 94de1ca..87d38a3 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -182,6 +182,7 @@ public:
     ::Window                GetForeignParent() const { return mhForeignParent; }
     ::Window                GetStackingWindow() const { return mhStackingWindow; }
     void                    Close() const { CallCallback( SALEVENT_CLOSE, NULL ); }
+    SalFrameStyleFlags      GetStyle() const { return nStyle_; }
 
     Cursor                  GetCursor() const { return hCursor_; }
     bool                    IsCaptured() const { return nCaptured_ == 1; }
diff --git a/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx
index 33a36e4..105393f 100644
--- a/vcl/unx/kde4/KDESalDisplay.cxx
+++ b/vcl/unx/kde4/KDESalDisplay.cxx
@@ -46,14 +46,14 @@ SalKDEDisplay::~SalKDEDisplay()
     pDisp_ = nullptr;
 }
 
-bool SalKDEDisplay::Yield()
+void SalKDEDisplay::Yield()
 {
     if( DispatchInternalEvent() )
-        return true;
+        return;
 
     // Prevent blocking from Drag'n'Drop events, which may have already have processed the event
     if (XEventsQueued( pDisp_, QueuedAfterReading ) == 0)
-        return false;
+        return;
 
     DBG_ASSERT( static_cast<SalYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex())->GetThreadId() ==
                 osl::Thread::getCurrentIdentifier(),
@@ -62,9 +62,8 @@ bool SalKDEDisplay::Yield()
     XEvent event;
     XNextEvent( pDisp_, &event );
     if( checkDirectInputEvent( &event ))
-        return true;
+        return;
     qApp->x11ProcessEvent( &event );
-    return true;
 }
 
 // HACK: When using Qt event loop, input methods (japanese, etc.) will get broken because
diff --git a/vcl/unx/kde4/KDESalDisplay.hxx b/vcl/unx/kde4/KDESalDisplay.hxx
index 59734c7..a262a6a 100644
--- a/vcl/unx/kde4/KDESalDisplay.hxx
+++ b/vcl/unx/kde4/KDESalDisplay.hxx
@@ -27,7 +27,7 @@ class SalKDEDisplay : public SalX11Display
         explicit SalKDEDisplay( Display* pDisp );
         virtual ~SalKDEDisplay();
         static SalKDEDisplay* self();
-        virtual bool Yield() override;
+        virtual void Yield() override;
         bool checkDirectInputEvent( XEvent* ev );
     private:
         Atom xim_protocol;