mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS sb59 (1.8.22); FILE MERGED

Browse Source 
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
This commit is contained in:
Oliver Bolte
2006-10-12 14:00:10 +00:00
parent 9c8bf8e311
commit 065a3db228
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cppcanvas/source/mtfrenderer/mtftools.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: mtftools.cxx,v $ * $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 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.
@@ -90,6 +90,10 @@ namespace cppcanvas
return ::Size( 0, return ::Size( 0,
aMetric.GetIntLeading() + aMetric.GetAscent() ); 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: case ALIGN_BASELINE:
return ::Size( 0, 0 ); return ::Size( 0, 0 );
@@ -97,9 +101,6 @@ namespace cppcanvas
return ::Size( 0, return ::Size( 0,
-aMetric.GetDescent() ); -aMetric.GetDescent() );
default:
ENSURE_AND_THROW( false,
"tools::getBaselineOffset(): Unexpected TextAlign value" );
} }
} }

7
cppcanvas/source/mtfrenderer/polypolyaction.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: polypolyaction.cxx,v $ * $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 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.
@@ -90,6 +90,7 @@ namespace cppcanvas
virtual sal_Int32 getActionCount() const; virtual sal_Int32 getActionCount() const;
private: private:
using Action::render;
virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
const ::basegfx::B2DHomMatrix& rTransformation ) const; const ::basegfx::B2DHomMatrix& rTransformation ) const;
@@ -282,6 +283,7 @@ namespace cppcanvas
virtual sal_Int32 getActionCount() const; virtual sal_Int32 getActionCount() const;
private: private:
using Action::render;
virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
const ::basegfx::B2DHomMatrix& rTransformation ) const; const ::basegfx::B2DHomMatrix& rTransformation ) const;
@@ -396,6 +398,7 @@ namespace cppcanvas
virtual sal_Int32 getActionCount() const; virtual sal_Int32 getActionCount() const;
private: private:
using Action::render;
virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
const ::basegfx::B2DHomMatrix& rTransformation ) const; const ::basegfx::B2DHomMatrix& rTransformation ) const;