diff options
author | Noel Grandin <noel@peralex.com> | 2016-01-18 09:36:03 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-01-18 10:39:16 +0200 |
commit | c88165dfb46c771eba6324ec061bf4455732194e (patch) | |
tree | 9ccfedfe01f381cbb67d01782856bbf12a67637b /vcl/unx/generic/app | |
parent | 1452fb6332d64b7c980c50a7050403c99b7f47c8 (diff) |
loplugin: unused return values in vcl/
Change-Id: I879bd3bec4dd2cf002681f1e50b6c33cce0934a9
Diffstat (limited to 'vcl/unx/generic/app')
-rw-r--r-- | vcl/unx/generic/app/i18n_ic.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_im.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/generic/app/randrwrapper.cxx | 9 | ||||
-rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 8 |
4 files changed, 11 insertions, 20 deletions
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index df63ead54078..a0ce0daeb902 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -523,11 +523,11 @@ SalI18N_InputContext::SupportInputMethodStyle( XIMStyles *pIMStyles ) // handle extended and normal key input -int +void SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength) { if (nLength == 1 && IsControlCode(pText[0])) - return 0; + return; if( maClientData.pFrame ) { @@ -547,8 +547,6 @@ SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength) else fprintf(stderr, "CommitKeyEvent without frame\n" ); #endif - - return 0; } int diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx index 61e3bf533cf1..321832b1b27a 100644 --- a/vcl/unx/generic/app/i18n_im.cxx +++ b/vcl/unx/generic/app/i18n_im.cxx @@ -195,7 +195,7 @@ IsXWindowCompatibleLocale( const char* p_locale ) // see i8988, i9188, i8930, i16318 // on Solaris the environment needs to be set equivalent to the locale (#i37047#) -bool +void SalI18N_InputMethod::SetLocale( const char* pLocale ) { // check whether we want an Input Method engine, if we don't we @@ -229,8 +229,6 @@ SalI18N_InputMethod::SetLocale( const char* pLocale ) mbUseable = False; } } - - return mbUseable; } Bool @@ -331,7 +329,7 @@ PrintInputStyle( XIMStyles *pStyle ) // this is the real constructing routine, since locale setting has to be done // prior to xopendisplay, the xopenim call has to be delayed -bool +void SalI18N_InputMethod::CreateMethod ( Display *pDisplay ) { if ( mbUseable ) @@ -371,8 +369,6 @@ SalI18N_InputMethod::CreateMethod ( Display *pDisplay ) maDestroyCallback.client_data = reinterpret_cast<XPointer>(this); if (mbUseable && maMethod != nullptr) XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, nullptr); - - return mbUseable; } // give IM the opportunity to look at the event, and possibly hide it diff --git a/vcl/unx/generic/app/randrwrapper.cxx b/vcl/unx/generic/app/randrwrapper.cxx index 3e899e8c05a0..570cfcc9dc4b 100644 --- a/vcl/unx/generic/app/randrwrapper.cxx +++ b/vcl/unx/generic/app/randrwrapper.cxx @@ -279,10 +279,10 @@ void SalDisplay::DeInitRandR() #endif } -int SalDisplay::processRandREvent( XEvent* pEvent ) +void SalDisplay::processRandREvent( XEvent* pEvent ) { +#ifdef USE_RANDR int nRet = 0; - #ifdef USE_RANDR XConfigureEvent* pCnfEvent=reinterpret_cast<XConfigureEvent*>(pEvent); if( m_bUseRandRWrapper && pWrapper && pWrapper->XRRRootToScreen(GetDisplay(),pCnfEvent->window) != -1 ) { @@ -323,11 +323,10 @@ int SalDisplay::processRandREvent( XEvent* pEvent ) emitDisplayChanged(); } } - #else +#else (void)this; (void)pEvent; - #endif - return nRet; +#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 02efd278e573..8f8f92ed7bd7 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -1886,10 +1886,10 @@ bool SalX11Display::IsEvent() return false; } -bool SalX11Display::Yield() +void SalX11Display::Yield() { if( DispatchInternalEvent() ) - return true; + return; XEvent aEvent; DBG_ASSERT( static_cast<SalYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex())->GetThreadId() == @@ -1899,7 +1899,7 @@ bool SalX11Display::Yield() XNextEvent( pDisp_, &aEvent ); // FIXME: under-convinced by Dispatch boolean return value vs. salframe. - bool bProcessedEvent = Dispatch( &aEvent ); + Dispatch( &aEvent ); #ifdef DBG_UTIL if( GetX11SalData()->HasXErrorOccurred() ) @@ -1909,8 +1909,6 @@ bool SalX11Display::Yield() } #endif GetX11SalData()->ResetXErrorOccurred(); - - return bProcessedEvent; } bool SalX11Display::Dispatch( XEvent *pEvent ) |