Kaydet (Commit) f4688de6 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

com::sun::star->css in include/basegfx

Change-Id: I19a76fa7b67b0c6628476c53e6aad797b4b28f35
Reviewed-on: https://gerrit.libreoffice.org/19456Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 40b26d19
...@@ -134,7 +134,7 @@ namespace basegfx ...@@ -134,7 +134,7 @@ namespace basegfx
const B2DPolygon& rCandidate, const B2DPolygon& rCandidate,
double fHalfLineWidth, double fHalfLineWidth,
B2DLineJoin eJoin = B2DLineJoin::Round, B2DLineJoin eJoin = B2DLineJoin::Round,
com::sun::star::drawing::LineCap eCap = com::sun::star::drawing::LineCap_BUTT, css::drawing::LineCap eCap = css::drawing::LineCap_BUTT,
double fMaxAllowedAngle = (12.5 * F_PI180), double fMaxAllowedAngle = (12.5 * F_PI180),
double fMaxPartOfEdge = 0.4, double fMaxPartOfEdge = 0.4,
double fMiterMinimumAngle = (15.0 * F_PI180)); double fMiterMinimumAngle = (15.0 * F_PI180));
......
...@@ -455,25 +455,25 @@ namespace basegfx ...@@ -455,25 +455,25 @@ namespace basegfx
/// polygon path data. Take into account all stuff like closed state, zero-length edges and others. /// polygon path data. Take into account all stuff like closed state, zero-length edges and others.
BASEGFX_DLLPUBLIC B2DVector getTangentLeavingPoint(const B2DPolygon& rCandidate, sal_uInt32 nIndex); BASEGFX_DLLPUBLIC B2DVector getTangentLeavingPoint(const B2DPolygon& rCandidate, sal_uInt32 nIndex);
/// converters for com::sun::star::drawing::PointSequence /// converters for css::drawing::PointSequence
BASEGFX_DLLPUBLIC B2DPolygon UnoPointSequenceToB2DPolygon( BASEGFX_DLLPUBLIC B2DPolygon UnoPointSequenceToB2DPolygon(
const com::sun::star::drawing::PointSequence& rPointSequenceSource, const css::drawing::PointSequence& rPointSequenceSource,
bool bCheckClosed = true); bool bCheckClosed = true);
BASEGFX_DLLPUBLIC void B2DPolygonToUnoPointSequence( BASEGFX_DLLPUBLIC void B2DPolygonToUnoPointSequence(
const B2DPolygon& rPolygon, const B2DPolygon& rPolygon,
com::sun::star::drawing::PointSequence& rPointSequenceRetval); css::drawing::PointSequence& rPointSequenceRetval);
/* converters for com::sun::star::drawing::PointSequence and /* converters for css::drawing::PointSequence and
com::sun::star::drawing::FlagSequence to B2DPolygon (curved polygons) css::drawing::FlagSequence to B2DPolygon (curved polygons)
*/ */
B2DPolygon UnoPolygonBezierCoordsToB2DPolygon( B2DPolygon UnoPolygonBezierCoordsToB2DPolygon(
const com::sun::star::drawing::PointSequence& rPointSequenceSource, const css::drawing::PointSequence& rPointSequenceSource,
const com::sun::star::drawing::FlagSequence& rFlagSequenceSource, const css::drawing::FlagSequence& rFlagSequenceSource,
bool bCheckClosed = true); bool bCheckClosed = true);
void B2DPolygonToUnoPolygonBezierCoords( void B2DPolygonToUnoPolygonBezierCoords(
const B2DPolygon& rPolyPolygon, const B2DPolygon& rPolyPolygon,
com::sun::star::drawing::PointSequence& rPointSequenceRetval, css::drawing::PointSequence& rPointSequenceRetval,
com::sun::star::drawing::FlagSequence& rFlagSequenceRetval); css::drawing::FlagSequence& rFlagSequenceRetval);
/** Read poly-polygon from SVG. /** Read poly-polygon from SVG.
......
...@@ -292,21 +292,21 @@ namespace basegfx ...@@ -292,21 +292,21 @@ namespace basegfx
*/ */
BASEGFX_DLLPUBLIC bool containsOnlyHorizontalAndVerticalEdges(const B2DPolyPolygon& rCandidate); BASEGFX_DLLPUBLIC bool containsOnlyHorizontalAndVerticalEdges(const B2DPolyPolygon& rCandidate);
/// converters for com::sun::star::drawing::PointSequence /// converters for css::drawing::PointSequence
BASEGFX_DLLPUBLIC B2DPolyPolygon UnoPointSequenceSequenceToB2DPolyPolygon( BASEGFX_DLLPUBLIC B2DPolyPolygon UnoPointSequenceSequenceToB2DPolyPolygon(
const com::sun::star::drawing::PointSequenceSequence& rPointSequenceSequenceSource, const css::drawing::PointSequenceSequence& rPointSequenceSequenceSource,
bool bCheckClosed = true); bool bCheckClosed = true);
BASEGFX_DLLPUBLIC void B2DPolyPolygonToUnoPointSequenceSequence( BASEGFX_DLLPUBLIC void B2DPolyPolygonToUnoPointSequenceSequence(
const B2DPolyPolygon& rPolyPolygon, const B2DPolyPolygon& rPolyPolygon,
com::sun::star::drawing::PointSequenceSequence& rPointSequenceSequenceRetval); css::drawing::PointSequenceSequence& rPointSequenceSequenceRetval);
/// converters for com::sun::star::drawing::PolyPolygonBezierCoords (curved polygons) /// converters for css::drawing::PolyPolygonBezierCoords (curved polygons)
BASEGFX_DLLPUBLIC B2DPolyPolygon UnoPolyPolygonBezierCoordsToB2DPolyPolygon( BASEGFX_DLLPUBLIC B2DPolyPolygon UnoPolyPolygonBezierCoordsToB2DPolyPolygon(
const com::sun::star::drawing::PolyPolygonBezierCoords& rPolyPolygonBezierCoordsSource, const css::drawing::PolyPolygonBezierCoords& rPolyPolygonBezierCoordsSource,
bool bCheckClosed = true); bool bCheckClosed = true);
BASEGFX_DLLPUBLIC void B2DPolyPolygonToUnoPolyPolygonBezierCoords( BASEGFX_DLLPUBLIC void B2DPolyPolygonToUnoPolyPolygonBezierCoords(
const B2DPolyPolygon& rPolyPolygon, const B2DPolyPolygon& rPolyPolygon,
com::sun::star::drawing::PolyPolygonBezierCoords& rPolyPolygonBezierCoordsRetval); css::drawing::PolyPolygonBezierCoords& rPolyPolygonBezierCoordsRetval);
} // end of namespace tools } // end of namespace tools
} // end of namespace basegfx } // end of namespace basegfx
......
...@@ -126,13 +126,13 @@ namespace basegfx ...@@ -126,13 +126,13 @@ namespace basegfx
// in bWithBorder flag. It is assumed that the orientations of the given polygon are correct. // in bWithBorder flag. It is assumed that the orientations of the given polygon are correct.
BASEGFX_DLLPUBLIC bool isInside(const B3DPolyPolygon& rCandidate, const B3DPoint& rPoint, bool bWithBorder = false); BASEGFX_DLLPUBLIC bool isInside(const B3DPolyPolygon& rCandidate, const B3DPoint& rPoint, bool bWithBorder = false);
/// converters for com::sun::star::drawing::PolyPolygonShape3D /// converters for css::drawing::PolyPolygonShape3D
BASEGFX_DLLPUBLIC B3DPolyPolygon UnoPolyPolygonShape3DToB3DPolyPolygon( BASEGFX_DLLPUBLIC B3DPolyPolygon UnoPolyPolygonShape3DToB3DPolyPolygon(
const com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygonShape3DSource, const css::drawing::PolyPolygonShape3D& rPolyPolygonShape3DSource,
bool bCheckClosed = true); bool bCheckClosed = true);
BASEGFX_DLLPUBLIC void B3DPolyPolygonToUnoPolyPolygonShape3D( BASEGFX_DLLPUBLIC void B3DPolyPolygonToUnoPolyPolygonShape3D(
const B3DPolyPolygon& rPolyPolygonSource, const B3DPolyPolygon& rPolyPolygonSource,
com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygonShape3DRetval); css::drawing::PolyPolygonShape3D& rPolyPolygonShape3DRetval);
} // end of namespace tools } // end of namespace tools
} // end of namespace basegfx } // end of namespace basegfx
......
...@@ -73,86 +73,77 @@ namespace basegfx ...@@ -73,86 +73,77 @@ namespace basegfx
// Polygon conversions // Polygon conversions
BASEGFX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > BASEGFX_DLLPUBLIC css::uno::Reference< css::rendering::XPolyPolygon2D >
xPolyPolygonFromB2DPolygon( const ::com::sun::star::uno::Reference< xPolyPolygonFromB2DPolygon( const css::uno::Reference< css::rendering::XGraphicDevice >& xGraphicDevice,
::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice,
const ::basegfx::B2DPolygon& rPoly ); const ::basegfx::B2DPolygon& rPoly );
BASEGFX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > BASEGFX_DLLPUBLIC css::uno::Reference< css::rendering::XPolyPolygon2D >
xPolyPolygonFromB2DPolyPolygon( const ::com::sun::star::uno::Reference< xPolyPolygonFromB2DPolyPolygon( const css::uno::Reference< css::rendering::XGraphicDevice >& xGraphicDevice,
::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice,
const ::basegfx::B2DPolyPolygon& rPolyPoly ); const ::basegfx::B2DPolyPolygon& rPolyPoly );
BASEGFX_DLLPUBLIC ::com::sun::star::uno::Sequence< BASEGFX_DLLPUBLIC css::uno::Sequence<
::com::sun::star::uno::Sequence< css::uno::Sequence< css::geometry::RealBezierSegment2D > >
::com::sun::star::geometry::RealBezierSegment2D > >
bezierSequenceSequenceFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly ); bezierSequenceSequenceFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly );
BASEGFX_DLLPUBLIC ::com::sun::star::uno::Sequence< BASEGFX_DLLPUBLIC css::uno::Sequence<
::com::sun::star::uno::Sequence< css::uno::Sequence< css::geometry::RealPoint2D > >
::com::sun::star::geometry::RealPoint2D > >
pointSequenceSequenceFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly ); pointSequenceSequenceFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly );
BASEGFX_DLLPUBLIC ::basegfx::B2DPolygon polygonFromPoint2DSequence( BASEGFX_DLLPUBLIC ::basegfx::B2DPolygon polygonFromPoint2DSequence(
const ::com::sun::star::uno::Sequence< const css::uno::Sequence< css::geometry::RealPoint2D >& rPoints );
::com::sun::star::geometry::RealPoint2D >& rPoints );
BASEGFX_DLLPUBLIC ::basegfx::B2DPolyPolygon polyPolygonFromPoint2DSequenceSequence( BASEGFX_DLLPUBLIC ::basegfx::B2DPolyPolygon polyPolygonFromPoint2DSequenceSequence(
const ::com::sun::star::uno::Sequence< const css::uno::Sequence< css::uno::Sequence< css::geometry::RealPoint2D > >& rPoints );
::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > >& rPoints );
BASEGFX_DLLPUBLIC ::basegfx::B2DPolygon polygonFromBezier2DSequence( BASEGFX_DLLPUBLIC ::basegfx::B2DPolygon polygonFromBezier2DSequence(
const ::com::sun::star::uno::Sequence< const css::uno::Sequence< css::geometry::RealBezierSegment2D >& rPoints );
::com::sun::star::geometry::RealBezierSegment2D >& rPoints );
BASEGFX_DLLPUBLIC ::basegfx::B2DPolyPolygon polyPolygonFromBezier2DSequenceSequence( BASEGFX_DLLPUBLIC ::basegfx::B2DPolyPolygon polyPolygonFromBezier2DSequenceSequence(
const ::com::sun::star::uno::Sequence< const css::uno::Sequence< css::uno::Sequence< css::geometry::RealBezierSegment2D > >& rPoints );
::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > >& rPoints );
BASEGFX_DLLPUBLIC ::basegfx::B2DPolyPolygon b2DPolyPolygonFromXPolyPolygon2D( BASEGFX_DLLPUBLIC ::basegfx::B2DPolyPolygon b2DPolyPolygonFromXPolyPolygon2D(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::rendering::XPolyPolygon2D >& rPoly );
::com::sun::star::rendering::XPolyPolygon2D >& rPoly );
// Matrix conversions // Matrix conversions
BASEGFX_DLLPUBLIC ::com::sun::star::geometry::AffineMatrix2D& BASEGFX_DLLPUBLIC css::geometry::AffineMatrix2D&
affineMatrixFromHomMatrix( ::com::sun::star::geometry::AffineMatrix2D& matrix, affineMatrixFromHomMatrix( css::geometry::AffineMatrix2D& matrix,
const ::basegfx::B2DHomMatrix& transform); const ::basegfx::B2DHomMatrix& transform);
BASEGFX_DLLPUBLIC ::com::sun::star::geometry::AffineMatrix3D& affineMatrixFromHomMatrix3D( BASEGFX_DLLPUBLIC css::geometry::AffineMatrix3D& affineMatrixFromHomMatrix3D(
::com::sun::star::geometry::AffineMatrix3D& matrix, css::geometry::AffineMatrix3D& matrix,
const ::basegfx::B3DHomMatrix& transform); const ::basegfx::B3DHomMatrix& transform);
BASEGFX_DLLPUBLIC ::basegfx::B2DHomMatrix& BASEGFX_DLLPUBLIC ::basegfx::B2DHomMatrix&
homMatrixFromAffineMatrix( ::basegfx::B2DHomMatrix& transform, homMatrixFromAffineMatrix( ::basegfx::B2DHomMatrix& transform,
const ::com::sun::star::geometry::AffineMatrix2D& matrix ); const css::geometry::AffineMatrix2D& matrix );
BASEGFX_DLLPUBLIC ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const ::com::sun::star::geometry::AffineMatrix3D& matrix ); BASEGFX_DLLPUBLIC ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const css::geometry::AffineMatrix3D& matrix );
BASEGFX_DLLPUBLIC ::com::sun::star::geometry::Matrix2D& BASEGFX_DLLPUBLIC css::geometry::Matrix2D&
matrixFromHomMatrix( ::com::sun::star::geometry::Matrix2D& matrix, matrixFromHomMatrix( css::geometry::Matrix2D& matrix,
const ::basegfx::B2DHomMatrix& transform); const ::basegfx::B2DHomMatrix& transform);
// Geometry conversions // Geometry conversions
BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealSize2D size2DFromB2DSize( const ::basegfx::B2DVector& ); BASEGFX_DLLPUBLIC css::geometry::RealSize2D size2DFromB2DSize( const ::basegfx::B2DVector& );
BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealPoint2D point2DFromB2DPoint( const ::basegfx::B2DPoint& ); BASEGFX_DLLPUBLIC css::geometry::RealPoint2D point2DFromB2DPoint( const ::basegfx::B2DPoint& );
BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealRectangle2D rectangle2DFromB2DRectangle( const ::basegfx::B2DRange& ); BASEGFX_DLLPUBLIC css::geometry::RealRectangle2D rectangle2DFromB2DRectangle( const ::basegfx::B2DRange& );
BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealRectangle3D rectangle3DFromB3DRectangle( const ::basegfx::B3DRange& ); BASEGFX_DLLPUBLIC css::geometry::RealRectangle3D rectangle3DFromB3DRectangle( const ::basegfx::B3DRange& );
BASEGFX_DLLPUBLIC ::basegfx::B2DPoint b2DPointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& ); BASEGFX_DLLPUBLIC ::basegfx::B2DPoint b2DPointFromRealPoint2D( const css::geometry::RealPoint2D& );
BASEGFX_DLLPUBLIC ::basegfx::B2DRange b2DRectangleFromRealRectangle2D( const ::com::sun::star::geometry::RealRectangle2D& ); BASEGFX_DLLPUBLIC ::basegfx::B2DRange b2DRectangleFromRealRectangle2D( const css::geometry::RealRectangle2D& );
BASEGFX_DLLPUBLIC ::basegfx::B3DRange b3DRectangleFromRealRectangle3D( const ::com::sun::star::geometry::RealRectangle3D& ); BASEGFX_DLLPUBLIC ::basegfx::B3DRange b3DRectangleFromRealRectangle3D( const css::geometry::RealRectangle3D& );
BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerSize2D integerSize2DFromB2ISize( const ::basegfx::B2IVector& ); BASEGFX_DLLPUBLIC css::geometry::IntegerSize2D integerSize2DFromB2ISize( const ::basegfx::B2IVector& );
BASEGFX_DLLPUBLIC ::basegfx::B2IVector b2ISizeFromIntegerSize2D( const ::com::sun::star::geometry::IntegerSize2D& ); BASEGFX_DLLPUBLIC ::basegfx::B2IVector b2ISizeFromIntegerSize2D( const css::geometry::IntegerSize2D& );
BASEGFX_DLLPUBLIC ::basegfx::B2IRange b2IRectangleFromIntegerRectangle2D( const ::com::sun::star::geometry::IntegerRectangle2D& ); BASEGFX_DLLPUBLIC ::basegfx::B2IRange b2IRectangleFromIntegerRectangle2D( const css::geometry::IntegerRectangle2D& );
BASEGFX_DLLPUBLIC ::basegfx::B2IRange b2IRectangleFromAwtRectangle( const ::com::sun::star::awt::Rectangle& ); BASEGFX_DLLPUBLIC ::basegfx::B2IRange b2IRectangleFromAwtRectangle( const css::awt::Rectangle& );
// Geometry comparisons // Geometry comparisons
......
...@@ -68,7 +68,7 @@ namespace basegfx ...@@ -68,7 +68,7 @@ namespace basegfx
need key stop lerping in the first place). All need key stop lerping in the first place). All
elements must be of monotonically increasing value. elements must be of monotonically increasing value.
*/ */
explicit KeyStopLerp( const ::com::sun::star::uno::Sequence<double>& rKeyStops ); explicit KeyStopLerp( const css::uno::Sequence<double>& rKeyStops );
/** Find two nearest bucket index & interpolate /** Find two nearest bucket index & interpolate
......
...@@ -34,9 +34,9 @@ namespace basegfx ...@@ -34,9 +34,9 @@ namespace basegfx
namespace unotools namespace unotools
{ {
typedef ::cppu::WeakComponentImplHelper3< typedef ::cppu::WeakComponentImplHelper3<
::com::sun::star::rendering::XLinePolyPolygon2D, css::rendering::XLinePolyPolygon2D,
::com::sun::star::rendering::XBezierPolyPolygon2D, css::rendering::XBezierPolyPolygon2D,
::com::sun::star::lang::XServiceInfo > UnoPolyPolygonBase; css::lang::XServiceInfo > UnoPolyPolygonBase;
class BASEGFX_DLLPUBLIC UnoPolyPolygon class BASEGFX_DLLPUBLIC UnoPolyPolygon
: private cppu::BaseMutex : private cppu::BaseMutex
...@@ -46,39 +46,39 @@ namespace unotools ...@@ -46,39 +46,39 @@ namespace unotools
explicit UnoPolyPolygon( const B2DPolyPolygon& ); explicit UnoPolyPolygon( const B2DPolyPolygon& );
// XPolyPolygon2D // XPolyPolygon2D
virtual void SAL_CALL addPolyPolygon( const ::com::sun::star::geometry::RealPoint2D& position, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& polyPolygon ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPolyPolygon( const css::geometry::RealPoint2D& position, const css::uno::Reference< css::rendering::XPolyPolygon2D >& polyPolygon ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
virtual ::sal_Int32 SAL_CALL getNumberOfPolygons( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::sal_Int32 SAL_CALL getNumberOfPolygons( ) throw (css::uno::RuntimeException, std::exception) override;
virtual ::sal_Int32 SAL_CALL getNumberOfPolygonPoints( ::sal_Int32 polygon ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::sal_Int32 SAL_CALL getNumberOfPolygonPoints( ::sal_Int32 polygon ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::rendering::FillRule SAL_CALL getFillRule( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual css::rendering::FillRule SAL_CALL getFillRule( ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setFillRule( ::com::sun::star::rendering::FillRule fillRule ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFillRule( css::rendering::FillRule fillRule ) throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL isClosed( ::sal_Int32 index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isClosed( ::sal_Int32 index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setClosed( ::sal_Int32 index, sal_Bool closedState ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setClosed( ::sal_Int32 index, sal_Bool closedState ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
// XLinePolyPolygon2D // XLinePolyPolygon2D
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > > SAL_CALL getPoints( ::sal_Int32 nPolygonIndex, ::sal_Int32 nNumberOfPolygons, ::sal_Int32 nPointIndex, ::sal_Int32 nNumberOfPoints ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Sequence< css::geometry::RealPoint2D > > SAL_CALL getPoints( ::sal_Int32 nPolygonIndex, ::sal_Int32 nNumberOfPolygons, ::sal_Int32 nPointIndex, ::sal_Int32 nNumberOfPoints ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPoints( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > >& points, ::sal_Int32 nPolygonIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPoints( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealPoint2D > >& points, ::sal_Int32 nPolygonIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::geometry::RealPoint2D SAL_CALL getPoint( ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual css::geometry::RealPoint2D SAL_CALL getPoint( ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPoint( const ::com::sun::star::geometry::RealPoint2D& point, ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPoint( const css::geometry::RealPoint2D& point, ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
// XBezierPolyPolygon2D // XBezierPolyPolygon2D
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > > SAL_CALL getBezierSegments( ::sal_Int32 nPolygonIndex, ::sal_Int32 nNumberOfPolygons, ::sal_Int32 nPointIndex, ::sal_Int32 nNumberOfPoints ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Sequence< css::geometry::RealBezierSegment2D > > SAL_CALL getBezierSegments( ::sal_Int32 nPolygonIndex, ::sal_Int32 nNumberOfPolygons, ::sal_Int32 nPointIndex, ::sal_Int32 nNumberOfPoints ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setBezierSegments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > >& points, ::sal_Int32 nPolygonIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setBezierSegments( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealBezierSegment2D > >& points, ::sal_Int32 nPolygonIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::geometry::RealBezierSegment2D SAL_CALL getBezierSegment( ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual css::geometry::RealBezierSegment2D SAL_CALL getBezierSegment( ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setBezierSegment( const ::com::sun::star::geometry::RealBezierSegment2D& point, ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setBezierSegment( const css::geometry::RealBezierSegment2D& point, ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
B2DPolyPolygon getPolyPolygon() const; B2DPolyPolygon getPolyPolygon() const;
protected: protected:
/// Check whether index is a valid polygon index /// Check whether index is a valid polygon index
void checkIndex( sal_Int32 nIndex ) const // throw (::com::sun::star::lang::IndexOutOfBoundsException); void checkIndex( sal_Int32 nIndex ) const // throw (css::lang::IndexOutOfBoundsException);
{ {
if( nIndex < 0 || nIndex >= static_cast<sal_Int32>(maPolyPoly.count()) ) if( nIndex < 0 || nIndex >= static_cast<sal_Int32>(maPolyPoly.count()) )
throw ::com::sun::star::lang::IndexOutOfBoundsException(); throw css::lang::IndexOutOfBoundsException();
} }
B2DPolyPolygon getSubsetPolyPolygon( sal_Int32 nPolygonIndex, B2DPolyPolygon getSubsetPolyPolygon( sal_Int32 nPolygonIndex,
...@@ -100,7 +100,7 @@ namespace unotools ...@@ -100,7 +100,7 @@ namespace unotools
UnoPolyPolygon& operator=(const UnoPolyPolygon&) = delete; UnoPolyPolygon& operator=(const UnoPolyPolygon&) = delete;
B2DPolyPolygon maPolyPoly; B2DPolyPolygon maPolyPoly;
::com::sun::star::rendering::FillRule meFillRule; css::rendering::FillRule meFillRule;
}; };
} }
} }
......
...@@ -27,11 +27,11 @@ class B2DPolyPolygon; ...@@ -27,11 +27,11 @@ class B2DPolyPolygon;
namespace unotools namespace unotools
{ {
BASEGFX_DLLPUBLIC B2DPolyPolygon polyPolygonBezierToB2DPolyPolygon(const ::com::sun::star::drawing::PolyPolygonBezierCoords& rSourcePolyPolygon) BASEGFX_DLLPUBLIC B2DPolyPolygon polyPolygonBezierToB2DPolyPolygon(const css::drawing::PolyPolygonBezierCoords& rSourcePolyPolygon)
throw( ::com::sun::star::lang::IllegalArgumentException ); throw( css::lang::IllegalArgumentException );
BASEGFX_DLLPUBLIC void b2DPolyPolygonToPolyPolygonBezier( const B2DPolyPolygon& rPolyPoly, BASEGFX_DLLPUBLIC void b2DPolyPolygonToPolyPolygonBezier( const B2DPolyPolygon& rPolyPoly,
::com::sun::star::drawing::PolyPolygonBezierCoords& rRetval ); css::drawing::PolyPolygonBezierCoords& rRetval );
} }
} }
......
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