[Libreoffice-commits] core.git: vcl/source

[Khaled Hosny]

 vcl/source/gdi/outdev2.cxx |   27 ++++++-------------------
 vcl/source/gdi/print.cxx   |   47 ++++++++++++---------------------------------
 2 files changed, 20 insertions(+), 54 deletions(-)

New commits:
commit 4e642a3f6b07163a030720f2043b0dde1fdfd66d
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sat Mar 22 16:33:07 2014 +0200

    No need for these (void)s
    
    Change-Id: I946009c4ffacf51c7f144acf85060ccd4a31620a

diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 5e68c71..d20cd78 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -328,14 +328,10 @@ void OutputDevice::DrawOutDev( const Point& rDestPt, const Size& rDestSize,
     }
 }
 
-void OutputDevice::DrawOutDev( const Point& rDestPt, const Size& rDestSize,
-                               const Point& rSrcPt,  const Size& rSrcSize,
-                               const Printer& /* rOutDev */ )
+void OutputDevice::DrawOutDev( const Point& /*rDestPt*/, const Size& /*rDestSize*/,
+                               const Point& /*rSrcPt*/,  const Size& /*rSrcSize*/,
+                               const Printer& /*rOutDev*/ )
 {
-    (void) rDestPt;
-    (void) rDestSize;
-    (void) rSrcPt;
-    (void) rSrcSize;
     // This should never occur! You can't call this function on a Printer instance
     DBG_ASSERT( false, "Don't use OutputDevice::DrawOutDev(...) with printer devices!" );
 }
@@ -379,10 +375,8 @@ void OutputDevice::CopyArea( const Point& rDestPt,
         mpAlphaVDev->CopyArea( rDestPt, rSrcPt, rSrcSize, nFlags );
 }
 
-void OutputDevice::CopyAreaFinal( SalTwoRect& aPosAry, sal_uInt32 nFlags )
+void OutputDevice::CopyAreaFinal( SalTwoRect& aPosAry, sal_uInt32 /*nFlags*/)
 {
-    (void) nFlags;
-
     if ( aPosAry.mnSrcWidth && aPosAry.mnSrcHeight && aPosAry.mnDestWidth && aPosAry.mnDestHeight )
     {
         aPosAry.mnDestWidth  = aPosAry.mnSrcWidth;
@@ -2276,18 +2270,11 @@ void OutputDevice::ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask
     }
 }
 
-void OutputDevice::ImplPrintMask( const Bitmap& rMask, const Color& rMaskColor,
-                                  const Point& rDestPt, const Size& rDestSize,
-                                  const Point& rSrcPtPixel, const Size& rSrcSizePixel )
+void OutputDevice::ImplPrintMask( const Bitmap& /*rMask*/, const Color& /*rMaskColor*/,
+                                  const Point& /*rDestPt*/, const Size& /*rDestSize*/,
+                                  const Point& /*rSrcPtPixel*/, const Size& /*rSrcSizePixel*/ )
 {
     // let's leave this for Printer
-    (void) rMask;
-    (void) rMaskColor;
-    (void) rDestPt;
-    (void) rDestSize;
-    (void) rSrcPtPixel;
-    (void) rSrcSizePixel;
-
     return;
 }
 
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index c5d1961..25f20a7 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -212,61 +212,40 @@ bool PrinterOptions::ReadFromConfig( bool i_bFile )
 }
 
 bool Printer::DrawTransformBitmapExDirect(
-    const basegfx::B2DHomMatrix& aFullTransform,
-    const BitmapEx& rBitmapEx)
+    const basegfx::B2DHomMatrix& /*aFullTransform*/,
+    const BitmapEx& /*rBitmapEx*/)
 {
     // printers can't draw bitmaps directly
-    (void) aFullTransform;
-    (void) rBitmapEx;
     return false;
 }
 
 bool Printer::TransformReduceBitmapExTargetRange(
-    const basegfx::B2DHomMatrix& aFullTransform,
-    basegfx::B2DRange &aVisibleRange,
-    double &fMaximumArea)
+    const basegfx::B2DHomMatrix& /*aFullTransform*/,
+    basegfx::B2DRange& /*aVisibleRange*/,
+    double& /*fMaximumArea*/)
 {
     // deliberately do nothing - you can't reduce the
     // target range for a printer at all
-    (void) aFullTransform;
-    (void) aVisibleRange;
-    (void) fMaximumArea;
     return true;
 }
 
-void Printer::DrawOutDev( const Point& rDestPt, const Size& rDestSize,
-                               const Point& rSrcPt,  const Size& rSrcSize )
+void Printer::DrawOutDev( const Point& /*rDestPt*/, const Size& /*rDestSize*/,
+                               const Point& /*rSrcPt*/,  const Size& /*rSrcSize*/ )
 {
-    (void) rDestPt;
-    (void) rDestSize;
-    (void) rSrcPt;
-    (void) rSrcSize;
-
     DBG_ASSERT( false, "Don't use OutputDevice::DrawOutDev(...) with printer devices!" );
 }
 
-void Printer::DrawOutDev( const Point& rDestPt, const Size& rDestSize,
-                               const Point& rSrcPt,  const Size& rSrcSize,
-                               const OutputDevice& rOutDev )
+void Printer::DrawOutDev( const Point& /*rDestPt*/, const Size& /*rDestSize*/,
+                               const Point& /*rSrcPt*/,  const Size& /*rSrcSize*/,
+                               const OutputDevice& /*rOutDev*/ )
 {
-    (void) rDestPt;
-    (void) rDestSize;
-    (void) rSrcPt;
-    (void) rSrcSize;
-    (void) rOutDev;
-
     DBG_ASSERT( false, "Don't use OutputDevice::DrawOutDev(...) with printer devices!" );
 }
 
-void Printer::CopyArea( const Point& rDestPt,
-                        const Point& rSrcPt,  const Size& rSrcSize,
-                        sal_uInt16 nFlags )
+void Printer::CopyArea( const Point& /*rDestPt*/,
+                        const Point& /*rSrcPt*/,  const Size& /*rSrcSize*/,
+                        sal_uInt16 /*nFlags*/ )
 {
-    (void) rDestPt;
-    (void) rSrcPt;
-    (void) rSrcSize;
-    (void) nFlags;
-
     DBG_ASSERT( false, "Don't use OutputDevice::CopyArea(...) with printer devices!" );
 }