diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-03 19:04:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-04 08:53:37 +0200 |
| commit | 53df91adab37a65d87a44aa724b28128f32e9de5 (patch) | |
| tree | 1d7b31ee1eeeb9691ccb732f0cb0e06aad4ae5b6 /vcl/unx/generic | |
| parent | 89c0b79911c469518c8872a4ec06b3d2c61c357c (diff) | |
loplugin:singlevalfields
Change-Id: Ic74b400f0b929b4c57ad70d0b0936983a3d46360
Reviewed-on: https://gerrit.libreoffice.org/80154
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/unx/generic')
| -rw-r--r-- | vcl/unx/generic/app/randrwrapper.cxx | 10 | ||||
| -rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 1 |
2 files changed, 3 insertions, 8 deletions
diff --git a/vcl/unx/generic/app/randrwrapper.cxx b/vcl/unx/generic/app/randrwrapper.cxx index eaa7108a1efe..e7e23ce6b817 100644 --- a/vcl/unx/generic/app/randrwrapper.cxx +++ b/vcl/unx/generic/app/randrwrapper.cxx @@ -108,8 +108,7 @@ void RandRWrapper::releaseWrapper() void SalDisplay::InitRandR( ::Window aRoot ) const { #ifdef USE_RANDR - if( m_bUseRandRWrapper ) - RandRWrapper::get( GetDisplay() ).XRRSelectInput( GetDisplay(), aRoot, RRScreenChangeNotifyMask ); + RandRWrapper::get( GetDisplay() ).XRRSelectInput( GetDisplay(), aRoot, RRScreenChangeNotifyMask ); #else (void)this; (void)aRoot; @@ -119,13 +118,10 @@ void SalDisplay::InitRandR( ::Window aRoot ) const void SalDisplay::DeInitRandR() { #ifdef USE_RANDR - if( m_bUseRandRWrapper ) - RandRWrapper::releaseWrapper(); + RandRWrapper::releaseWrapper(); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "SalDisplay::DeInitRandR()\n" ); #endif - #else - (void)this; #endif } @@ -133,7 +129,7 @@ void SalDisplay::processRandREvent( XEvent* pEvent ) { #ifdef USE_RANDR XConfigureEvent* pCnfEvent=reinterpret_cast<XConfigureEvent*>(pEvent); - if( m_bUseRandRWrapper && pWrapper && pWrapper->XRRRootToScreen(GetDisplay(),pCnfEvent->window) != -1 ) + if( pWrapper && pWrapper->XRRRootToScreen(GetDisplay(),pCnfEvent->window) != -1 ) { int nRet = pWrapper->XRRUpdateConfiguration( pEvent ); if( nRet == 1 && pEvent->type != ConfigureNotify) // this should then be a XRRScreenChangeNotifyEvent diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index a4a83b820a51..21ddd3eab4ee 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -278,7 +278,6 @@ SalDisplay::SalDisplay( Display *display ) : nCtrlKeySym_( 0 ), nMod1KeySym_( 0 ), m_bXinerama( false ), - m_bUseRandRWrapper( true ), m_nLastUserEventTime( CurrentTime ) { #if OSL_DEBUG_LEVEL > 1 |