From 980dea4b9e3271813fbb39b2932335241e2a50bf Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Fri, 11 Aug 2006 16:48:19 +0000 Subject: INTEGRATION: CWS svp01 (1.12.88); FILE MERGED 2006/07/25 10:16:35 pl 1.12.88.3: RESYNC: (1.13-1.15); FILE MERGED 2006/06/27 12:53:21 pl 1.12.88.2: RESYNC: (1.12-1.13); FILE MERGED 2006/05/22 16:35:31 pl 1.12.88.1: #135265# free plugin abstraction of dependency on X11 specific SalData --- vcl/unx/kde/salnativewidgets-kde.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'vcl') diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index d976d0dd5f1b..9e9bb75cca7d 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -4,9 +4,9 @@ * * $RCSfile: salnativewidgets-kde.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: ihi $ $Date: 2006-08-01 10:28:33 $ + * last change: $Author: hr $ $Date: 2006-08-11 17:48:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1764,8 +1764,8 @@ static Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& r nPointHeight = rQFont.pointSize(); sal_Int32 nDPIX, nDPIY; - sal_Int32 nDispDPIY = GetSalData()->GetDisplay()->GetResolution().B(); - GetSalData()->GetDisplay()->GetScreenFontResolution( nDPIX, nDPIY ); + sal_Int32 nDispDPIY = GetX11SalData()->GetDisplay()->GetResolution().B(); + GetX11SalData()->GetDisplay()->GetScreenFontResolution( nDPIX, nDPIY ); int nHeight = nPointHeight * nDispDPIY / nDPIY; // allow for rounding in back conversion (at SetFont) -- cgit