diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-08-05 11:55:11 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-08-05 11:55:11 +0000 |
| commit | 2dac0dd2675ba68644f6b0aa07cb0ece13167514 (patch) | |
| tree | f2c28ecb514ccae585b7d30dbac23e43f83bbd18 /vcl | |
| parent | b691adc4a4fa1b96f098ee70a68e47734624c247 (diff) | |
INTEGRATION: CWS gslpatches2 (1.54.60); FILE MERGED
2005/06/13 17:20:29 pl 1.54.60.2: #i50682# missed an XFree call
2005/06/08 13:03:34 pl 1.54.60.1: #i50483# 64bit fix from kendy
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/app/wmadaptor.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/vcl/unx/source/app/wmadaptor.cxx b/vcl/unx/source/app/wmadaptor.cxx index 65ce62719f49..c4e8eb2c4967 100644 --- a/vcl/unx/source/app/wmadaptor.cxx +++ b/vcl/unx/source/app/wmadaptor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wmadaptor.cxx,v $ * - * $Revision: 1.54 $ + * $Revision: 1.55 $ * - * last change: $Author: obo $ $Date: 2005-04-12 12:20:27 $ + * last change: $Author: hr $ $Date: 2005-08-05 12:55:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -537,7 +537,7 @@ NetWMAdaptor::NetWMAdaptor( SalDisplay* pSalDisplay ) : && pProperty ) { - m_nDesktops = *(sal_uInt32*)pProperty; + m_nDesktops = *(long*)pProperty; XFree( pProperty ); pProperty = NULL; // get work areas @@ -558,7 +558,7 @@ NetWMAdaptor::NetWMAdaptor( SalDisplay* pSalDisplay ) : ) { m_aWMWorkAreas = ::std::vector< Rectangle > ( m_nDesktops ); - sal_uInt32* pValues = (sal_uInt32*)pProperty; + long* pValues = (long*)pProperty; for( int i = 0; i < m_nDesktops; i++ ) { Point aPoint( pValues[4*i], @@ -578,6 +578,7 @@ NetWMAdaptor::NetWMAdaptor( SalDisplay* pSalDisplay ) : m_aWMWorkAreas[i].Top() ); #endif } + XFree( pProperty ); } else { @@ -795,7 +796,7 @@ GnomeWMAdaptor::GnomeWMAdaptor( SalDisplay* pSalDisplay ) : && pProperty ) { - m_nDesktops = *(sal_uInt32*)pProperty; + m_nDesktops = *(long*)pProperty; XFree( pProperty ); pProperty = NULL; } @@ -1222,7 +1223,7 @@ void NetWMAdaptor::setNetWMState( X11SalFrame* pFrame ) const && pProperty ) { - nCurrent = *(sal_Int32*)pProperty; + nCurrent = *(long*)pProperty; XFree( pProperty ); } else if( pProperty ) @@ -1338,7 +1339,7 @@ void GnomeWMAdaptor::setGnomeWMState( X11SalFrame* pFrame ) const && pProperty ) { - nCurrent = *(sal_Int32*)pProperty; + nCurrent = *(long*)pProperty; XFree( pProperty ); } else if( pProperty ) |