diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 16:48:02 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 16:48:02 +0000 |
| commit | 35b4ac021308303b64e6f51abdbbf94ba0699b66 (patch) | |
| tree | b17ed507afc3e5ea74e13ba784cca1577474ca06 /vcl | |
| parent | 59729d173276fe38c35f47e8177bace86426dfc6 (diff) | |
INTEGRATION: CWS svp01 (1.11.180); FILE MERGED
2006/07/25 10:16:12 pl 1.11.180.3: RESYNC: (1.12-1.13); FILE MERGED
2006/06/27 12:53:09 pl 1.11.180.2: RESYNC: (1.11-1.12); FILE MERGED
2006/05/22 16:35:30 pl 1.11.180.1: #135265# free plugin abstraction of dependency on X11 specific SalData
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/kde/kdedata.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx index ba78050a27c0..5eb0c5e248b7 100644 --- a/vcl/unx/kde/kdedata.cxx +++ b/vcl/unx/kde/kdedata.cxx @@ -4,9 +4,9 @@ * * $RCSfile: kdedata.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: ihi $ $Date: 2006-08-01 10:27:54 $ + * last change: $Author: hr $ $Date: 2006-08-11 17:48:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -198,8 +198,8 @@ void KDEXLib::Init() static_cast< Visual * >( QPaintDevice::x11AppVisual() ), QPaintDevice::x11AppColormap() ); - XSetIOErrorHandler ( (XIOErrorHandler)SalData::XIOErrorHdl ); - XSetErrorHandler ( (XErrorHandler)SalData::XErrorHdl ); + XSetIOErrorHandler ( (XIOErrorHandler)X11SalData::XIOErrorHdl ); + XSetErrorHandler ( (XErrorHandler)X11SalData::XErrorHdl ); pInputMethod->CreateMethod( pDisp ); pInputMethod->AddConnectionWatch( pDisp, (void*)this ); @@ -273,9 +273,9 @@ extern "C" { #endif // initialize SalData - SalData *pSalData = new KDEData(); + KDEData *pSalData = new KDEData(); SetSalData( pSalData ); - pSalData->pInstance_ = pInstance; + pSalData->m_pInstance = pInstance; pSalData->Init(); pSalData->initNWF(); |