diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 16:52:56 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 16:52:56 +0000 |
| commit | 316a604879c8c4357013be9f038adc523271bb1f (patch) | |
| tree | 215f8790281c5554e4c144eb47c12c411145cc09 /vcl | |
| parent | 208b00d3c3ef9934230c1c36fc65e0a3aa4d5274 (diff) | |
INTEGRATION: CWS svp01 (1.13.220); FILE MERGED
2006/06/27 13:02:06 pl 1.13.220.2: RESYNC: (1.13-1.14); FILE MERGED
2006/05/22 16:35:34 pl 1.13.220.1: #135265# free plugin abstraction of dependency on X11 specific SalData
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/window/salobj.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/unx/source/window/salobj.cxx b/vcl/unx/source/window/salobj.cxx index 240f3ddc8982..c954eec69a67 100644 --- a/vcl/unx/source/window/salobj.cxx +++ b/vcl/unx/source/window/salobj.cxx @@ -4,9 +4,9 @@ * * $RCSfile: salobj.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: hr $ $Date: 2006-06-19 19:58:02 $ + * last change: $Author: hr $ $Date: 2006-08-11 17:52:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -91,7 +91,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p pObject->mpParent = pParent; - SalDisplay* pSalDisp = GetSalData()->GetDisplay(); + SalDisplay* pSalDisp = GetX11SalData()->GetDisplay(); const SystemEnvData* pEnv = pParent->GetSystemData(); Display* pDisp = pSalDisp->GetDisplay(); XLIB_Window aObjectParent = (XLIB_Window)pEnv->aWindow; @@ -258,7 +258,7 @@ SalClipRegion::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) X11SalObject::X11SalObject() { maSystemChildData.nSize = sizeof( SystemChildData ); - maSystemChildData.pDisplay = GetSalData()->GetDisplay()->GetDisplay(); + maSystemChildData.pDisplay = GetX11SalData()->GetDisplay()->GetDisplay(); maSystemChildData.aWindow = None; maSystemChildData.pSalFrame = 0; maSystemChildData.pWidget = 0; @@ -271,16 +271,16 @@ X11SalObject::X11SalObject() maPrimary = 0; maSecondary = 0; - std::list< SalObject* >& rObjects = GetSalData()->GetDisplay()->getSalObjects(); + std::list< SalObject* >& rObjects = GetX11SalData()->GetDisplay()->getSalObjects(); rObjects.push_back( this ); } X11SalObject::~X11SalObject() { - std::list< SalObject* >& rObjects = GetSalData()->GetDisplay()->getSalObjects(); + std::list< SalObject* >& rObjects = GetX11SalData()->GetDisplay()->getSalObjects(); rObjects.remove( this ); - SalDisplay* pSalDisp = GetSalData()->GetDisplay(); + SalDisplay* pSalDisp = GetX11SalData()->GetDisplay(); BOOL bOldIgnore = pSalDisp->GetXLib()->GetIgnoreXErrors(); pSalDisp->GetXLib()->SetIgnoreXErrors(TRUE); if ( maSecondary ) @@ -475,7 +475,7 @@ static USHORT sal_GetCode( int state ) long X11SalObject::Dispatch( XEvent* pEvent ) { - std::list< SalObject* >& rObjects = GetSalData()->GetDisplay()->getSalObjects(); + std::list< SalObject* >& rObjects = GetX11SalData()->GetDisplay()->getSalObjects(); for( std::list< SalObject* >::iterator it = rObjects.begin(); it != rObjects.end(); ++it ) { |