INTEGRATION: CWS warnings01 (1.7.8); FILE MERGED

2006/02/22 22:27:25 thb 1.7.8.1: #i55991# Removed virtual derivations, where unnecessary; removed unused params; renamed vars which shadowed previous ones; put agg headers into sys header brackets

1 files changed, 50 insertions, 50 deletions

diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index 707ce89d4fb5..061a7fac73ec 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: canvashelper.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: kz $ $Date: 2005-11-02 13:00:07 $
+ *  last change: $Author: hr $ $Date: 2006-06-20 02:20:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -150,7 +150,7 @@ namespace vclcanvas
         mp2ndOutDev = rOutDev;
     }
 
-    void CanvasHelper::drawPoint( const rendering::XCanvas*     pCanvas,
+    void CanvasHelper::drawPoint( const rendering::XCanvas*     ,
                                   const geometry::RealPoint2D&  aPoint,
                                   const rendering::ViewState&   viewState,
                                   const rendering::RenderState& renderState )
@@ -173,7 +173,7 @@ namespace vclcanvas
         }
     }
 
-    void CanvasHelper::drawLine( const rendering::XCanvas*      pCanvas,
+    void CanvasHelper::drawLine( const rendering::XCanvas*      ,
                                  const geometry::RealPoint2D&   aStartRealPoint2D,
                                  const geometry::RealPoint2D&   aEndRealPoint2D,
                                  const rendering::ViewState&    viewState,
@@ -199,7 +199,7 @@ namespace vclcanvas
         }
     }
 
-    void CanvasHelper::drawBezier( const rendering::XCanvas*            pCanvas,
+    void CanvasHelper::drawBezier( const rendering::XCanvas*            ,
                                    const geometry::RealBezierSegment2D& aBezierSegment,
                                    const geometry::RealPoint2D&         _aEndPoint,
                                    const rendering::ViewState&          viewState,
@@ -240,7 +240,7 @@ namespace vclcanvas
         }
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawPolyPolygon( const rendering::XCanvas*                          pCanvas,
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawPolyPolygon( const rendering::XCanvas*                          ,
                                                                                  const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon,
                                                                                  const rendering::ViewState&                        viewState,
                                                                                  const rendering::RenderState&                      renderState )
@@ -289,7 +289,7 @@ namespace vclcanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokePolyPolygon( const rendering::XCanvas*                            pCanvas,
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokePolyPolygon( const rendering::XCanvas*                            ,
                                                                                    const uno::Reference< rendering::XPolyPolygon2D >&   xPolyPolygon,
                                                                                    const rendering::ViewState&                          viewState,
                                                                                    const rendering::RenderState&                        renderState,
@@ -393,37 +393,37 @@ namespace vclcanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTexturedPolyPolygon( const rendering::XCanvas*                            pCanvas,
-                                                                                           const uno::Reference< rendering::XPolyPolygon2D >&   xPolyPolygon,
-                                                                                           const rendering::ViewState&                          viewState,
-                                                                                           const rendering::RenderState&                        renderState,
-                                                                                           const uno::Sequence< rendering::Texture >&           textures,
-                                                                                           const rendering::StrokeAttributes&                   strokeAttributes )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTexturedPolyPolygon( const rendering::XCanvas*                            ,
+                                                                                           const uno::Reference< rendering::XPolyPolygon2D >&   ,
+                                                                                           const rendering::ViewState&                          ,
+                                                                                           const rendering::RenderState&                        ,
+                                                                                           const uno::Sequence< rendering::Texture >&           ,
+                                                                                           const rendering::StrokeAttributes&                    )
     {
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTextureMappedPolyPolygon( const rendering::XCanvas*                           pCanvas,
-                                                                                                const uno::Reference< rendering::XPolyPolygon2D >&  xPolyPolygon,
-                                                                                                const rendering::ViewState&                         viewState,
-                                                                                                const rendering::RenderState&                       renderState,
-                                                                                                const uno::Sequence< rendering::Texture >&          textures,
-                                                                                                const uno::Reference< geometry::XMapping2D >&       xMapping,
-                                                                                                const rendering::StrokeAttributes&                  strokeAttributes )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTextureMappedPolyPolygon( const rendering::XCanvas*                           ,
+                                                                                                const uno::Reference< rendering::XPolyPolygon2D >&  ,
+                                                                                                const rendering::ViewState&                         ,
+                                                                                                const rendering::RenderState&                       ,
+                                                                                                const uno::Sequence< rendering::Texture >&          ,
+                                                                                                const uno::Reference< geometry::XMapping2D >&       ,
+                                                                                                const rendering::StrokeAttributes&                   )
     {
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XPolyPolygon2D >   CanvasHelper::queryStrokeShapes( const rendering::XCanvas*                            pCanvas,
-                                                                                   const uno::Reference< rendering::XPolyPolygon2D >&   xPolyPolygon,
-                                                                                   const rendering::ViewState&                          viewState,
-                                                                                   const rendering::RenderState&                        renderState,
-                                                                                   const rendering::StrokeAttributes&                   strokeAttributes )
+    uno::Reference< rendering::XPolyPolygon2D >   CanvasHelper::queryStrokeShapes( const rendering::XCanvas*                            ,
+                                                                                   const uno::Reference< rendering::XPolyPolygon2D >&   ,
+                                                                                   const rendering::ViewState&                          ,
+                                                                                   const rendering::RenderState&                        ,
+                                                                                   const rendering::StrokeAttributes&                    )
     {
         return uno::Reference< rendering::XPolyPolygon2D >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillPolyPolygon( const rendering::XCanvas*                          pCanvas,
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillPolyPolygon( const rendering::XCanvas*                          ,
                                                                                  const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon,
                                                                                  const rendering::ViewState&                        viewState,
                                                                                  const rendering::RenderState&                      renderState )
@@ -458,17 +458,17 @@ namespace vclcanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTextureMappedPolyPolygon( const rendering::XCanvas*                             pCanvas,
-                                                                                              const uno::Reference< rendering::XPolyPolygon2D >&    xPolyPolygon,
-                                                                                              const rendering::ViewState&                           viewState,
-                                                                                              const rendering::RenderState&                         renderState,
-                                                                                              const uno::Sequence< rendering::Texture >&            textures,
-                                                                                              const uno::Reference< geometry::XMapping2D >&         xMapping     )
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTextureMappedPolyPolygon( const rendering::XCanvas*                             ,
+                                                                                              const uno::Reference< rendering::XPolyPolygon2D >&    ,
+                                                                                              const rendering::ViewState&                           ,
+                                                                                              const rendering::RenderState&                         ,
+                                                                                              const uno::Sequence< rendering::Texture >&            ,
+                                                                                              const uno::Reference< geometry::XMapping2D >&              )
     {
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCanvasFont > CanvasHelper::createFont( const rendering::XCanvas*                        pCanvas,
+    uno::Reference< rendering::XCanvasFont > CanvasHelper::createFont( const rendering::XCanvas*                        ,
                                                                        const rendering::FontRequest&                    fontRequest,
                                                                        const uno::Sequence< beans::PropertyValue >&     extraFontProperties,
                                                                        const geometry::Matrix2D&                        fontMatrix )
@@ -484,15 +484,15 @@ namespace vclcanvas
         return uno::Reference< rendering::XCanvasFont >();
     }
 
-    uno::Sequence< rendering::FontInfo > CanvasHelper::queryAvailableFonts( const rendering::XCanvas*                       pCanvas,
-                                                                            const rendering::FontInfo&                      aFilter,
-                                                                            const uno::Sequence< beans::PropertyValue >&    aFontProperties )
+    uno::Sequence< rendering::FontInfo > CanvasHelper::queryAvailableFonts( const rendering::XCanvas*                       ,
+                                                                            const rendering::FontInfo&                      ,
+                                                                            const uno::Sequence< beans::PropertyValue >&     )
     {
         // TODO(F2)
         return uno::Sequence< rendering::FontInfo >();
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawText( const rendering::XCanvas*                         pCanvas,
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawText( const rendering::XCanvas*                         ,
                                                                           const rendering::StringContext&                   text,
                                                                           const uno::Reference< rendering::XCanvasFont >&   xFont,
                                                                           const rendering::ViewState&                       viewState,
@@ -551,7 +551,7 @@ namespace vclcanvas
         return uno::Reference< rendering::XCachedPrimitive >(NULL);
     }
 
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawTextLayout( const rendering::XCanvas*                       pCanvas,
+    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawTextLayout( const rendering::XCanvas*                       ,
                                                                                 const uno::Reference< rendering::XTextLayout >& xLayoutedText,
                                                                                 const rendering::ViewState&                     viewState,
                                                                                 const rendering::RenderState&                   renderState )
@@ -807,14 +807,14 @@ namespace vclcanvas
         return uno::Reference< rendering::XGraphicDevice >(mpDevice);
     }
 
-    void CanvasHelper::copyRect( const rendering::XCanvas*                          pCanvas,
-                                 const uno::Reference< rendering::XBitmapCanvas >&  sourceCanvas,
-                                 const geometry::RealRectangle2D&                   sourceRect,
-                                 const rendering::ViewState&                        sourceViewState,
-                                 const rendering::RenderState&                      sourceRenderState,
-                                 const geometry::RealRectangle2D&                   destRect,
-                                 const rendering::ViewState&                        destViewState,
-                                 const rendering::RenderState&                      destRenderState )
+    void CanvasHelper::copyRect( const rendering::XCanvas*                          ,
+                                 const uno::Reference< rendering::XBitmapCanvas >&  ,
+                                 const geometry::RealRectangle2D&                   ,
+                                 const rendering::ViewState&                        ,
+                                 const rendering::RenderState&                      ,
+                                 const geometry::RealRectangle2D&                   ,
+                                 const rendering::ViewState&                        ,
+                                 const rendering::RenderState&                       )
     {
         // TODO(F1)
     }
@@ -846,7 +846,7 @@ namespace vclcanvas
             new CanvasBitmap( aBitmap, mpDevice ) );
     }
 
-    uno::Sequence< sal_Int8 > CanvasHelper::getData( rendering::IntegerBitmapLayout&        bitmapLayout,
+    uno::Sequence< sal_Int8 > CanvasHelper::getData( rendering::IntegerBitmapLayout&        ,
                                                      const geometry::IntegerRectangle2D&    rect )
     {
         if( !mpOutDev.get() )
@@ -890,7 +890,7 @@ namespace vclcanvas
     }
 
     void CanvasHelper::setData( const uno::Sequence< sal_Int8 >&        data,
-                                const rendering::IntegerBitmapLayout&   bitmapLayout,
+                                const rendering::IntegerBitmapLayout&   ,
                                 const geometry::IntegerRectangle2D&     rect )
     {
         if( !mpOutDev.get() )
@@ -1017,7 +1017,7 @@ namespace vclcanvas
     }
 
     void CanvasHelper::setPixel( const uno::Sequence< sal_Int8 >&       color,
-                                 const rendering::IntegerBitmapLayout&  bitmapLayout,
+                                 const rendering::IntegerBitmapLayout&  ,
                                  const geometry::IntegerPoint2D&        pos )
     {
         if( !mpOutDev.get() )
@@ -1045,7 +1045,7 @@ namespace vclcanvas
                                color ) );
     }
 
-    uno::Sequence< sal_Int8 > CanvasHelper::getPixel( rendering::IntegerBitmapLayout&   bitmapLayout,
+    uno::Sequence< sal_Int8 > CanvasHelper::getPixel( rendering::IntegerBitmapLayout&   ,
                                                       const geometry::IntegerPoint2D&   pos )
     {
         if( !mpOutDev.get() )