INTEGRATION: CWS warnings01 (1.2.8); FILE MERGED

2006/02/22 22:27:25 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
This commit is contained in:
Jens-Heiner Rechtien
2006-06-20 01:20:34 +00:00
parent 90a9ed9425
commit 80c01e1cbd

View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: devicehelper.cxx,v $ * $RCSfile: devicehelper.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: kz $ $Date: 2005-11-02 13:00:49 $ * last change: $Author: hr $ $Date: 2006-06-20 02:20:34 $
* *
* 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.
@@ -97,7 +97,7 @@ namespace vclcanvas
} }
uno::Reference< rendering::XLinePolyPolygon2D > DeviceHelper::createCompatibleLinePolyPolygon( uno::Reference< rendering::XLinePolyPolygon2D > DeviceHelper::createCompatibleLinePolyPolygon(
const uno::Reference< rendering::XGraphicDevice >& rDevice, const uno::Reference< rendering::XGraphicDevice >& ,
const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >& points ) const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >& points )
{ {
if( !mpOutputWindow ) if( !mpOutputWindow )
@@ -109,7 +109,7 @@ namespace vclcanvas
} }
uno::Reference< rendering::XBezierPolyPolygon2D > DeviceHelper::createCompatibleBezierPolyPolygon( uno::Reference< rendering::XBezierPolyPolygon2D > DeviceHelper::createCompatibleBezierPolyPolygon(
const uno::Reference< rendering::XGraphicDevice >& rDevice, const uno::Reference< rendering::XGraphicDevice >& ,
const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >& points ) const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >& points )
{ {
if( !mpOutputWindow ) if( !mpOutputWindow )
@@ -121,7 +121,7 @@ namespace vclcanvas
} }
uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleBitmap( uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleBitmap(
const uno::Reference< rendering::XGraphicDevice >& rDevice, const uno::Reference< rendering::XGraphicDevice >& ,
const geometry::IntegerSize2D& size ) const geometry::IntegerSize2D& size )
{ {
if( !mpSpriteCanvas ) if( !mpSpriteCanvas )
@@ -134,14 +134,14 @@ namespace vclcanvas
} }
uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileBitmap( uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileBitmap(
const uno::Reference< rendering::XGraphicDevice >& rDevice, const uno::Reference< rendering::XGraphicDevice >& ,
const geometry::IntegerSize2D& size ) const geometry::IntegerSize2D& )
{ {
return uno::Reference< rendering::XVolatileBitmap >(); return uno::Reference< rendering::XVolatileBitmap >();
} }
uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleAlphaBitmap( uno::Reference< rendering::XBitmap > DeviceHelper::createCompatibleAlphaBitmap(
const uno::Reference< rendering::XGraphicDevice >& rDevice, const uno::Reference< rendering::XGraphicDevice >& ,
const geometry::IntegerSize2D& size ) const geometry::IntegerSize2D& size )
{ {
if( !mpSpriteCanvas ) if( !mpSpriteCanvas )
@@ -153,8 +153,8 @@ namespace vclcanvas
} }
uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileAlphaBitmap( uno::Reference< rendering::XVolatileBitmap > DeviceHelper::createVolatileAlphaBitmap(
const uno::Reference< rendering::XGraphicDevice >& rDevice, const uno::Reference< rendering::XGraphicDevice >& ,
const geometry::IntegerSize2D& size ) const geometry::IntegerSize2D& )
{ {
return uno::Reference< rendering::XVolatileBitmap >(); return uno::Reference< rendering::XVolatileBitmap >();
} }
@@ -167,12 +167,16 @@ namespace vclcanvas
sal_Bool DeviceHelper::enterFullScreenMode( sal_Bool bEnter ) sal_Bool DeviceHelper::enterFullScreenMode( sal_Bool bEnter )
{ {
(void)bEnter;
// TODO(F3): offer fullscreen mode the XCanvas way // TODO(F3): offer fullscreen mode the XCanvas way
return false; return false;
} }
::sal_Int32 DeviceHelper::createBuffers( ::sal_Int32 nBuffers ) ::sal_Int32 DeviceHelper::createBuffers( ::sal_Int32 nBuffers )
{ {
(void)nBuffers;
// TODO(F3): implement XBufferStrategy interface. For now, we // TODO(F3): implement XBufferStrategy interface. For now, we
// _always_ will have exactly one backbuffer // _always_ will have exactly one backbuffer
return 1; return 1;
@@ -259,7 +263,6 @@ namespace vclcanvas
SvFileStream aStream2( aFilename2, STREAM_STD_READWRITE ); SvFileStream aStream2( aFilename2, STREAM_STD_READWRITE );
const ::Point aEmptyPoint;
mpBackBuffer->getOutDev().EnableMapMode( FALSE ); mpBackBuffer->getOutDev().EnableMapMode( FALSE );
aStream2 << mpBackBuffer->getOutDev().GetBitmap(aEmptyPoint, aStream2 << mpBackBuffer->getOutDev().GetBitmap(aEmptyPoint,
mpBackBuffer->getOutDev().GetOutputSizePixel()); mpBackBuffer->getOutDev().GetOutputSizePixel());