diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 01:16:50 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 01:16:50 +0000 |
| commit | bf7979885240f606b4fb176d620a04243dd9eb72 (patch) | |
| tree | aa4d5ad1a06c11242bd1bf01c49dd3113c81bf3a /canvas | |
| parent | 521057880428538e4fdefafa59364c050821bc23 (diff) | |
INTEGRATION: CWS warnings01 (1.2.8); FILE MERGED
2006/02/22 22:27:24 thb 1.2.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/null/null_spritehelper.hxx | 7 | ||||
| -rw-r--r-- | canvas/source/tools/bitmap.cxx | 12 |
2 files changed, 11 insertions, 8 deletions
diff --git a/canvas/source/null/null_spritehelper.hxx b/canvas/source/null/null_spritehelper.hxx index dbe2cb4012fd..6ead30ec9b3d 100644 --- a/canvas/source/null/null_spritehelper.hxx +++ b/canvas/source/null/null_spritehelper.hxx @@ -4,9 +4,9 @@ * * $RCSfile: null_spritehelper.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2005-11-02 12:50:41 $ + * last change: $Author: hr $ $Date: 2006-06-20 02:16:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -63,6 +63,9 @@ namespace nullcanvas */ SpriteHelper(); + // make CanvasCustomSpriteHelper::init visible for name lookup + using ::canvas::CanvasCustomSpriteHelper::init; + /** Late-init the sprite helper @param rSpriteSize diff --git a/canvas/source/tools/bitmap.cxx b/canvas/source/tools/bitmap.cxx index 3d11843f726f..a72bd8817785 100644 --- a/canvas/source/tools/bitmap.cxx +++ b/canvas/source/tools/bitmap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bitmap.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2005-11-02 12:51:35 $ + * last change: $Author: hr $ $Date: 2006-06-20 02:16:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -90,7 +90,7 @@ namespace canvas mpImage->getHeight() ); } - ::com::sun::star::uno::Sequence< sal_Int8 > getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, + ::com::sun::star::uno::Sequence< sal_Int8 > getData( ::com::sun::star::rendering::IntegerBitmapLayout& /*bitmapLayout*/, const ::com::sun::star::geometry::IntegerRectangle2D& rect ) { const IColorBuffer::Format format = mpImage->getFormat(); @@ -120,7 +120,7 @@ namespace canvas } void setData( const ::com::sun::star::uno::Sequence< sal_Int8 >& data, - const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, + const ::com::sun::star::rendering::IntegerBitmapLayout& /*bitmapLayout*/, const ::com::sun::star::geometry::IntegerRectangle2D& rect ) { const IColorBuffer::Format format = mpImage->getFormat(); @@ -146,7 +146,7 @@ namespace canvas } void setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >& color, - const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, + const ::com::sun::star::rendering::IntegerBitmapLayout& /*bitmapLayout*/, const ::com::sun::star::geometry::IntegerPoint2D& pos ) { struct ARGBColor @@ -204,7 +204,7 @@ namespace canvas mpImage->unlock(); } - uno::Sequence< sal_Int8 > getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, + uno::Sequence< sal_Int8 > getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& /*bitmapLayout*/, const ::com::sun::star::geometry::IntegerPoint2D& pos ) { const IColorBuffer::Format format = mpImage->getFormat(); |