diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-10-06 09:03:31 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-10-06 09:03:31 +0000 |
| commit | c12f34eeae80e79943442cc806f03fab9cd25c83 (patch) | |
| tree | fa6f379ece3415524e6d3933f1bde74cd09aed5a /vcl/unx/kde | |
| parent | 806d6ebf1d8485017501a88cd529d22c88659f30 (diff) | |
INTEGRATION: CWS impresshydra (1.13.10); FILE MERGED
2006/09/20 13:45:37 cl 1.13.10.3: RESYNC: (1.15-1.16); FILE MERGED
2006/08/28 13:08:51 cl 1.13.10.2: RESYNC: (1.13-1.15); FILE MERGED
2006/08/09 14:35:06 pl 1.13.10.1: #i67721# on the way to multiscreen support
Diffstat (limited to 'vcl/unx/kde')
| -rw-r--r-- | vcl/unx/kde/kdedata.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx index 699f21ca5016..094bc7705e8a 100644 --- a/vcl/unx/kde/kdedata.cxx +++ b/vcl/unx/kde/kdedata.cxx @@ -4,9 +4,9 @@ * * $RCSfile: kdedata.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: obo $ $Date: 2006-09-17 12:30:45 $ + * last change: $Author: kz $ $Date: 2006-10-06 10:03:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -103,8 +103,8 @@ void VCLKDEApplication::commitData(QSessionManager&) * class SalKDEDisplay * ***************************************************************************/ -SalKDEDisplay::SalKDEDisplay( Display* pDisp, Visual* pVisual, Colormap aColMap ) - : SalX11Display( pDisp, pVisual, aColMap, false ) +SalKDEDisplay::SalKDEDisplay( Display* pDisp ) + : SalX11Display( pDisp, false ) { } @@ -197,9 +197,7 @@ void KDEXLib::Init() Display* pDisp = QPaintDevice::x11AppDisplay(); - SalDisplay *pSalDisplay = new SalKDEDisplay( pDisp, - static_cast< Visual * >( QPaintDevice::x11AppVisual() ), - QPaintDevice::x11AppColormap() ); + SalDisplay *pSalDisplay = new SalKDEDisplay( pDisp ); XSetIOErrorHandler ( (XIOErrorHandler)X11SalData::XIOErrorHdl ); XSetErrorHandler ( (XErrorHandler)X11SalData::XErrorHdl ); |