diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 10:08:14 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 10:08:14 +0000 |
| commit | c135d302d341db2307fcf7896d9f56da63dafc34 (patch) | |
| tree | 63bb03121993045b2b5020436dbb53e67792df64 /vcl/unx | |
| parent | 8c1c90ecb8e379f57647719c07b463b04ef71bb2 (diff) | |
INTEGRATION: CWS jw2 (1.85.10); FILE MERGED
2006/11/09 02:55:13 sparcmoz 1.85.10.1: #i71331#: remove warnings for gcc 4.1.2
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/source/app/saldisp.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index 8d0f319b8026..69d592a711bf 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: saldisp.cxx,v $ * - * $Revision: 1.85 $ + * $Revision: 1.86 $ * - * last change: $Author: vg $ $Date: 2006-11-01 14:57:11 $ + * last change: $Author: vg $ $Date: 2006-11-22 11:08:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2677,9 +2677,9 @@ void SalDisplay::PrintInfo() const fprintf( stderr, "\tScreen (count,def)\t%d (%d,%d)\n", m_nDefaultScreen, ScreenCount(pDisp_), DefaultScreen(pDisp_) ); fprintf( stderr, "\tshift ctrl alt \t%s (0x%X) %s (0x%X) %s (0x%X)\n", - KeyStr( nShiftKeySym_ ), nShiftKeySym_, - KeyStr( nCtrlKeySym_ ), nCtrlKeySym_, - KeyStr( nMod1KeySym_ ), nMod1KeySym_ ); + KeyStr( nShiftKeySym_ ), sal::static_int_cast< unsigned int >(nShiftKeySym_), + KeyStr( nCtrlKeySym_ ), sal::static_int_cast< unsigned int >(nCtrlKeySym_), + KeyStr( nMod1KeySym_ ), sal::static_int_cast< unsigned int >(nMod1KeySym_) ); if( XExtendedMaxRequestSize(pDisp_) * 4 ) fprintf( stderr, "\tXMaxRequestSize \t%ld %ld [bytes]\n", XMaxRequestSize(pDisp_) * 4, XExtendedMaxRequestSize(pDisp_) * 4 ); @@ -2701,7 +2701,7 @@ void SalDisplay::PrintInfo() const fprintf( stderr, "\tVisual \t%d-bit %s ID=0x%x\n", GetVisual(m_nDefaultScreen).GetDepth(), VisualClassName[ GetVisual(m_nDefaultScreen).GetClass() ], - GetVisual(m_nDefaultScreen).GetVisualId() ); + sal::static_int_cast< unsigned int >(GetVisual(m_nDefaultScreen).GetVisualId()) ); } void SalDisplay::GetScreenFontResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) const |