mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS warnings01 (1.10.8); FILE MERGED

Browse Source 
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
This commit is contained in:
Jens-Heiner Rechtien 2006-06-20 01:20:57 +00:00
parent dd37a9aebc
commit 10089cf771
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
canvas/source/vcl/spritecanvas.cxx
View File

@ -4,9 +4,9 @@
* *
* $RCSfile: spritecanvas.cxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -165,8 +165,9 @@ namespace vclcanvas
if( aArguments.getLength() >= 1 && if( aArguments.getLength() >= 1 &&
aArguments[0].getValueTypeClass() == uno::TypeClass_HYPER ) aArguments[0].getValueTypeClass() == uno::TypeClass_HYPER )
{ {
// TODO(Q2): This now works for Solaris, but still warns for gcc sal_Int64 nWindowPtr = 0;
Window* pOutputWindow = (Window*) *reinterpret_cast<const sal_Int64*>(aArguments[0].getValue()); aArguments[0] >>= nWindowPtr;
Window* pOutputWindow = reinterpret_cast<Window*>(nWindowPtr);
CHECK_AND_THROW( pOutputWindow != NULL, CHECK_AND_THROW( pOutputWindow != NULL,
"SpriteCanvas::initialize: invalid Window pointer" ); "SpriteCanvas::initialize: invalid Window pointer" );
@ -318,7 +319,7 @@ namespace
extern "C" extern "C"
{ {
void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvTypeName, void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvTypeName,
uno_Environment** ppEnv ) uno_Environment** )
{ {
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
} }