summaryrefslogtreecommitdiff
path: root/cppcanvas/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-04 16:28:49 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-08-05 09:39:22 +0000
commit403c13487c36f4200adf0986c5d11398f719cd7a (patch)
tree21a4acf87dce1e6c8772f5cbcff3c2a3de21f4ba /cppcanvas/source
parent10560949f90e08fe4a04dd91c7d388c4998100e8 (diff)
loplugin:unusedmethods
Change-Id: I6801618efb5a66d24156fa429e026acb6ca03aba Reviewed-on: https://gerrit.libreoffice.org/17506 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cppcanvas/source')
-rw-r--r--cppcanvas/source/inc/canvasgraphichelper.hxx3
-rw-r--r--cppcanvas/source/inc/implrenderer.hxx20
-rw-r--r--cppcanvas/source/tools/canvasgraphichelper.cxx19
-rw-r--r--cppcanvas/source/wrapper/implcanvas.cxx5
-rw-r--r--cppcanvas/source/wrapper/implcanvas.hxx2
-rw-r--r--cppcanvas/source/wrapper/implcolor.cxx8
-rw-r--r--cppcanvas/source/wrapper/implcolor.hxx1
-rw-r--r--cppcanvas/source/wrapper/implfont.cxx21
-rw-r--r--cppcanvas/source/wrapper/implfont.hxx5
-rw-r--r--cppcanvas/source/wrapper/implpolypolygon.cxx50
-rw-r--r--cppcanvas/source/wrapper/implpolypolygon.hxx4
-rw-r--r--cppcanvas/source/wrapper/implspritecanvas.cxx19
-rw-r--r--cppcanvas/source/wrapper/implspritecanvas.hxx1
13 files changed, 0 insertions, 158 deletions
diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx
index a8c075a68c36..26819ff5a087 100644
--- a/cppcanvas/source/inc/canvasgraphichelper.hxx
+++ b/cppcanvas/source/inc/canvasgraphichelper.hxx
@@ -48,12 +48,9 @@ namespace cppcanvas
// CanvasGraphic implementation
virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) SAL_OVERRIDE;
- virtual ::basegfx::B2DHomMatrix getTransformation() const SAL_OVERRIDE;
virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) SAL_OVERRIDE;
virtual void setClip() SAL_OVERRIDE;
- virtual ::basegfx::B2DPolyPolygon const* getClip() const SAL_OVERRIDE;
virtual void setCompositeOp( CompositeOp aOp ) SAL_OVERRIDE;
- virtual CompositeOp getCompositeOp() const SAL_OVERRIDE;
protected:
// for our clients
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 2ccd4a6a3ace..6c627282d43f 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -96,16 +96,6 @@ namespace cppcanvas
eDx = eDy = eM12 = eM21 = 0.0f;
}
- void Set (float m11, float m12, float dx, float m21, float m22, float dy)
- {
- eM11 = m11;
- eM12 = m12;
- eDx = dx;
- eM21 = m21;
- eM22 = m22;
- eDy = dy;
- }
-
void Set (const XForm& f)
{
eM11 = f.eM11;
@@ -116,16 +106,6 @@ namespace cppcanvas
eDy = f.eDy;
}
- void Multiply (float m11, float m12, float dx, float m21, float m22, float dy)
- {
- eM11 = eM11*m11 + eM12*m21;
- eM12 = eM11*m12 + eM12*m22;
- eM21 = eM21*m11 + eM22*m21;
- eM22 = eM21*m12 + eM22*m22;
- eDx *= eDx*m11 + eDy*m21 + dx;
- eDy *= eDx*m12 + eDy*m22 + dy;
- }
-
void Multiply (const XForm& f)
{
eM11 = eM11*f.eM11 + eM12*f.eM21;
diff --git a/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx
index 43231ed347d5..e766cc451d65 100644
--- a/cppcanvas/source/tools/canvasgraphichelper.cxx
+++ b/cppcanvas/source/tools/canvasgraphichelper.cxx
@@ -64,13 +64,6 @@ namespace cppcanvas
::canvas::tools::setRenderStateTransform( maRenderState, rMatrix );
}
- ::basegfx::B2DHomMatrix CanvasGraphicHelper::getTransformation() const
- {
- ::basegfx::B2DHomMatrix aMatrix;
- return ::canvas::tools::getRenderStateTransform( aMatrix,
- maRenderState );
- }
-
void CanvasGraphicHelper::setClip( const ::basegfx::B2DPolyPolygon& rClipPoly )
{
// TODO(T3): not thread-safe. B2DPolyPolygon employs copy-on-write
@@ -84,11 +77,6 @@ namespace cppcanvas
maRenderState.Clip.clear();
}
- ::basegfx::B2DPolyPolygon const* CanvasGraphicHelper::getClip() const
- {
- return !maClipPolyPolygon ? NULL : &(*maClipPolyPolygon);
- }
-
const rendering::RenderState& CanvasGraphicHelper::getRenderState() const
{
if( maClipPolyPolygon && !maRenderState.Clip.is() )
@@ -110,13 +98,6 @@ namespace cppcanvas
maRenderState.CompositeOperation = (sal_Int8)aOp;
}
- CanvasGraphic::CompositeOp CanvasGraphicHelper::getCompositeOp() const
- {
- return static_cast<CompositeOp>(maRenderState.CompositeOperation);
- }
-
-
-
}
}
diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx
index 70a4c3f24f42..a4f902bbcbf3 100644
--- a/cppcanvas/source/wrapper/implcanvas.cxx
+++ b/cppcanvas/source/wrapper/implcanvas.cxx
@@ -84,11 +84,6 @@ namespace cppcanvas
return !maClipPolyPolygon ? NULL : &(*maClipPolyPolygon);
}
- FontSharedPtr ImplCanvas::createFont( const OUString& rFontName, const double& rCellSize ) const
- {
- return FontSharedPtr( new ImplFont( getUNOCanvas(), rFontName, rCellSize ) );
- }
-
ColorSharedPtr ImplCanvas::createColor() const
{
return ColorSharedPtr( new ImplColor( getUNOCanvas()->getDevice() ) );
diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx
index c882ede2ccbe..7c8920cb65e9 100644
--- a/cppcanvas/source/wrapper/implcanvas.hxx
+++ b/cppcanvas/source/wrapper/implcanvas.hxx
@@ -60,8 +60,6 @@ namespace cppcanvas
virtual void setClip() SAL_OVERRIDE;
virtual ::basegfx::B2DPolyPolygon const* getClip() const SAL_OVERRIDE;
- virtual FontSharedPtr createFont( const OUString& rFontName, const double& rCellSize ) const SAL_OVERRIDE;
-
virtual ColorSharedPtr createColor() const SAL_OVERRIDE;
virtual CanvasSharedPtr clone() const SAL_OVERRIDE;
diff --git a/cppcanvas/source/wrapper/implcolor.cxx b/cppcanvas/source/wrapper/implcolor.cxx
index fa59576e68cf..1c69bb4251f3 100644
--- a/cppcanvas/source/wrapper/implcolor.cxx
+++ b/cppcanvas/source/wrapper/implcolor.cxx
@@ -39,14 +39,6 @@ namespace cppcanvas
{
}
- Color::IntSRGBA ImplColor::getIntSRGBA( uno::Sequence< double >& rDeviceColor ) const
- {
- OSL_ENSURE( mxDevice.is(), "ImplColor::getIntSRGBA(): Invalid graphic device" );
-
- // TODO(F1): Color space handling
- return tools::doubleSequenceToIntSRGBA( mxDevice, rDeviceColor );
- }
-
uno::Sequence< double > ImplColor::getDeviceColor( Color::IntSRGBA aSRGBA ) const
{
OSL_ENSURE( mxDevice.is(), "ImplColor::getDeviceColor(): Invalid graphic device" );
diff --git a/cppcanvas/source/wrapper/implcolor.hxx b/cppcanvas/source/wrapper/implcolor.hxx
index c61e37457110..7a317ad60ca1 100644
--- a/cppcanvas/source/wrapper/implcolor.hxx
+++ b/cppcanvas/source/wrapper/implcolor.hxx
@@ -41,7 +41,6 @@ namespace cppcanvas
css::rendering::XGraphicDevice >& rDevice );
virtual ~ImplColor();
- virtual IntSRGBA getIntSRGBA( css::uno::Sequence< double >& rDeviceColor ) const SAL_OVERRIDE;
virtual css::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const SAL_OVERRIDE;
private:
diff --git a/cppcanvas/source/wrapper/implfont.cxx b/cppcanvas/source/wrapper/implfont.cxx
index e62cfa543227..50b851063f6f 100644
--- a/cppcanvas/source/wrapper/implfont.cxx
+++ b/cppcanvas/source/wrapper/implfont.cxx
@@ -56,27 +56,6 @@ namespace cppcanvas
{
}
- OUString ImplFont::getName() const
- {
- OSL_ENSURE( mxFont.is(), "ImplFont::getName(): Invalid Font" );
-
- return mxFont->getFontRequest().FontDescription.FamilyName;
- }
-
- double ImplFont::getCellSize() const
- {
- OSL_ENSURE( mxFont.is(), "ImplFont::getCellSize(): Invalid Font" );
-
- return mxFont->getFontRequest().CellSize;
- }
-
- uno::Reference< rendering::XCanvasFont > ImplFont::getUNOFont() const
- {
- OSL_ENSURE( mxFont.is(), "ImplFont::getUNOFont(): Invalid Font" );
-
- return mxFont;
- }
-
}
}
diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx
index 89904a5a1b44..710cb41c6784 100644
--- a/cppcanvas/source/wrapper/implfont.hxx
+++ b/cppcanvas/source/wrapper/implfont.hxx
@@ -50,11 +50,6 @@ namespace cppcanvas
virtual ~ImplFont();
- virtual OUString getName() const SAL_OVERRIDE;
- virtual double getCellSize() const SAL_OVERRIDE;
-
- virtual css::uno::Reference< css::rendering::XCanvasFont > getUNOFont() const SAL_OVERRIDE;
-
private:
css::uno::Reference< css::rendering::XCanvas > mxCanvas;
css::uno::Reference< css::rendering::XCanvasFont > mxFont;
diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx
index 927377811c42..ed0c4dbd5a89 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.cxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.cxx
@@ -62,50 +62,6 @@ namespace cppcanvas
{
}
- void ImplPolyPolygon::addPolygon( const ::basegfx::B2DPolygon& rPoly )
- {
- OSL_ENSURE( mxPolyPoly.is(),
- "ImplPolyPolygon::addPolygon(): Invalid polygon" );
-
- if( !mxPolyPoly.is() )
- return;
-
- uno::Reference< rendering::XGraphicDevice > xDevice( getGraphicDevice() );
-
- OSL_ENSURE( xDevice.is(),
- "ImplPolyPolygon::addPolygon(): Invalid graphic device" );
-
- if( !xDevice.is() )
- return;
-
- mxPolyPoly->addPolyPolygon( geometry::RealPoint2D(0.0, 0.0),
- ::basegfx::unotools::xPolyPolygonFromB2DPolygon(
- xDevice,
- rPoly) );
- }
-
- void ImplPolyPolygon::addPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly )
- {
- OSL_ENSURE( mxPolyPoly.is(),
- "ImplPolyPolygon::addPolyPolygon(): Invalid polygon" );
-
- if( !mxPolyPoly.is() )
- return;
-
- uno::Reference< rendering::XGraphicDevice > xDevice( getGraphicDevice() );
-
- OSL_ENSURE( xDevice.is(),
- "ImplPolyPolygon::addPolyPolygon(): Invalid graphic device" );
-
- if( !xDevice.is() )
- return;
-
- mxPolyPoly->addPolyPolygon( geometry::RealPoint2D(0.0, 0.0),
- ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
- xDevice,
- rPoly) );
- }
-
void ImplPolyPolygon::setRGBAFillColor( Color::IntSRGBA aColor )
{
maFillColor = tools::intSRGBAToDoubleSequence( getGraphicDevice(),
@@ -120,12 +76,6 @@ namespace cppcanvas
mbStrokeColorSet = true;
}
- Color::IntSRGBA ImplPolyPolygon::getRGBAFillColor() const
- {
- return tools::doubleSequenceToIntSRGBA( getGraphicDevice(),
- maFillColor );
- }
-
Color::IntSRGBA ImplPolyPolygon::getRGBALineColor() const
{
return tools::doubleSequenceToIntSRGBA( getGraphicDevice(),
diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx
index eba8f820dbbe..606c92e915c0 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.hxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.hxx
@@ -48,12 +48,8 @@ namespace cppcanvas
virtual ~ImplPolyPolygon();
- virtual void addPolygon( const ::basegfx::B2DPolygon& rPoly ) SAL_OVERRIDE;
- virtual void addPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly ) SAL_OVERRIDE;
-
virtual void setRGBAFillColor( Color::IntSRGBA ) SAL_OVERRIDE;
virtual void setRGBALineColor( Color::IntSRGBA ) SAL_OVERRIDE;
- virtual Color::IntSRGBA getRGBAFillColor() const SAL_OVERRIDE;
virtual Color::IntSRGBA getRGBALineColor() const SAL_OVERRIDE;
virtual void setStrokeWidth( const double& rStrokeWidth ) SAL_OVERRIDE;
diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx
index 9138d1d724f4..f5f6203508c1 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.cxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.cxx
@@ -99,25 +99,6 @@ namespace cppcanvas
mpTransformArbiter ) );
}
- SpriteSharedPtr ImplSpriteCanvas::createClonedSprite( const SpriteSharedPtr& rSprite ) const
- {
- OSL_ENSURE( mxSpriteCanvas.is(), "ImplSpriteCanvas::createCustomSprite(): Invalid canvas" );
- OSL_ENSURE( rSprite.get() != NULL && rSprite->getUNOSprite().is(),
- "ImplSpriteCanvas::createCustomSprite(): Invalid sprite" );
-
- if( !mxSpriteCanvas.is() ||
- rSprite.get() == NULL ||
- !rSprite->getUNOSprite().is() )
- {
- return SpriteSharedPtr();
- }
-
- return SpriteSharedPtr(
- new ImplSprite( mxSpriteCanvas,
- mxSpriteCanvas->createClonedSprite( rSprite->getUNOSprite() ),
- mpTransformArbiter ) );
- }
-
CanvasSharedPtr ImplSpriteCanvas::clone() const
{
return SpriteCanvasSharedPtr( new ImplSpriteCanvas( *this ) );
diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx
index a18f904d028e..b2af49deee31 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.hxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.hxx
@@ -50,7 +50,6 @@ namespace cppcanvas
virtual bool updateScreen( bool bUpdateAll ) const SAL_OVERRIDE;
virtual CustomSpriteSharedPtr createCustomSprite( const ::basegfx::B2DSize& ) const SAL_OVERRIDE;
- virtual SpriteSharedPtr createClonedSprite( const SpriteSharedPtr& ) const SAL_OVERRIDE;
virtual CanvasSharedPtr clone() const SAL_OVERRIDE;