diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-20 12:52:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-20 13:47:52 +0000 |
| commit | c2ef6387de22d76537e44ec74bd13d718f915814 (patch) | |
| tree | 33b4feaf9d766c40706197ac5a1ac43ff99cab51 /cppcanvas | |
| parent | de37e7ae4808dc9cdd84a8c21411958ed51db5b6 (diff) | |
loplugin:unusedfields in cppcanvas
Change-Id: Ibba6a89ba87970bf08c44e8a70ce0dd1e9f75956
Reviewed-on: https://gerrit.libreoffice.org/20081
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/emfplus.cxx | 1 | ||||
| -rw-r--r-- | cppcanvas/source/mtfrenderer/textaction.cxx | 28 |
2 files changed, 0 insertions, 29 deletions
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 56370f11ba04..e165e9e4a098 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -1162,7 +1162,6 @@ namespace cppcanvas struct EMFPFont : public EMFPObject { - sal_uInt32 version; float emSize; sal_uInt32 sizeUnit; sal_Int32 fontFlags; diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index 79e05cec23d7..d44521e55999 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -1531,7 +1531,6 @@ namespace cppcanvas const ::Color& rShadowColor, const ::basegfx::B2DRectangle& rOutlineBounds, const uno::Reference< rendering::XPolyPolygon2D >& rTextPoly, - const ::std::vector< sal_Int32 >& rPolygonGlyphMap, const uno::Sequence< double >& rOffsets, VirtualDevice& rVDev, const CanvasSharedPtr& rCanvas, @@ -1543,7 +1542,6 @@ namespace cppcanvas const ::Color& rShadowColor, const ::basegfx::B2DRectangle& rOutlineBounds, const uno::Reference< rendering::XPolyPolygon2D >& rTextPoly, - const ::std::vector< sal_Int32 >& rPolygonGlyphMap, const uno::Sequence< double >& rOffsets, VirtualDevice& rVDev, const CanvasSharedPtr& rCanvas, @@ -1573,15 +1571,6 @@ namespace cppcanvas uno::Reference< rendering::XPolyPolygon2D > mxTextPoly; - /** This vector denotes the index of the start polygon - for the respective glyph sequence. - - To get a polygon index range for a given character - index i, take [ maPolygonGlyphMap[i], - maPolygonGlyphMap[i+1] ). Note that this is wrong - for BiDi - */ - const ::std::vector< sal_Int32 > maPolygonGlyphMap; const uno::Sequence< double > maOffsets; const CanvasSharedPtr mpCanvas; rendering::RenderState maState; @@ -1616,13 +1605,11 @@ namespace cppcanvas const ::Color& rShadowColor, const ::basegfx::B2DRectangle& rOutlineBounds, const uno::Reference< rendering::XPolyPolygon2D >& rTextPoly, - const ::std::vector< sal_Int32 >& rPolygonGlyphMap, const uno::Sequence< double >& rOffsets, VirtualDevice& rVDev, const CanvasSharedPtr& rCanvas, const OutDevState& rState ) : mxTextPoly( rTextPoly ), - maPolygonGlyphMap( rPolygonGlyphMap ), maOffsets( rOffsets ), mpCanvas( rCanvas ), maState(), @@ -1659,14 +1646,12 @@ namespace cppcanvas const ::Color& rShadowColor, const ::basegfx::B2DRectangle& rOutlineBounds, const uno::Reference< rendering::XPolyPolygon2D >& rTextPoly, - const ::std::vector< sal_Int32 >& rPolygonGlyphMap, const uno::Sequence< double >& rOffsets, VirtualDevice& rVDev, const CanvasSharedPtr& rCanvas, const OutDevState& rState, const ::basegfx::B2DHomMatrix& rTextTransform ) : mxTextPoly( rTextPoly ), - maPolygonGlyphMap( rPolygonGlyphMap ), maOffsets( rOffsets ), mpCanvas( rCanvas ), maState(), @@ -1968,11 +1953,6 @@ namespace cppcanvas if( !bHaveOutlines ) return ActionSharedPtr(); - ::std::vector< sal_Int32 > aPolygonGlyphMap; - - // first glyph starts at polygon index 0 - aPolygonGlyphMap.push_back( 0 ); - // remove offsetting from mapmode transformation // (outline polygons must stay at origin, only need to // be scaled) @@ -2013,12 +1993,6 @@ namespace cppcanvas aResultingPolyPolygon.append( aPoly ); } } - - // TODO(F3): Depending on the semantics of - // GetTextOutlines(), this here is wrong! - - // calc next glyph index - aPolygonGlyphMap.push_back( aResultingPolyPolygon.count() ); } const uno::Sequence< double > aCharWidthSeq( @@ -2045,7 +2019,6 @@ namespace cppcanvas rShadowColor, ::basegfx::tools::getRange(aResultingPolyPolygon), xTextPoly, - aPolygonGlyphMap, aCharWidthSeq, rVDev, rCanvas, @@ -2063,7 +2036,6 @@ namespace cppcanvas rShadowColor, ::basegfx::tools::getRange(aResultingPolyPolygon), xTextPoly, - aPolygonGlyphMap, aCharWidthSeq, rVDev, rCanvas, |