Skip to content

C
core
Kaydet (Commit) c2ef6387 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin
Dosyalara gözat
Seçenekler

loplugin:unusedfields in cppcanvas 

Change-Id: Ibba6a89ba87970bf08c44e8a70ce0dd1e9f75956
Reviewed-on: https://gerrit.libreoffice.org/20081Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst de37e7ae
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 29 deletions
cppcanvas/source/mtfrenderer/emfplus.cxx
Dosyayı görüntüle @ c2ef6387
...@@ -1162,7 +1162,6 @@ namespace cppcanvas ...@@ -1162,7 +1162,6 @@ namespace cppcanvas
struct EMFPFont : public EMFPObject struct EMFPFont : public EMFPObject
{ {
sal_uInt32 version;
float emSize; float emSize;
sal_uInt32 sizeUnit; sal_uInt32 sizeUnit;
sal_Int32 fontFlags; sal_Int32 fontFlags;
......
cppcanvas/source/mtfrenderer/textaction.cxx
Dosyayı görüntüle @ c2ef6387
...@@ -1531,7 +1531,6 @@ namespace cppcanvas ...@@ -1531,7 +1531,6 @@ namespace cppcanvas
const ::Color& rShadowColor, const ::Color& rShadowColor,
const ::basegfx::B2DRectangle& rOutlineBounds, const ::basegfx::B2DRectangle& rOutlineBounds,
const uno::Reference< rendering::XPolyPolygon2D >& rTextPoly, const uno::Reference< rendering::XPolyPolygon2D >& rTextPoly,
const ::std::vector< sal_Int32 >& rPolygonGlyphMap,
const uno::Sequence< double >& rOffsets, const uno::Sequence< double >& rOffsets,
VirtualDevice& rVDev, VirtualDevice& rVDev,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
...@@ -1543,7 +1542,6 @@ namespace cppcanvas ...@@ -1543,7 +1542,6 @@ namespace cppcanvas
const ::Color& rShadowColor, const ::Color& rShadowColor,
const ::basegfx::B2DRectangle& rOutlineBounds, const ::basegfx::B2DRectangle& rOutlineBounds,
const uno::Reference< rendering::XPolyPolygon2D >& rTextPoly, const uno::Reference< rendering::XPolyPolygon2D >& rTextPoly,
const ::std::vector< sal_Int32 >& rPolygonGlyphMap,
const uno::Sequence< double >& rOffsets, const uno::Sequence< double >& rOffsets,
VirtualDevice& rVDev, VirtualDevice& rVDev,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
...@@ -1573,15 +1571,6 @@ namespace cppcanvas ...@@ -1573,15 +1571,6 @@ namespace cppcanvas
uno::Reference< rendering::XPolyPolygon2D > mxTextPoly; 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 uno::Sequence< double > maOffsets;
const CanvasSharedPtr mpCanvas; const CanvasSharedPtr mpCanvas;
rendering::RenderState maState; rendering::RenderState maState;
...@@ -1616,13 +1605,11 @@ namespace cppcanvas ...@@ -1616,13 +1605,11 @@ namespace cppcanvas
const ::Color& rShadowColor, const ::Color& rShadowColor,
const ::basegfx::B2DRectangle& rOutlineBounds, const ::basegfx::B2DRectangle& rOutlineBounds,
const uno::Reference< rendering::XPolyPolygon2D >& rTextPoly, const uno::Reference< rendering::XPolyPolygon2D >& rTextPoly,
const ::std::vector< sal_Int32 >& rPolygonGlyphMap,
const uno::Sequence< double >& rOffsets, const uno::Sequence< double >& rOffsets,
VirtualDevice& rVDev, VirtualDevice& rVDev,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const OutDevState& rState ) : const OutDevState& rState ) :
mxTextPoly( rTextPoly ), mxTextPoly( rTextPoly ),
maPolygonGlyphMap( rPolygonGlyphMap ),
maOffsets( rOffsets ), maOffsets( rOffsets ),
mpCanvas( rCanvas ), mpCanvas( rCanvas ),
maState(), maState(),
...@@ -1659,14 +1646,12 @@ namespace cppcanvas ...@@ -1659,14 +1646,12 @@ namespace cppcanvas
const ::Color& rShadowColor, const ::Color& rShadowColor,
const ::basegfx::B2DRectangle& rOutlineBounds, const ::basegfx::B2DRectangle& rOutlineBounds,
const uno::Reference< rendering::XPolyPolygon2D >& rTextPoly, const uno::Reference< rendering::XPolyPolygon2D >& rTextPoly,
const ::std::vector< sal_Int32 >& rPolygonGlyphMap,
const uno::Sequence< double >& rOffsets, const uno::Sequence< double >& rOffsets,
VirtualDevice& rVDev, VirtualDevice& rVDev,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const OutDevState& rState, const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform ) : const ::basegfx::B2DHomMatrix& rTextTransform ) :
mxTextPoly( rTextPoly ), mxTextPoly( rTextPoly ),
maPolygonGlyphMap( rPolygonGlyphMap ),
maOffsets( rOffsets ), maOffsets( rOffsets ),
mpCanvas( rCanvas ), mpCanvas( rCanvas ),
maState(), maState(),
...@@ -1968,11 +1953,6 @@ namespace cppcanvas ...@@ -1968,11 +1953,6 @@ namespace cppcanvas
if( !bHaveOutlines ) if( !bHaveOutlines )
return ActionSharedPtr(); return ActionSharedPtr();
::std::vector< sal_Int32 > aPolygonGlyphMap;
// first glyph starts at polygon index 0
aPolygonGlyphMap.push_back( 0 );
// remove offsetting from mapmode transformation // remove offsetting from mapmode transformation
// (outline polygons must stay at origin, only need to // (outline polygons must stay at origin, only need to
// be scaled) // be scaled)
...@@ -2013,12 +1993,6 @@ namespace cppcanvas ...@@ -2013,12 +1993,6 @@ namespace cppcanvas
aResultingPolyPolygon.append( aPoly ); 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( const uno::Sequence< double > aCharWidthSeq(
...@@ -2045,7 +2019,6 @@ namespace cppcanvas ...@@ -2045,7 +2019,6 @@ namespace cppcanvas
rShadowColor, rShadowColor,
::basegfx::tools::getRange(aResultingPolyPolygon), ::basegfx::tools::getRange(aResultingPolyPolygon),
xTextPoly, xTextPoly,
aPolygonGlyphMap,
aCharWidthSeq, aCharWidthSeq,
rVDev, rVDev,
rCanvas, rCanvas,
...@@ -2063,7 +2036,6 @@ namespace cppcanvas ...@@ -2063,7 +2036,6 @@ namespace cppcanvas
rShadowColor, rShadowColor,
::basegfx::tools::getRange(aResultingPolyPolygon), ::basegfx::tools::getRange(aResultingPolyPolygon),
xTextPoly, xTextPoly,
aPolygonGlyphMap,
aCharWidthSeq, aCharWidthSeq,
rVDev, rVDev,
rCanvas, rCanvas,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment