diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 20:49:42 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 20:49:42 +0000 |
| commit | 56fb6080e66af9bf577b8484fd36fa84726cd99e (patch) | |
| tree | 3d852cccce5c7044d64939f20b3c326af62a4c6d /goodies | |
| parent | 2b00a911fc5e665bff062722f0e750d6478caf0d (diff) | |
INTEGRATION: CWS warnings01 (1.30.4); FILE MERGED
2005/11/16 16:42:21 pl 1.30.4.1: #i55991# removed warnings
Diffstat (limited to 'goodies')
| -rw-r--r-- | goodies/source/graphic/grfmgr.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/goodies/source/graphic/grfmgr.cxx b/goodies/source/graphic/grfmgr.cxx index 5dd7775de0e0..ef0c8e5a1d6f 100644 --- a/goodies/source/graphic/grfmgr.cxx +++ b/goodies/source/graphic/grfmgr.cxx @@ -4,9 +4,9 @@ * * $RCSfile: grfmgr.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: hr $ $Date: 2005-10-27 15:56:53 $ + * last change: $Author: hr $ $Date: 2006-06-19 21:49:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -120,6 +120,7 @@ GraphicObject::GraphicObject( const Graphic& rGraphic, const String& rLink, cons // ----------------------------------------------------------------------------- GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const GraphicManager* pMgr ) : + SvDataCopyStream(), maGraphic ( rGraphicObj.GetGraphic() ), maAttr ( rGraphicObj.maAttr ), mpLink ( rGraphicObj.mpLink ? ( new String( *rGraphicObj.mpLink ) ) : NULL ), @@ -789,7 +790,7 @@ BOOL GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const // ----------------------------------------------------------------------------- BOOL GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz, - long nExtraData, const GraphicAttr* pAttr, ULONG nFlags, + long nExtraData, const GraphicAttr* pAttr, ULONG /*nFlags*/, OutputDevice* pFirstFrameOutDev ) { BOOL bRet = FALSE; @@ -978,7 +979,7 @@ Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const MapMo } else if( GRAPHIC_BITMAP == eType ) { - BitmapEx aBmpEx( aTransGraphic.GetBitmapEx() ); + BitmapEx aBitmapEx( aTransGraphic.GetBitmapEx() ); // convert crops to pixel aCropLeftTop = Application::GetDefaultDevice()->LogicToPixel( Size( rAttr.GetLeftCrop(), @@ -1237,7 +1238,7 @@ void GraphicObject::SetSwapState() // ----------------------------------------------------------------------------- -IMPL_LINK( GraphicObject, ImplAutoSwapOutHdl, void*, p ) +IMPL_LINK( GraphicObject, ImplAutoSwapOutHdl, void*, EMPTYARG ) { if( !IsSwappedOut() ) { |