From 065a3db2288ac15d6709ddbf67561e1c94e20d5d Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Thu, 12 Oct 2006 14:00:10 +0000
Subject: [PATCH] INTEGRATION: CWS sb59 (1.8.22); FILE MERGED 2006/08/11
 15:36:03 thb 1.8.22.1: #i68336# Removed unused params; added a few using
 declarations for hidden methods; added a few casts; added some default
 statements to get cppcanvas warning free

---
 cppcanvas/source/mtfrenderer/mtftools.cxx       | 11 ++++++-----
 cppcanvas/source/mtfrenderer/polypolyaction.cxx |  7 +++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx
index 8a0e38376fec..a1c5335a739d 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.cxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: mtftools.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 12:49:38 $
+ *  last change: $Author: obo $ $Date: 2006-10-12 14:59:56 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -90,6 +90,10 @@ namespace cppcanvas
                     return ::Size( 0,
                                    aMetric.GetIntLeading() + aMetric.GetAscent() );
 
+                default:
+                    ENSURE_AND_THROW( false,
+                                      "tools::getBaselineOffset(): Unexpected TextAlign value" );
+                    // FALLTHROUGH intended (to calm compiler warning - case won't happen)
                 case ALIGN_BASELINE:
                     return ::Size( 0, 0 );
 
@@ -97,9 +101,6 @@ namespace cppcanvas
                     return ::Size( 0,
                                    -aMetric.GetDescent() );
 
-                default:
-                    ENSURE_AND_THROW( false,
-                                      "tools::getBaselineOffset(): Unexpected TextAlign value" );
             }
         }
 
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index 40ca15677708..584a740b24f1 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: polypolyaction.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 12:50:05 $
+ *  last change: $Author: obo $ $Date: 2006-10-12 15:00:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -90,6 +90,7 @@ namespace cppcanvas
                 virtual sal_Int32 getActionCount() const;
 
             private:
+                using Action::render;
                 virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
                                      const ::basegfx::B2DHomMatrix&                 rTransformation ) const;
 
@@ -282,6 +283,7 @@ namespace cppcanvas
                 virtual sal_Int32 getActionCount() const;
 
             private:
+                using Action::render;
                 virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
                                      const ::basegfx::B2DHomMatrix&                 rTransformation ) const;
 
@@ -396,6 +398,7 @@ namespace cppcanvas
                 virtual sal_Int32 getActionCount() const;
 
             private:
+                using Action::render;
                 virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
                                      const ::basegfx::B2DHomMatrix&                 rTransformation ) const;