[Libreoffice-commits] .: cppcanvas/inc cppcanvas/source unusedcode.easy
cppcanvas/inc/cppcanvas/basegfxfactory.hxx |6 -
cppcanvas/inc/cppcanvas/vclfactory.hxx |1
cppcanvas/source/inc/implrenderer.hxx|5 -
cppcanvas/source/mtfrenderer/emfplus.cxx | 28 --
cppcanvas/source/mtfrenderer/implrenderer.cxx| 48 ---
cppcanvas/source/mtfrenderer/mtftools.cxx| 62 ---
cppcanvas/source/mtfrenderer/mtftools.hxx| 56 -
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 19
cppcanvas/source/mtfrenderer/transparencygroupaction.hxx | 28 --
cppcanvas/source/wrapper/basegfxfactory.cxx | 31 ---
cppcanvas/source/wrapper/implsprite.cxx |5 -
cppcanvas/source/wrapper/implsprite.hxx |4
cppcanvas/source/wrapper/implspritecanvas.cxx|9 --
cppcanvas/source/wrapper/implspritecanvas.hxx|6 -
cppcanvas/source/wrapper/vclfactory.cxx |4
unusedcode.easy | 12 --
16 files changed, 324 deletions(-)
New commits:
commit eed2695cd5d63bdaf8b02c5cbf3a7e4017e18173
Author: Szabolcs Dezsi
Date: Fri Feb 17 14:06:34 2012 +0100
Removed unused code from cppcanvas
diff --git a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
index 5cb87aa..0aecf80 100644
--- a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
+++ b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
@@ -75,7 +75,6 @@ namespace cppcanvas
coordinate space as the source polygon
*/
PolyPolygonSharedPtrcreatePolyPolygon( const CanvasSharedPtr&,
const ::basegfx::B2DPolygon& rPoly ) const;
-PolyPolygonSharedPtrcreatePolyPolygon( const CanvasSharedPtr&,
const ::basegfx::B2DPolyPolygon& rPoly ) const;
/** Create an uninitialized bitmap with the given size
*/
@@ -85,16 +84,11 @@ namespace cppcanvas
*/
BitmapSharedPtr createAlphaBitmap( const CanvasSharedPtr&,
const ::basegfx::B2ISize& rSize ) const;
-/** Create a text portion with the given content string
- */
-TextSharedPtr createText( const CanvasSharedPtr&, const
::rtl::OUString& ) const;
-
private:
friend struct InitInstance2;
// singleton
BaseGfxFactory();
-~BaseGfxFactory();
// default: disabled copy/assignment
BaseGfxFactory(const BaseGfxFactory&);
diff --git a/cppcanvas/inc/cppcanvas/vclfactory.hxx
b/cppcanvas/inc/cppcanvas/vclfactory.hxx
index ab84534..14f4c51 100644
--- a/cppcanvas/inc/cppcanvas/vclfactory.hxx
+++ b/cppcanvas/inc/cppcanvas/vclfactory.hxx
@@ -102,7 +102,6 @@ namespace cppcanvas
// singleton
VCLFactory();
-~VCLFactory();
// default: disabled copy/assignment
VCLFactory(const VCLFactory&);
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index 9c270e8..c93c83c 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -184,9 +184,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();
@@ -220,10 +217,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 91c9560..8ccb75b 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
[Libreoffice-commits] .: cppcanvas/inc cppcanvas/source
cppcanvas/inc/cppcanvas/basegfxfactory.hxx|6 +++
cppcanvas/source/inc/implrenderer.hxx |5 ++
cppcanvas/source/mtfrenderer/emfplus.cxx | 28 ++
cppcanvas/source/mtfrenderer/implrenderer.cxx | 48
cppcanvas/source/wrapper/basegfxfactory.cxx | 50 ++
5 files changed, 137 insertions(+)
New commits:
commit 3b8bf60a040d51d2d228127693f0b9c3292b151d
Author: August Sodora
Date: Wed Dec 21 06:46:40 2011 -0500
Revert "callcatcher: Remove unused code"
This reverts commit 070eff8cf1ad7763b8b730336f11032893b77049.
diff --git a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
index dbb8d12..5cb87aa 100644
--- a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
+++ b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
@@ -75,6 +75,7 @@ namespace cppcanvas
coordinate space as the source polygon
*/
PolyPolygonSharedPtrcreatePolyPolygon( const CanvasSharedPtr&,
const ::basegfx::B2DPolygon& rPoly ) const;
+PolyPolygonSharedPtrcreatePolyPolygon( const CanvasSharedPtr&,
const ::basegfx::B2DPolyPolygon& rPoly ) const;
/** Create an uninitialized bitmap with the given size
*/
@@ -84,6 +85,10 @@ namespace cppcanvas
*/
BitmapSharedPtr createAlphaBitmap( const CanvasSharedPtr&,
const ::basegfx::B2ISize& rSize ) const;
+/** Create a text portion with the given content string
+ */
+TextSharedPtr createText( const CanvasSharedPtr&, const
::rtl::OUString& ) const;
+
private:
friend struct InitInstance2;
@@ -95,6 +100,7 @@ namespace cppcanvas
BaseGfxFactory(const BaseGfxFactory&);
BaseGfxFactory& operator=( const BaseGfxFactory& );
};
+
}
#endif /* _CPPCANVAS_BASEGFXFACTORY_HXX */
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index edf69be..3c1ec6d 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -174,6 +174,9 @@ 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();
@@ -207,8 +210,10 @@ 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 8ccb75b..91c9560 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -825,6 +825,11 @@ 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;
@@ -858,6 +863,29 @@ 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/cp
[Libreoffice-commits] .: cppcanvas/inc cppcanvas/source
cppcanvas/inc/cppcanvas/basegfxfactory.hxx|6 ---
cppcanvas/source/inc/implrenderer.hxx |5 --
cppcanvas/source/mtfrenderer/emfplus.cxx | 28 --
cppcanvas/source/mtfrenderer/implrenderer.cxx | 48
cppcanvas/source/wrapper/basegfxfactory.cxx | 50 --
5 files changed, 137 deletions(-)
New commits:
commit 070eff8cf1ad7763b8b730336f11032893b77049
Author: August Sodora
Date: Wed Dec 21 00:22:06 2011 -0500
callcatcher: Remove unused code
diff --git a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
index 5cb87aa..dbb8d12 100644
--- a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
+++ b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
@@ -75,7 +75,6 @@ namespace cppcanvas
coordinate space as the source polygon
*/
PolyPolygonSharedPtrcreatePolyPolygon( const CanvasSharedPtr&,
const ::basegfx::B2DPolygon& rPoly ) const;
-PolyPolygonSharedPtrcreatePolyPolygon( const CanvasSharedPtr&,
const ::basegfx::B2DPolyPolygon& rPoly ) const;
/** Create an uninitialized bitmap with the given size
*/
@@ -85,10 +84,6 @@ namespace cppcanvas
*/
BitmapSharedPtr createAlphaBitmap( const CanvasSharedPtr&,
const ::basegfx::B2ISize& rSize ) const;
-/** Create a text portion with the given content string
- */
-TextSharedPtr createText( const CanvasSharedPtr&, const
::rtl::OUString& ) const;
-
private:
friend struct InitInstance2;
@@ -100,7 +95,6 @@ namespace cppcanvas
BaseGfxFactory(const BaseGfxFactory&);
BaseGfxFactory& operator=( const BaseGfxFactory& );
};
-
}
#endif /* _CPPCANVAS_BASEGFXFACTORY_HXX */
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index 3c1ec6d..edf69be 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 91c9560..8ccb75b 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 65b9d21..8dde2f0 100644
--- a/c
[Libreoffice-commits] .: cppcanvas/inc cppcanvas/source
cppcanvas/inc/cppcanvas/vclfactory.hxx | 35
cppcanvas/source/wrapper/vclfactory.cxx | 237
2 files changed, 272 deletions(-)
New commits:
commit d498a3c2a12e03810a81937c1252dc0b16747936
Author: August Sodora
Date: Mon Dec 19 23:19:45 2011 -0500
callcatcher: Remove unused code
diff --git a/cppcanvas/inc/cppcanvas/vclfactory.hxx
b/cppcanvas/inc/cppcanvas/vclfactory.hxx
index 14d9e6c..ab84534 100644
--- a/cppcanvas/inc/cppcanvas/vclfactory.hxx
+++ b/cppcanvas/inc/cppcanvas/vclfactory.hxx
@@ -77,44 +77,17 @@ namespace cppcanvas
public:
static VCLFactory& getInstance();
-BitmapCanvasSharedPtr createCanvas( const ::Window& rVCLWindow );
BitmapCanvasSharedPtr createCanvas( const
::com::sun::star::uno::Reference<
::com::sun::star::rendering::XBitmapCanvas >& xCanvas );
SpriteCanvasSharedPtr createSpriteCanvas( const ::Window& rVCLWindow
) const;
SpriteCanvasSharedPtr createSpriteCanvas( const
::com::sun::star::uno::Reference<
::com::sun::star::rendering::XSpriteCanvas >& xCanvas ) const;
-SpriteCanvasSharedPtr createFullscreenSpriteCanvas( const ::Window&
rVCLWindow, const Size& rFullscreenSize ) const;
-
-/** Create a polygon from a tools::Polygon
-
-The created polygon initially has the same size in user
-coordinate space as the source polygon
- */
-PolyPolygonSharedPtrcreatePolyPolygon( const CanvasSharedPtr&,
const ::Polygon& rPoly ) const;
-PolyPolygonSharedPtrcreatePolyPolygon( const CanvasSharedPtr&,
const ::PolyPolygon& rPoly ) const;
-
-/** Create an uninitialized bitmap with the given size
- */
-BitmapSharedPtr createBitmap( const CanvasSharedPtr&, const
::Size& rSize ) const;
-
-/** Create an uninitialized alpha bitmap with the given size
- */
-BitmapSharedPtr createAlphaBitmap( const CanvasSharedPtr&,
const ::Size& rSize ) const;
/** Create a bitmap from a VCL Bitmap
*/
-BitmapSharedPtr createBitmap( const CanvasSharedPtr&, const
::Bitmap& rBitmap ) const;
BitmapSharedPtr createBitmap( const CanvasSharedPtr&, const
::BitmapEx& rBmpEx ) const;
-/** Create a renderer object from a Graphic
-
-The created renderer initially draws the graphic
-one-by-one units large, in user coordinate space
- */
-RendererSharedPtr createRenderer( const CanvasSharedPtr&
rCanvas,
-const ::Graphic&
rGraphic,
-const Renderer::Parameters&
rParms ) const;
/** Create a renderer object from a Metafile
The created renderer initially draws the metafile
@@ -124,14 +97,6 @@ namespace cppcanvas
const ::GDIMetaFile&
rMtf,
const Renderer::Parameters&
rParms ) const;
-/** Create an animated sprite from a VCL animation
- */
-SpriteSharedPtr createAnimatedSprite( const
SpriteCanvasSharedPtr&, const ::Animation& rAnim ) const;
-
-/** Create a text portion with the given content string
- */
-TextSharedPtr createText( const CanvasSharedPtr&, const
::rtl::OUString& ) const;
-
private:
friend struct InitInstance;
diff --git a/cppcanvas/source/wrapper/vclfactory.cxx
b/cppcanvas/source/wrapper/vclfactory.cxx
index a66ab33..0513969 100644
--- a/cppcanvas/source/wrapper/vclfactory.cxx
+++ b/cppcanvas/source/wrapper/vclfactory.cxx
@@ -45,7 +45,6 @@
#include
#include
-
using namespace ::com::sun::star;
namespace cppcanvas
@@ -74,15 +73,6 @@ namespace cppcanvas
{
}
-BitmapCanvasSharedPtr VCLFactory::createCanvas( const ::Window& rVCLWindow
)
-{
-return BitmapCanvasSharedPtr(
-new internal::ImplBitmapCanvas(
-uno::Reference< rendering::XBitmapCanvas >(
-rVCLWindow.GetCanvas(),
-uno::UNO_QUERY) ) );
-}
-
BitmapCanvasSharedPtr VCLFactory::createCanvas( const uno::Reference<
rendering::XBitmapCanvas >& xCanvas )
{
return BitmapCanvasSharedPtr(
@@ -104,118 +94,6 @@ namespace cppcanvas
new internal::ImplSpriteCanvas( xCanvas ) );
}
-SpriteCanvasSharedPtr VCLFactory::createFullscreenSpriteCanvas( const
::Window& rVCLWindow,
-const
Size& rFullscreenSize ) const
-{
-return SpriteCanvasSharedPtr(
-new internal::ImplSpriteCanvas(
-uno::Reference< rendering::XSprit
