From a32c8b65ee1dce8d06b2a5b00d33327ba1bc445f Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 19 Sep 2017 10:55:29 +0200 Subject: rename GetGenericData to GetGenericUnixSalData Change-Id: Id95334da347c8341d9d190307603218eedb9c1e6 Reviewed-on: https://gerrit.libreoffice.org/42457 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/unx/generic/window/salframe.cxx | 40 ++++++++++++++++++------------------- vcl/unx/generic/window/salobj.cxx | 24 +++++++++++----------- 2 files changed, 32 insertions(+), 32 deletions(-) (limited to 'vcl/unx/generic/window') diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index ec179e8808f7..b89a736581d2 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -104,7 +104,7 @@ static int nVisibleFloats = 0; static void doReparentPresentationDialogues( SalDisplay const * pDisplay ) { - GetGenericData()->ErrorTrapPush(); + GetGenericUnixSalData()->ErrorTrapPush(); while( !aPresentationReparentList.empty() ) { int x, y; @@ -129,7 +129,7 @@ static void doReparentPresentationDialogues( SalDisplay const * pDisplay ) if( hPresFocusWindow ) XSetInputFocus( pDisplay->GetDisplay(), hPresFocusWindow, PointerRoot, CurrentTime ); XSync( pDisplay->GetDisplay(), False ); - GetGenericData()->ErrorTrapPop(); + GetGenericUnixSalData()->ErrorTrapPop(); } bool X11SalFrame::IsOverrideRedirect() const @@ -188,12 +188,12 @@ void X11SalFrame::askForXEmbedFocus( sal_Int32 i_nTimeCode ) aEvent.xclient.data.l[3] = 0; aEvent.xclient.data.l[4] = 0; - GetGenericData()->ErrorTrapPush(); + GetGenericUnixSalData()->ErrorTrapPush(); XSendEvent( pDisplay_->GetDisplay(), mhForeignParent, False, NoEventMask, &aEvent ); XSync( pDisplay_->GetDisplay(), False ); - GetGenericData()->ErrorTrapPop(); + GetGenericUnixSalData()->ErrorTrapPop(); } typedef std::vector< unsigned long > NetWmIconData; @@ -454,7 +454,7 @@ void X11SalFrame::Init( SalFrameStyleFlags nSalFrameStyle, SalX11Screen nXScreen { // plugin parent may be killed unexpectedly by plugging // process; start permanantly ignoring X errors ... - GetGenericData()->ErrorTrapPush(); + GetGenericUnixSalData()->ErrorTrapPush(); nStyle_ |= SalFrameStyleFlags::PLUG; Attributes.override_redirect = True; @@ -812,7 +812,7 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle, SystemParentData* pSystemParent ) : m_nXScreen( 0 ) { - GenericUnixSalData *pData = GetGenericData(); + GenericUnixSalData *pData = GetGenericUnixSalData(); // initialize frame geometry memset( &maGeometry, 0, sizeof(maGeometry) ); @@ -2571,12 +2571,12 @@ SalFrame::SalPointerState X11SalFrame::GetPointerState() KeyIndicatorState X11SalFrame::GetIndicatorState() { - return vcl_sal::getSalDisplay(GetGenericData())->GetIndicatorState(); + return vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetIndicatorState(); } void X11SalFrame::SimulateKeyPress( sal_uInt16 nKeyCode ) { - vcl_sal::getSalDisplay(GetGenericData())->SimulateKeyPress(nKeyCode); + vcl_sal::getSalDisplay(GetGenericUnixSalData())->SimulateKeyPress(nKeyCode); } namespace @@ -2890,7 +2890,7 @@ GetAlternateKeyCode( const sal_uInt16 nKeyCode ) void X11SalFrame::beginUnicodeSequence() { - OUString& rSeq( GetGenericData()->GetUnicodeCommand() ); + OUString& rSeq( GetGenericUnixSalData()->GetUnicodeCommand() ); vcl::DeletionListener aDeleteWatch( this ); if( !rSeq.isEmpty() ) @@ -2914,7 +2914,7 @@ void X11SalFrame::beginUnicodeSequence() bool X11SalFrame::appendUnicodeSequence( sal_Unicode c ) { bool bRet = false; - OUString& rSeq( GetGenericData()->GetUnicodeCommand() ); + OUString& rSeq( GetGenericUnixSalData()->GetUnicodeCommand() ); if( !rSeq.isEmpty() ) { // range check @@ -2947,7 +2947,7 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c ) bool X11SalFrame::endUnicodeSequence() { - OUString& rSeq( GetGenericData()->GetUnicodeCommand() ); + OUString& rSeq( GetGenericUnixSalData()->GetUnicodeCommand() ); vcl::DeletionListener aDeleteWatch( this ); if( rSeq.getLength() > 1 && rSeq.getLength() < 6 ) @@ -3608,7 +3608,7 @@ bool X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) static const char* pDisableStackingCheck = getenv( "SAL_DISABLE_STACKING_CHECK" ); - GetGenericData()->ErrorTrapPush(); + GetGenericUnixSalData()->ErrorTrapPush(); /* * don't rely on the new parent from the event. @@ -3628,8 +3628,8 @@ bool X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) &Children, &nChildren ); - bool bError = GetGenericData()->ErrorTrapPop( false ); - GetGenericData()->ErrorTrapPush(); + bool bError = GetGenericUnixSalData()->ErrorTrapPop( false ); + GetGenericUnixSalData()->ErrorTrapPush(); if( bError ) { @@ -3665,7 +3665,7 @@ bool X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) // Reparenting before Destroy aPresentationReparentList.remove( GetStackingWindow() ); mhStackingWindow = None; - GetGenericData()->ErrorTrapPop(); + GetGenericUnixSalData()->ErrorTrapPop(); return false; } @@ -3718,8 +3718,8 @@ bool X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) */ // reset error occurred - GetGenericData()->ErrorTrapPop(); - GetGenericData()->ErrorTrapPush(); + GetGenericUnixSalData()->ErrorTrapPop(); + GetGenericUnixSalData()->ErrorTrapPush(); int xp, yp, x, y; unsigned int wp, w, hp, h, bw, d; @@ -3732,8 +3732,8 @@ bool X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) &hRoot, &xp, &yp, &wp, &hp, &bw, &d ); bool bResized = false; - bool bError = GetGenericData()->ErrorTrapPop( false ); - GetGenericData()->ErrorTrapPush(); + bool bError = GetGenericUnixSalData()->ErrorTrapPop( false ); + GetGenericUnixSalData()->ErrorTrapPush(); if( ! bError ) { @@ -3778,7 +3778,7 @@ bool X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) if( bResized ) CallCallback( SalEvent::Resize, nullptr ); - GetGenericData()->ErrorTrapPop(); + GetGenericUnixSalData()->ErrorTrapPop(); return true; } diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index 333d8787c5f3..9d0833094c1d 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -59,7 +59,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p pObject->mpParent = pParent; - SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericData()); + SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData()); const SystemEnvData* pEnv = pParent->GetSystemData(); Display* pDisp = pSalDisp->GetDisplay(); ::Window aObjectParent = (::Window)pEnv->aWindow; @@ -118,7 +118,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p static_cast (pSalDisp->GetVisual( nXScreen ).GetVisualId()), static_cast (aVisID) ); #endif - GetGenericData()->ErrorTrapPush(); + GetGenericUnixSalData()->ErrorTrapPush(); // create colormap for visual - there might not be one pObject->maColormap = aAttribs.colormap = XCreateColormap( @@ -136,7 +136,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p pVisual, CWEventMask|CWColormap, &aAttribs ); XSync( pDisp, False ); - if( GetGenericData()->ErrorTrapPop( false ) ) + if( GetGenericUnixSalData()->ErrorTrapPop( false ) ) { pObject->maSecondary = None; delete pObject; @@ -145,7 +145,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p XReparentWindow( pDisp, pObject->maSecondary, pObject->maPrimary, 0, 0 ); } - GetGenericData()->ErrorTrapPush(); + GetGenericUnixSalData()->ErrorTrapPush(); if( bShow ) { XMapWindow( pDisp, pObject->maSecondary ); XMapWindow( pDisp, pObject->maPrimary ); @@ -157,7 +157,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p pObjData->pVisual = pVisual; XSync(pDisp, False); - if( GetGenericData()->ErrorTrapPop( false ) ) + if( GetGenericUnixSalData()->ErrorTrapPop( false ) ) { delete pObject; return nullptr; @@ -218,23 +218,23 @@ X11SalObject::X11SalObject() , mbVisible(false) { maSystemChildData.nSize = sizeof( SystemEnvData ); - maSystemChildData.pDisplay = vcl_sal::getSalDisplay(GetGenericData())->GetDisplay(); + maSystemChildData.pDisplay = vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetDisplay(); maSystemChildData.aWindow = None; maSystemChildData.pSalFrame = nullptr; maSystemChildData.pWidget = nullptr; maSystemChildData.pVisual = nullptr; maSystemChildData.aShellWindow = 0; - std::list< SalObject* >& rObjects = vcl_sal::getSalDisplay(GetGenericData())->getSalObjects(); + std::list< SalObject* >& rObjects = vcl_sal::getSalDisplay(GetGenericUnixSalData())->getSalObjects(); rObjects.push_back( this ); } X11SalObject::~X11SalObject() { - std::list< SalObject* >& rObjects = vcl_sal::getSalDisplay(GetGenericData())->getSalObjects(); + std::list< SalObject* >& rObjects = vcl_sal::getSalDisplay(GetGenericUnixSalData())->getSalObjects(); rObjects.remove( this ); - GetGenericData()->ErrorTrapPush(); + GetGenericUnixSalData()->ErrorTrapPush(); const SystemEnvData* pEnv = mpParent->GetSystemData(); ::Window aObjectParent = (::Window)pEnv->aWindow; XSetWindowBackgroundPixmap(static_cast(maSystemChildData.pDisplay), aObjectParent, None); @@ -245,7 +245,7 @@ X11SalObject::~X11SalObject() if ( maColormap ) XFreeColormap(static_cast(maSystemChildData.pDisplay), maColormap); XSync( static_cast(maSystemChildData.pDisplay), False ); - GetGenericData()->ErrorTrapPop(); + GetGenericUnixSalData()->ErrorTrapPop(); } void @@ -382,7 +382,7 @@ static sal_uInt16 sal_GetCode( int state ) bool X11SalObject::Dispatch( XEvent* pEvent ) { - std::list< SalObject* >& rObjects = vcl_sal::getSalDisplay(GetGenericData())->getSalObjects(); + std::list< SalObject* >& rObjects = vcl_sal::getSalDisplay(GetGenericUnixSalData())->getSalObjects(); for( std::list< SalObject* >::iterator it = rObjects.begin(); it != rObjects.end(); ++it ) { @@ -465,7 +465,7 @@ bool X11SalObject::Dispatch( XEvent* pEvent ) void X11SalObject::SetLeaveEnterBackgrounds(const css::uno::Sequence& rLeaveArgs, const css::uno::Sequence& rEnterArgs) { - SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericData()); + SalDisplay* pSalDisp = vcl_sal::getSalDisplay(GetGenericUnixSalData()); const SystemEnvData* pEnv = mpParent->GetSystemData(); Display* pDisp = pSalDisp->GetDisplay(); ::Window aObjectParent = (::Window)pEnv->aWindow; -- cgit