diff options
author | August Sodora <augsod@gmail.com> | 2011-12-21 00:22:06 -0500 |
---|---|---|
committer | August Sodora <augsod@gmail.com> | 2011-12-21 06:25:31 -0500 |
commit | 070eff8cf1ad7763b8b730336f11032893b77049 (patch) | |
tree | b0dc8c0859d0efc6a69050f8ca5ec9a858d6069d /cppcanvas/source | |
parent | 6708977331c933b3483b9fe5f66d981b51fd8d49 (diff) |
callcatcher: Remove unused code
Diffstat (limited to 'cppcanvas/source')
-rw-r--r-- | cppcanvas/source/inc/implrenderer.hxx | 5 | ||||
-rw-r--r-- | cppcanvas/source/mtfrenderer/emfplus.cxx | 28 | ||||
-rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 48 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/basegfxfactory.cxx | 50 |
4 files changed, 0 insertions, 131 deletions
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index 3c1ec6de127f..edf69be14a86 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -174,9 +174,6 @@ static float GetSwapFloat( SvStream& rSt ) ImplRenderer( const CanvasSharedPtr& rCanvas, const GDIMetaFile& rMtf, const Parameters& rParms ); - ImplRenderer( const CanvasSharedPtr& rCanvas, - const BitmapEx& rBmpEx, - const Parameters& rParms ); virtual ~ImplRenderer(); @@ -210,10 +207,8 @@ static float GetSwapFloat( SvStream& rSt ) void ReadRectangle (SvStream& s, float& x, float& y, float &width, float& height, sal_uInt32 flags = 0); void ReadPoint (SvStream& s, float& x, float& y, sal_uInt32 flags = 0); void MapToDevice (double &x, double &y); - ::basegfx::B2DPoint Map (::basegfx::B2DPoint& p); ::basegfx::B2DPoint Map (double ix, double iy); ::basegfx::B2DSize MapSize (double iwidth, double iheight); - ::basegfx::B2DRange MapRectangle (double ix, double iy, double iwidth, double iheight); private: // default: disabled copy/assignment diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 91c95607a055..8ccb75bfdad1 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -825,11 +825,6 @@ namespace cppcanvas y = 100*nMmY*y/nPixY; } - ::basegfx::B2DPoint ImplRenderer::Map (::basegfx::B2DPoint& p) - { - return Map (p.getX (), p.getY ()); - } - ::basegfx::B2DPoint ImplRenderer::Map (double ix, double iy) { double x, y; @@ -863,29 +858,6 @@ namespace cppcanvas return ::basegfx::B2DSize (w, h); } - ::basegfx::B2DRange ImplRenderer::MapRectangle (double ix, double iy, double iwidth, double iheight) - { - double x, y, w, h; - - x = ix*aWorldTransform.eM11 + iy*aWorldTransform.eM21 + aWorldTransform.eDx; - y = ix*aWorldTransform.eM12 + iy*aWorldTransform.eM22 + aWorldTransform.eDy; - w = iwidth*aWorldTransform.eM11 + iheight*aWorldTransform.eM21; - h = iwidth*aWorldTransform.eM12 + iheight*aWorldTransform.eM22; - - MapToDevice (x, y); - MapToDevice (w, h); - - x -= nFrameLeft; - y -= nFrameTop; - - x *= aBaseTransform.eM11; - y *= aBaseTransform.eM22; - w *= aBaseTransform.eM11; - h *= aBaseTransform.eM22; - - return ::basegfx::B2DRange (x, y, x + w, y + h); - } - #define COLOR(x) \ ::vcl::unotools::colorToDoubleSequence( ::Color (0xff - (x >> 24), \ (x >> 16) & 0xff, \ diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 65b9d21a37ee..8dde2f087c8d 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -3074,54 +3074,6 @@ namespace cppcanvas ); } - ImplRenderer::ImplRenderer( const CanvasSharedPtr& rCanvas, - const BitmapEx& rBmpEx, - const Parameters& rParams ) : - CanvasGraphicHelper( rCanvas ), - maActions() - { - // TODO(F3): property modification parameters are - // currently ignored for Bitmaps - (void)rParams; - - RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::ImplRenderer::ImplRenderer(bitmap)" ); - - OSL_ENSURE( rCanvas.get() != NULL && rCanvas->getUNOCanvas().is(), - "ImplRenderer::ImplRenderer(): Invalid canvas" ); - OSL_ENSURE( rCanvas->getUNOCanvas()->getDevice().is(), - "ImplRenderer::ImplRenderer(): Invalid graphic device" ); - - // make sure canvas and graphic device are valid; action - // creation don't check that every time - if( rCanvas.get() == NULL || - !rCanvas->getUNOCanvas().is() || - !rCanvas->getUNOCanvas()->getDevice().is() ) - { - // leave actions empty - return; - } - - OutDevState aState; - - const Size aBmpSize( rBmpEx.GetSizePixel() ); - - // Setup local state, such that the bitmap renders itself - // into a one-by-one square for identity view and render - // transformations - aState.transform.scale( 1.0 / aBmpSize.Width(), - 1.0 / aBmpSize.Height() ); - - // create a single action for the provided BitmapEx - maActions.push_back( - MtfAction( - BitmapActionFactory::createBitmapAction( - rBmpEx, - ::basegfx::B2DPoint(), - rCanvas, - aState), - 0 ) ); - } - ImplRenderer::~ImplRenderer() { } diff --git a/cppcanvas/source/wrapper/basegfxfactory.cxx b/cppcanvas/source/wrapper/basegfxfactory.cxx index bac25aa1d9d4..d8dedb37eab4 100644 --- a/cppcanvas/source/wrapper/basegfxfactory.cxx +++ b/cppcanvas/source/wrapper/basegfxfactory.cxx @@ -43,7 +43,6 @@ #include "implbitmap.hxx" #include "impltext.hxx" - using namespace ::com::sun::star; namespace cppcanvas @@ -72,48 +71,6 @@ namespace cppcanvas { } - PolyPolygonSharedPtr BaseGfxFactory::createPolyPolygon( const CanvasSharedPtr& rCanvas, - const ::basegfx::B2DPolygon& rPoly ) const - { - OSL_ENSURE( rCanvas.get() != NULL && - rCanvas->getUNOCanvas().is(), - "BaseGfxFactory::createPolyPolygon(): Invalid canvas" ); - - if( rCanvas.get() == NULL ) - return PolyPolygonSharedPtr(); - - uno::Reference< rendering::XCanvas > xCanvas( rCanvas->getUNOCanvas() ); - if( !xCanvas.is() ) - return PolyPolygonSharedPtr(); - - return PolyPolygonSharedPtr( - new internal::ImplPolyPolygon( rCanvas, - ::basegfx::unotools::xPolyPolygonFromB2DPolygon( - xCanvas->getDevice(), - rPoly) ) ); - } - - PolyPolygonSharedPtr BaseGfxFactory::createPolyPolygon( const CanvasSharedPtr& rCanvas, - const ::basegfx::B2DPolyPolygon& rPolyPoly ) const - { - OSL_ENSURE( rCanvas.get() != NULL && - rCanvas->getUNOCanvas().is(), - "BaseGfxFactory::createPolyPolygon(): Invalid canvas" ); - - if( rCanvas.get() == NULL ) - return PolyPolygonSharedPtr(); - - uno::Reference< rendering::XCanvas > xCanvas( rCanvas->getUNOCanvas() ); - if( !xCanvas.is() ) - return PolyPolygonSharedPtr(); - - return PolyPolygonSharedPtr( - new internal::ImplPolyPolygon( rCanvas, - ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( - xCanvas->getDevice(), - rPolyPoly) ) ); - } - BitmapSharedPtr BaseGfxFactory::createBitmap( const CanvasSharedPtr& rCanvas, const ::basegfx::B2ISize& rSize ) const { @@ -153,13 +110,6 @@ namespace cppcanvas xCanvas->getDevice()->createCompatibleAlphaBitmap( ::basegfx::unotools::integerSize2DFromB2ISize(rSize) ) ) ); } - - TextSharedPtr BaseGfxFactory::createText( const CanvasSharedPtr& rCanvas, const ::rtl::OUString& rText ) const - { - return TextSharedPtr( new internal::ImplText( rCanvas, - rText ) ); - } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |