diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 01:20:57 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 01:20:57 +0000 |
| commit | 10089cf7711683a1a2483fd08bba37c57a15ff7c (patch) | |
| tree | 3802bba9c7fff163fb011391e7e336bc19e48ea0 /canvas | |
| parent | INTEGRATION: CWS warnings01 (1.8.8); FILE MERGED (diff) | |
| download | core-10089cf7711683a1a2483fd08bba37c57a15ff7c.tar.gz core-10089cf7711683a1a2483fd08bba37c57a15ff7c.zip | |
INTEGRATION: CWS warnings01 (1.10.8); FILE MERGED
2006/06/14 09:33:36 pl 1.10.8.2: #i55991# cast was wrong and yielded a wild pointer
2006/02/22 22:27:26 thb 1.10.8.1: #i55991# Removed virtual derivations, where unnecessary; removed unused params; renamed vars which shadowed previous ones; put agg headers into sys header brackets
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/vcl/spritecanvas.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx index 9e369642978c..c2cc0d6f90f5 100644 --- a/canvas/source/vcl/spritecanvas.cxx +++ b/canvas/source/vcl/spritecanvas.cxx @@ -4,9 +4,9 @@ * * $RCSfile: spritecanvas.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2005-11-02 13:04:13 $ + * last change: $Author: hr $ $Date: 2006-06-20 02:20:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -165,8 +165,9 @@ namespace vclcanvas if( aArguments.getLength() >= 1 && aArguments[0].getValueTypeClass() == uno::TypeClass_HYPER ) { - // TODO(Q2): This now works for Solaris, but still warns for gcc - Window* pOutputWindow = (Window*) *reinterpret_cast<const sal_Int64*>(aArguments[0].getValue()); + sal_Int64 nWindowPtr = 0; + aArguments[0] >>= nWindowPtr; + Window* pOutputWindow = reinterpret_cast<Window*>(nWindowPtr); CHECK_AND_THROW( pOutputWindow != NULL, "SpriteCanvas::initialize: invalid Window pointer" ); @@ -318,7 +319,7 @@ namespace extern "C" { void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvTypeName, - uno_Environment** ppEnv ) + uno_Environment** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } |