summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-08-19 22:57:16 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-08-19 22:57:16 +0000
commitc7b3a53b568a2b291688b8f087a851d5a11a7bf0 (patch)
tree4c085c844c057d46184d1c20d5c3b302e19afad1
parent1c584ed09753ca4b8cb175e15c9e0ca328573705 (diff)
INTEGRATION: CWS aw033 (1.7.20); FILE MERGED
2008/06/10 09:26:21 aw 1.7.20.3: #i39532# adapted missing tooling conversion 2008/05/14 14:43:12 aw 1.7.20.2: RESYNC: (1.7-1.9); FILE MERGED 2006/10/19 10:05:35 aw 1.7.20.1: #i39532# added some tools for UNO API/basegfx conversions
-rwxr-xr-xbasegfx/inc/basegfx/tools/canvastools.hxx32
1 files changed, 31 insertions, 1 deletions
diff --git a/basegfx/inc/basegfx/tools/canvastools.hxx b/basegfx/inc/basegfx/tools/canvastools.hxx
index ae0d3cf79f5f..746beeb60709 100755
--- a/basegfx/inc/basegfx/tools/canvastools.hxx
+++ b/basegfx/inc/basegfx/tools/canvastools.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: canvastools.hxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -38,10 +38,12 @@
namespace com { namespace sun { namespace star { namespace geometry
{
struct AffineMatrix2D;
+ struct AffineMatrix3D;
struct Matrix2D;
struct RealPoint2D;
struct RealSize2D;
struct RealRectangle2D;
+ struct RealRectangle3D;
struct IntegerPoint2D;
struct IntegerSize2D;
struct IntegerRectangle2D;
@@ -64,9 +66,11 @@ namespace com { namespace sun { namespace star { namespace awt
namespace basegfx
{
class B2DHomMatrix;
+ class B3DHomMatrix;
class B2DVector;
class B2DPoint;
class B2DRange;
+ class B3DRange;
class B2IVector;
class B2IPoint;
class B2IRange;
@@ -126,10 +130,17 @@ namespace basegfx
affineMatrixFromHomMatrix( ::com::sun::star::geometry::AffineMatrix2D& matrix,
const ::basegfx::B2DHomMatrix& transform);
+ ::com::sun::star::geometry::AffineMatrix3D& affineMatrixFromHomMatrix3D(
+ ::com::sun::star::geometry::AffineMatrix3D& matrix,
+ const ::basegfx::B3DHomMatrix& transform);
+
::basegfx::B2DHomMatrix&
homMatrixFromAffineMatrix( ::basegfx::B2DHomMatrix& transform,
const ::com::sun::star::geometry::AffineMatrix2D& matrix );
+ ::basegfx::B2DHomMatrix homMatrixFromAffineMatrix( const ::com::sun::star::geometry::AffineMatrix2D& matrix );
+ ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const ::com::sun::star::geometry::AffineMatrix3D& matrix );
+
::com::sun::star::geometry::Matrix2D&
matrixFromHomMatrix( ::com::sun::star::geometry::Matrix2D& matrix,
const ::basegfx::B2DHomMatrix& transform);
@@ -144,10 +155,12 @@ namespace basegfx
::com::sun::star::geometry::RealSize2D size2DFromB2DSize( const ::basegfx::B2DVector& );
::com::sun::star::geometry::RealPoint2D point2DFromB2DPoint( const ::basegfx::B2DPoint& );
::com::sun::star::geometry::RealRectangle2D rectangle2DFromB2DRectangle( const ::basegfx::B2DRange& );
+ ::com::sun::star::geometry::RealRectangle3D rectangle3DFromB3DRectangle( const ::basegfx::B3DRange& );
::basegfx::B2DVector b2DSizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D& );
::basegfx::B2DPoint b2DPointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& );
::basegfx::B2DRange b2DRectangleFromRealRectangle2D( const ::com::sun::star::geometry::RealRectangle2D& );
+ ::basegfx::B3DRange b3DRectangleFromRealRectangle3D( const ::com::sun::star::geometry::RealRectangle3D& );
::com::sun::star::geometry::IntegerSize2D integerSize2DFromB2ISize( const ::basegfx::B2IVector& );
::com::sun::star::geometry::IntegerPoint2D integerPoint2DFromB2IPoint( const ::basegfx::B2IPoint& );
@@ -165,6 +178,23 @@ namespace basegfx
::basegfx::B2IPoint b2IPointFromAwtPoint( const ::com::sun::star::awt::Point& );
::basegfx::B2IRange b2IRectangleFromAwtRectangle( const ::com::sun::star::awt::Rectangle& );
+ // Geometry comparisons
+ // ===================================================================
+
+ bool RealSize2DAreEqual( const ::com::sun::star::geometry::RealSize2D& rA, const ::com::sun::star::geometry::RealSize2D& rB );
+ bool RealPoint2DAreEqual( const ::com::sun::star::geometry::RealPoint2D& rA, const ::com::sun::star::geometry::RealPoint2D& rB );
+ bool RealRectangle2DAreEqual( const ::com::sun::star::geometry::RealRectangle2D& rA, const ::com::sun::star::geometry::RealRectangle2D& rB );
+ bool RealRectangle3DAreEqual( const ::com::sun::star::geometry::RealRectangle3D& rA, const ::com::sun::star::geometry::RealRectangle3D& rB );
+ bool AffineMatrix2DAreEqual( const ::com::sun::star::geometry::AffineMatrix2D& rA, const ::com::sun::star::geometry::AffineMatrix2D& rB );
+
+ bool IntegerSize2DAreEqual( const ::com::sun::star::geometry::IntegerSize2D& rA, const ::com::sun::star::geometry::IntegerSize2D& rB );
+ bool IntegerPoint2DAreEqual( const ::com::sun::star::geometry::IntegerPoint2D& rA, const ::com::sun::star::geometry::IntegerPoint2D& rB );
+ bool IntegerRectangle2DAreEqual( const ::com::sun::star::geometry::IntegerRectangle2D& rA, const ::com::sun::star::geometry::IntegerRectangle2D& rB );
+
+ bool awtSizeAreEqual( const ::com::sun::star::awt::Size& rA, const ::com::sun::star::awt::Size& rB );
+ bool awtPointAreEqual( const ::com::sun::star::awt::Point& rA, const ::com::sun::star::awt::Point& rB );
+ bool awtRectangleAreEqual( const ::com::sun::star::awt::Rectangle& rA, const ::com::sun::star::awt::Rectangle& rB );
+
/** Return smalltest integer range, which completely contains
given floating point range.