summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/basegfx/polygon/b3dpolygon.hxx2
-rw-r--r--include/cppcanvas/vclfactory.hxx6
-rw-r--r--include/filter/msfilter/escherex.hxx4
-rw-r--r--include/filter/msfilter/msdffimp.hxx8
-rw-r--r--include/filter/msfilter/svdfppt.hxx6
-rw-r--r--include/postmac.h1
-rw-r--r--include/postwin.h3
-rw-r--r--include/premac.h1
-rw-r--r--include/prewin.h1
-rw-r--r--include/svtools/imappoly.hxx8
-rw-r--r--include/svtools/ruler.hxx2
-rw-r--r--include/svx/svdocapt.hxx14
-rw-r--r--include/svx/svdtrans.hxx14
-rw-r--r--include/svx/xoutbmp.hxx10
-rw-r--r--include/svx/xpoly.hxx8
-rw-r--r--include/toolkit/helper/vclunohelper.hxx2
-rw-r--r--include/tools/poly.hxx35
-rw-r--r--include/vcl/canvastools.hxx6
-rw-r--r--include/vcl/gdimtf.hxx8
-rw-r--r--include/vcl/graphictools.hxx16
-rw-r--r--include/vcl/metaact.hxx14
-rw-r--r--include/vcl/outdev.hxx28
-rw-r--r--include/vcl/pdfwriter.hxx14
-rw-r--r--include/vcl/region.hxx10
-rw-r--r--include/vcl/window.hxx2
25 files changed, 119 insertions, 104 deletions
diff --git a/include/basegfx/polygon/b3dpolygon.hxx b/include/basegfx/polygon/b3dpolygon.hxx
index 8e29d3a63a69..486c1321fee8 100644
--- a/include/basegfx/polygon/b3dpolygon.hxx
+++ b/include/basegfx/polygon/b3dpolygon.hxx
@@ -46,7 +46,7 @@ namespace basegfx
private:
// internal data.
- ImplType mpPolygon;
+ ImplType mpPolygon;
public:
B3DPolygon();
diff --git a/include/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx
index ef0777f89a08..76b1269dff90 100644
--- a/include/cppcanvas/vclfactory.hxx
+++ b/include/cppcanvas/vclfactory.hxx
@@ -33,8 +33,10 @@
namespace vcl { class Window; }
class Bitmap;
class BitmapEx;
-class Polygon;
-namespace tools { class PolyPolygon; }
+namespace tools {
+ class Polygon;
+ class PolyPolygon;
+}
class Size;
class Graphic;
class GDIMetaFile;
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 5acd2335b57b..4f390f5a73be 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -590,7 +590,7 @@ struct MSFILTER_DLLPUBLIC EscherConnectorListEntry
maPointB ( rPB ),
mXConnectToB( rSB ) {}
- static sal_uInt32 GetClosestPoint( const Polygon& rPoly, const ::com::sun::star::awt::Point& rP );
+ static sal_uInt32 GetClosestPoint( const tools::Polygon& rPoly, const ::com::sun::star::awt::Point& rP );
};
struct MSFILTER_DLLPUBLIC EscherExContainer
@@ -885,7 +885,7 @@ public:
sal_uInt32 nFlags,
bool bBezier,
::com::sun::star::awt::Rectangle& rGeoRect,
- Polygon* pPolygon = NULL
+ tools::Polygon* pPolygon = NULL
);
static sal_uInt32 GetGradientColor(
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 6108ab22703e..5c256e8af544 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -48,8 +48,10 @@ class SotStorage;
class SvStream;
class SdrObject;
class SdrOle2Obj;
-class Polygon;
-namespace tools { class PolyPolygon; }
+namespace tools {
+ class Polygon;
+ class PolyPolygon;
+}
class FmFormModel;
class SdrModel;
class SwFlyFrameFormat;
@@ -212,7 +214,7 @@ struct MSFILTER_DLLPUBLIC SvxMSDffImportRec
static const int RELTO_DEFAULT = 2;
SdrObject* pObj;
- Polygon* pWrapPolygon;
+ tools::Polygon* pWrapPolygon;
char* pClientAnchorBuffer;
sal_uInt32 nClientAnchorLen;
char* pClientDataBuffer;
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 4f9b8d8137ae..def0fd11b936 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -45,8 +45,10 @@ class SdPage;
class SdrPage;
class SdrObject;
class SvStream;
-class Polygon;
-namespace tools { class PolyPolygon; }
+namespace tools {
+ class Polygon;
+ class PolyPolygon;
+}
class SfxItemSet;
class Outliner;
class Graphic;
diff --git a/include/postmac.h b/include/postmac.h
index a0cc11b34e8d..0b846a93aec3 100644
--- a/include/postmac.h
+++ b/include/postmac.h
@@ -19,7 +19,6 @@
#undef Line
#undef Point
-#undef Polygon
#undef Size
#undef TimeValue
diff --git a/include/postwin.h b/include/postwin.h
index b9ad4cfceea6..769d2e68cbe1 100644
--- a/include/postwin.h
+++ b/include/postwin.h
@@ -19,7 +19,6 @@
/* not protected, do only include once! */
-#undef Polygon
#undef Rectangle
#undef DELETE
#undef OPTIONAL
@@ -79,8 +78,6 @@
extern "C"
{
BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 );
-BOOL WINAPI WIN_Polygon( HDC hDC, CONST POINT * ppt, int ncnt );
-BOOL WINAPI WIN_PolyPolygon( HDC hDC, CONST POINT * ppt, LPINT npcnt, int ncnt );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/premac.h b/include/premac.h
index f22c1935706d..8bcf6833dc12 100644
--- a/include/premac.h
+++ b/include/premac.h
@@ -19,7 +19,6 @@
#define Line MacOSLine
#define Point MacOSPoint
-#define Polygon MacOSPolygon
#define Size MacOSSize
#define TimeValue MacOSTimeValue
diff --git a/include/prewin.h b/include/prewin.h
index 3ec0312aa222..24dd693254c2 100644
--- a/include/prewin.h
+++ b/include/prewin.h
@@ -22,7 +22,6 @@
#if defined WNT
#define Rectangle BLA_Rectangle
-#define Polygon BLA_Polygon
#define Folder WIN_Folder
#define GradientStyle_RECT WIN_GradientStyle_RECT
diff --git a/include/svtools/imappoly.hxx b/include/svtools/imappoly.hxx
index 547b3866958a..0c6ee47198fc 100644
--- a/include/svtools/imappoly.hxx
+++ b/include/svtools/imappoly.hxx
@@ -28,11 +28,11 @@ class Fraction;
class SVT_DLLPUBLIC IMapPolygonObject : public IMapObject
{
- Polygon aPoly;
+ tools::Polygon aPoly;
Rectangle aEllipse;
bool bEllipse;
- SVT_DLLPRIVATE void ImpConstruct( const Polygon& rPoly, bool bPixel );
+ SVT_DLLPRIVATE void ImpConstruct( const tools::Polygon& rPoly, bool bPixel );
protected:
@@ -42,7 +42,7 @@ protected:
public:
IMapPolygonObject() : bEllipse(false) {}
- IMapPolygonObject( const Polygon& rPoly,
+ IMapPolygonObject( const tools::Polygon& rPoly,
const OUString& rURL,
const OUString& rAltText,
const OUString& rDesc,
@@ -55,7 +55,7 @@ public:
virtual sal_uInt16 GetType() const SAL_OVERRIDE;
virtual bool IsHit( const Point& rPoint ) const SAL_OVERRIDE;
- Polygon GetPolygon( bool bPixelCoords = true ) const;
+ tools::Polygon GetPolygon( bool bPixelCoords = true ) const;
bool HasExtraEllipse() const { return bEllipse; }
const Rectangle& GetExtraEllipse() const { return aEllipse; }
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 87908e1d8711..4a3ffd2f3148 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -673,7 +673,7 @@ private:
SVT_DLLPRIVATE void ImplDrawBorders(vcl::RenderContext& rRenderContext,
long nMin, long nMax, long nVirTop, long nVirBottom);
SVT_DLLPRIVATE void ImplDrawIndent(vcl::RenderContext& rRenderContext,
- const Polygon& rPoly, sal_uInt16 nStyle, bool bIsHit = false);
+ const tools::Polygon& rPoly, sal_uInt16 nStyle, bool bIsHit = false);
SVT_DLLPRIVATE void ImplDrawIndents(vcl::RenderContext& rRenderContext,
long nMin, long nMax, long nVirTop, long nVirBottom);
SVT_DLLPRIVATE void ImplDrawTab(vcl::RenderContext& rRenderContext, const Point& rPos, sal_uInt16 nStyle);
diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index e7e372866280..07549de5edc9 100644
--- a/include/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
@@ -41,7 +41,7 @@ namespace sdr { namespace properties {
class SdrCaptObjGeoData : public SdrTextObjGeoData
{
public:
- Polygon aTailPoly;
+ tools::Polygon aTailPoly;
};
@@ -60,18 +60,18 @@ protected:
virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE;
private:
- Polygon aTailPoly; // the whole tail polygon
+ tools::Polygon aTailPoly; // the whole tail polygon
bool mbSpecialTextBoxShadow; // for calc special shadow, default FALSE
bool mbFixedTail; // for calc note box fixed tail, default FALSE
Point maFixedTailPos; // for calc note box fixed tail position.
private:
SVX_DLLPRIVATE void ImpGetCaptParams(ImpCaptParams& rPara) const;
- SVX_DLLPRIVATE void ImpCalcTail1(const ImpCaptParams& rPara, Polygon& rPoly, Rectangle& rRect) const;
- SVX_DLLPRIVATE void ImpCalcTail2(const ImpCaptParams& rPara, Polygon& rPoly, Rectangle& rRect) const;
- SVX_DLLPRIVATE void ImpCalcTail3(const ImpCaptParams& rPara, Polygon& rPoly, Rectangle& rRect) const;
- SVX_DLLPRIVATE void ImpCalcTail4(const ImpCaptParams& rPara, Polygon& rPoly, Rectangle& rRect) const;
- SVX_DLLPRIVATE void ImpCalcTail (const ImpCaptParams& rPara, Polygon& rPoly, Rectangle& rRect) const;
+ SVX_DLLPRIVATE void ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const;
+ SVX_DLLPRIVATE void ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const;
+ SVX_DLLPRIVATE void ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const;
+ SVX_DLLPRIVATE void ImpCalcTail4(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const;
+ SVX_DLLPRIVATE void ImpCalcTail (const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect) const;
SVX_DLLPRIVATE void ImpRecalcTail();
public:
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index a3a85e5c0620..7d6c515ed2fb 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -54,26 +54,26 @@ inline long Round(double a) { return a>0.0 ? (long)(a+0.5) : -(long)((-a)+0.5);
inline void MoveRect(Rectangle& rRect, const Size& S) { rRect.Move(S.Width(),S.Height()); }
inline void MovePoint(Point& rPnt, const Size& S) { rPnt.X()+=S.Width(); rPnt.Y()+=S.Height(); }
-inline void MovePoly(Polygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); }
+inline void MovePoly(tools::Polygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); }
inline void MovePoly(tools::PolyPolygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); }
void MoveXPoly(XPolygon& rPoly, const Size& S);
SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bNoJustify = false);
inline void ResizePoint(Point& rPnt, const Point& rRef, Fraction xFact, Fraction yFact);
-void ResizePoly(Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact);
+void ResizePoly(tools::Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact);
void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact);
inline void RotatePoint(Point& rPnt, const Point& rRef, double sn, double cs);
-SVX_DLLPUBLIC void RotatePoly(Polygon& rPoly, const Point& rRef, double sn, double cs);
+SVX_DLLPUBLIC void RotatePoly(tools::Polygon& rPoly, const Point& rRef, double sn, double cs);
void RotateXPoly(XPolygon& rPoly, const Point& rRef, double sn, double cs);
void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs);
void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2);
-void MirrorPoly(Polygon& rPoly, const Point& rRef1, const Point& rRef2);
+void MirrorPoly(tools::Polygon& rPoly, const Point& rRef1, const Point& rRef2);
void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2);
inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, bool bVShear = false);
-SVX_DLLPUBLIC void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, bool bVShear = false);
+SVX_DLLPUBLIC void ShearPoly(tools::Polygon& rPoly, const Point& rRef, double tn, bool bVShear = false);
void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, bool bVShear = false);
/**
@@ -239,8 +239,8 @@ public:
void RecalcTan();
};
-Polygon Rect2Poly(const Rectangle& rRect, const GeoStat& rGeo);
-void Poly2Rect(const Polygon& rPol, Rectangle& rRect, GeoStat& rGeo);
+tools::Polygon Rect2Poly(const Rectangle& rRect, const GeoStat& rGeo);
+void Poly2Rect(const tools::Polygon& rPol, Rectangle& rRect, GeoStat& rGeo);
SVX_DLLPUBLIC void OrthoDistance8(const Point& rPt0, Point& rPt, bool bBigOrtho);
SVX_DLLPUBLIC void OrthoDistance4(const Point& rPt0, Point& rPt, bool bBigOrtho);
diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx
index 25ba5e48c90d..34e03c3f9cc0 100644
--- a/include/svx/xoutbmp.hxx
+++ b/include/svx/xoutbmp.hxx
@@ -41,7 +41,9 @@
class GraphicFilter;
class VirtualDevice;
class INetURLObject;
-class Polygon;
+namespace tools {
+ class Polygon;
+}
class SVX_DLLPUBLIC XOutBitmap
{
@@ -62,9 +64,9 @@ public:
static Bitmap DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold );
- static Polygon GetCountour( const Bitmap& rBmp, const sal_uIntPtr nContourFlags,
- const sal_uInt8 cEdgeDetectThreshold = 50,
- const Rectangle* pWorkRect = NULL );
+ static tools::Polygon GetCountour( const Bitmap& rBmp, const sal_uIntPtr nContourFlags,
+ const sal_uInt8 cEdgeDetectThreshold = 50,
+ const Rectangle* pWorkRect = NULL );
};
SVX_DLLPUBLIC bool DitherBitmap( Bitmap& rBitmap );
diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx
index 499cdc4d62b6..9d96d40a5cec 100644
--- a/include/svx/xpoly.hxx
+++ b/include/svx/xpoly.hxx
@@ -25,8 +25,10 @@
class Point;
class Rectangle;
class SvStream;
-class Polygon;
-namespace tools { class PolyPolygon; }
+namespace tools {
+ class Polygon;
+ class PolyPolygon;
+}
class OutputDevice;
#define XPOLYPOLY_APPEND 0xFFFF
@@ -63,7 +65,7 @@ protected:
public:
XPolygon( sal_uInt16 nSize=16, sal_uInt16 nResize=16 );
XPolygon( const XPolygon& rXPoly );
- XPolygon( const Polygon& rPoly );
+ XPolygon( const tools::Polygon& rPoly );
XPolygon( const Rectangle& rRect, long nRx = 0, long nRy = 0 );
XPolygon( const Point& rCenter, long nRx, long nRy,
sal_uInt16 nStartAngle = 0, sal_uInt16 nEndAngle = 3600,
diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx
index c902e5c9155c..0b3e944be19b 100644
--- a/include/toolkit/helper/vclunohelper.hxx
+++ b/include/toolkit/helper/vclunohelper.hxx
@@ -93,7 +93,7 @@ public:
static vcl::Region GetRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion );
// Polygon
- static Polygon CreatePolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY );
+ static tools::Polygon CreatePolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY );
/** convert Font to ::com::sun::star::awt::FontDescriptor
@param rFont Font to be converted
diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx
index ad8ff402426d..83381beded4f 100644
--- a/include/tools/poly.hxx
+++ b/include/tools/poly.hxx
@@ -88,6 +88,8 @@ namespace basegfx
class B2DPolyPolygon;
}
+namespace tools {
+
class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Polygon
{
private:
@@ -96,7 +98,7 @@ private:
TOOLS_DLLPRIVATE inline void ImplMakeUnique();
public:
- static void ImplReduceEdges( Polygon& rPoly, const double& rArea, sal_uInt16 nPercent );
+ static void ImplReduceEdges( tools::Polygon& rPoly, const double& rArea, sal_uInt16 nPercent );
void ImplRead( SvStream& rIStream );
void ImplWrite( SvStream& rOStream ) const;
@@ -119,7 +121,7 @@ public:
const Point& rBezPt2, const Point& rCtrlPt2,
sal_uInt16 nPoints = 0 );
- Polygon( const Polygon& rPoly );
+ Polygon( const tools::Polygon& rPoly );
~Polygon();
void SetPoint( const Point& rPt, sal_uInt16 nPos );
@@ -162,7 +164,7 @@ public:
the original polygon is guaranteed to be smaller than one
pixel.
*/
- void AdaptiveSubdivide( Polygon& rResult, const double d = 1.0 ) const;
+ void AdaptiveSubdivide( tools::Polygon& rResult, const double d = 1.0 ) const;
static Polygon SubdivideBezier( const Polygon& rPoly );
void Move( long nHorzMove, long nVertMove );
@@ -172,21 +174,21 @@ public:
void Rotate( const Point& rCenter, sal_uInt16 nAngle10 );
void Insert( sal_uInt16 nPos, const Point& rPt, PolyFlags eFlags = POLY_NORMAL );
- void Insert( sal_uInt16 nPos, const Polygon& rPoly );
+ void Insert( sal_uInt16 nPos, const tools::Polygon& rPoly );
const Point& operator[]( sal_uInt16 nPos ) const { return GetPoint( nPos ); }
Point& operator[]( sal_uInt16 nPos );
- Polygon& operator=( const Polygon& rPoly );
- bool operator==( const Polygon& rPoly ) const;
- bool operator!=( const Polygon& rPoly ) const
+ tools::Polygon& operator=( const tools::Polygon& rPoly );
+ bool operator==( const tools::Polygon& rPoly ) const;
+ bool operator!=( const tools::Polygon& rPoly ) const
{ return !(Polygon::operator==( rPoly )); }
- bool IsEqual( const Polygon& rPoly ) const;
+ bool IsEqual( const tools::Polygon& rPoly ) const;
// streaming a Polygon does ignore PolyFlags, so use the Write Or Read
// method to take care of PolyFlags
- TOOLS_DLLPUBLIC friend SvStream& ReadPolygon( SvStream& rIStream, Polygon& rPoly );
- TOOLS_DLLPUBLIC friend SvStream& WritePolygon( SvStream& rOStream, const Polygon& rPoly );
+ TOOLS_DLLPUBLIC friend SvStream& ReadPolygon( SvStream& rIStream, tools::Polygon& rPoly );
+ TOOLS_DLLPUBLIC friend SvStream& WritePolygon( SvStream& rOStream, const tools::Polygon& rPoly );
void Read( SvStream& rIStream );
void Write( SvStream& rOStream ) const;
@@ -202,7 +204,6 @@ public:
explicit Polygon(const ::basegfx::B2DPolygon& rPolygon);
};
-namespace tools {
class TOOLS_DLLPUBLIC SAL_WARN_UNUSED PolyPolygon
{
@@ -213,14 +214,14 @@ private:
public:
PolyPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize = 16 );
- PolyPolygon( const Polygon& rPoly );
+ PolyPolygon( const tools::Polygon& rPoly );
PolyPolygon( const tools::PolyPolygon& rPolyPoly );
~PolyPolygon();
- void Insert( const Polygon& rPoly, sal_uInt16 nPos = POLYPOLY_APPEND );
+ void Insert( const tools::Polygon& rPoly, sal_uInt16 nPos = POLYPOLY_APPEND );
void Remove( sal_uInt16 nPos );
void Replace( const Polygon& rPoly, sal_uInt16 nPos );
- const Polygon& GetObject( sal_uInt16 nPos ) const;
+ const tools::Polygon& GetObject( sal_uInt16 nPos ) const;
bool IsRect() const;
@@ -261,10 +262,10 @@ public:
void Rotate( const Point& rCenter, double fSin, double fCos );
void Rotate( const Point& rCenter, sal_uInt16 nAngle10 );
- const Polygon& operator[]( sal_uInt16 nPos ) const { return GetObject( nPos ); }
- Polygon& operator[]( sal_uInt16 nPos );
+ const tools::Polygon& operator[]( sal_uInt16 nPos ) const { return GetObject( nPos ); }
+ tools::Polygon& operator[]( sal_uInt16 nPos );
- tools::PolyPolygon& operator=( const tools::PolyPolygon& rPolyPoly );
+ tools::PolyPolygon& operator=( const tools::PolyPolygon& rPolyPoly );
bool operator==( const tools::PolyPolygon& rPolyPoly ) const;
bool operator!=( const tools::PolyPolygon& rPolyPoly ) const
{ return !(PolyPolygon::operator==( rPolyPoly )); }
diff --git a/include/vcl/canvastools.hxx b/include/vcl/canvastools.hxx
index 08b5b6dba648..96e8ee08301d 100644
--- a/include/vcl/canvastools.hxx
+++ b/include/vcl/canvastools.hxx
@@ -30,8 +30,10 @@
class Point;
class Size;
class Rectangle;
-class Polygon;
-namespace tools { class PolyPolygon; }
+namespace tools {
+ class Polygon;
+ class PolyPolygon;
+}
class Bitmap;
class BitmapEx;
class Color;
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index 4a50b6514c81..197d795fa122 100644
--- a/include/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
@@ -34,8 +34,10 @@ class MetaCommentAction;
class SvStream;
class Color;
class BitmapEx;
-class Polygon;
-namespace tools { class PolyPolygon; }
+namespace tools {
+ class Polygon;
+ class PolyPolygon;
+}
class Gradient;
@@ -93,7 +95,7 @@ private:
SAL_DLLPRIVATE Point ImplGetRotatedPoint( const Point& rPt, const Point& rRotatePt,
const Size& rOffset, double fSin, double fCos );
- SAL_DLLPRIVATE Polygon ImplGetRotatedPolygon( const Polygon& rPoly, const Point& rRotatePt,
+ SAL_DLLPRIVATE tools::Polygon ImplGetRotatedPolygon( const tools::Polygon& rPoly, const Point& rRotatePt,
const Size& rOffset, double fSin, double fCos );
SAL_DLLPRIVATE tools::PolyPolygon ImplGetRotatedPolyPolygon( const tools::PolyPolygon& rPoly, const Point& rRotatePt,
const Size& rOffset, double fSin, double fCos );
diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx
index ace82ffa545b..8bcb6710560a 100644
--- a/include/vcl/graphictools.hxx
+++ b/include/vcl/graphictools.hxx
@@ -82,9 +82,9 @@ public:
See accessor method descriptions for argument description
*/
- SvtGraphicStroke( const Polygon& rPath,
- const tools::PolyPolygon& rStartArrow,
- const tools::PolyPolygon& rEndArrow,
+ SvtGraphicStroke( const tools::Polygon& rPath,
+ const tools::PolyPolygon& rStartArrow,
+ const tools::PolyPolygon& rEndArrow,
double fTransparency,
double fStrokeWidth,
CapType aCap,
@@ -94,7 +94,7 @@ public:
// accessors
/// Query path to stroke
- void getPath ( Polygon& ) const;
+ void getPath ( tools::Polygon& ) const;
/** Get the polygon that is put at the start of the line
The polygon is in a special normalized position: the center of
@@ -141,7 +141,7 @@ public:
// mutators
/// Set path to stroke
- void setPath ( const Polygon& );
+ void setPath ( const tools::Polygon& );
/** Set the polygon that is put at the start of the line
The polygon has to be in a special normalized position, and
@@ -178,9 +178,9 @@ private:
VCL_DLLPUBLIC friend SvStream& WriteSvtGraphicStroke( SvStream& rOStm, const SvtGraphicStroke& rClass );
VCL_DLLPUBLIC friend SvStream& ReadSvtGraphicStroke( SvStream& rIStm, SvtGraphicStroke& rClass );
- Polygon maPath;
- tools::PolyPolygon maStartArrow;
- tools::PolyPolygon maEndArrow;
+ tools::Polygon maPath;
+ tools::PolyPolygon maStartArrow;
+ tools::PolyPolygon maEndArrow;
double mfTransparency;
double mfStrokeWidth;
CapType maCapType;
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 2f1f5cecd5d0..84ac05cef8b7 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -338,7 +338,7 @@ class VCL_DLLPUBLIC MetaPolyLineAction : public MetaAction
private:
LineInfo maLineInfo;
- Polygon maPoly;
+ tools::Polygon maPoly;
public:
MetaPolyLineAction();
@@ -350,13 +350,13 @@ public:
virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE;
virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE;
- explicit MetaPolyLineAction( const Polygon& );
- explicit MetaPolyLineAction( const Polygon&, const LineInfo& );
+ explicit MetaPolyLineAction( const tools::Polygon& );
+ explicit MetaPolyLineAction( const tools::Polygon&, const LineInfo& );
virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE;
virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE;
- const Polygon& GetPolygon() const { return maPoly; }
+ const tools::Polygon& GetPolygon() const { return maPoly; }
const LineInfo& GetLineInfo() const { return maLineInfo; }
};
@@ -364,7 +364,7 @@ class VCL_DLLPUBLIC MetaPolygonAction : public MetaAction
{
private:
- Polygon maPoly;
+ tools::Polygon maPoly;
public:
MetaPolygonAction();
@@ -376,12 +376,12 @@ public:
virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE;
virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE;
- explicit MetaPolygonAction( const Polygon& );
+ explicit MetaPolygonAction( const tools::Polygon& );
virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE;
virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE;
- const Polygon& GetPolygon() const { return maPoly; }
+ const tools::Polygon& GetPolygon() const { return maPoly; }
};
class VCL_DLLPUBLIC MetaPolyPolygonAction : public MetaAction
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 3eb6300898d2..339c10ab00f6 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -737,8 +737,8 @@ public:
void DrawPixel( const Point& rPt );
void DrawPixel( const Point& rPt, const Color& rColor );
- void DrawPixel( const Polygon& rPts, const Color* pColors = NULL );
- void DrawPixel( const Polygon& rPts, const Color& rColor );
+ void DrawPixel( const tools::Polygon& rPts, const Color* pColors = NULL );
+ void DrawPixel( const tools::Polygon& rPts, const Color& rColor );
Color GetPixel( const Point& rPt ) const;
///@}
@@ -771,7 +771,7 @@ public:
///@{
public:
void Invert( const Rectangle& rRect, InvertFlags nFlags = InvertFlags::NONE );
- void Invert( const Polygon& rPoly, InvertFlags nFlags = InvertFlags::NONE );
+ void Invert( const tools::Polygon& rPoly, InvertFlags nFlags = InvertFlags::NONE );
///@}
/** @name Line functions
@@ -807,7 +807,7 @@ public:
@see DrawPolygon
@see DrawPolyPolygon
*/
- void DrawPolyLine( const Polygon& rPoly );
+ void DrawPolyLine( const tools::Polygon& rPoly );
void DrawPolyLine(
const basegfx::B2DPolygon&,
@@ -825,7 +825,7 @@ public:
@see DrawPolygon
@see DrawPolyPolygon
*/
- void DrawPolyLine( const Polygon& rPoly,
+ void DrawPolyLine( const tools::Polygon& rPoly,
const LineInfo& rLineInfo );
// #i101491#
@@ -842,7 +842,7 @@ private:
// #i101491#
// Helper which holds the old line geometry creation and is extended to use AA when
// switched on. Advantage is that line geometry is only temporarily used for paint
- SAL_DLLPRIVATE void drawPolyLine(const Polygon& rPoly, const LineInfo& rLineInfo);
+ SAL_DLLPRIVATE void drawPolyLine(const tools::Polygon& rPoly, const LineInfo& rLineInfo);
///@}
@@ -863,7 +863,7 @@ public:
@see DrawPolyLine
*/
- void DrawPolygon( const Polygon& rPoly );
+ void DrawPolygon( const tools::Polygon& rPoly );
void DrawPolygon( const basegfx::B2DPolygon& );
/** Render the given poly-polygon
@@ -881,7 +881,7 @@ public:
private:
- SAL_DLLPRIVATE void ImplDrawPolygon( const Polygon& rPoly, const tools::PolyPolygon* pClipPolyPoly = NULL );
+ SAL_DLLPRIVATE void ImplDrawPolygon( const tools::Polygon& rPoly, const tools::PolyPolygon* pClipPolyPoly = NULL );
SAL_DLLPRIVATE void ImplDrawPolyPolygon( const tools::PolyPolygon& rPolyPoly, const tools::PolyPolygon* pClipPolyPoly = NULL );
SAL_DLLPRIVATE void ImplDrawPolyPolygon( sal_uInt16 nPoly, const tools::PolyPolygon& rPolyPoly );
// #i101491#
@@ -1725,17 +1725,17 @@ public:
Point LogicToPixel( const Point& rLogicPt ) const;
Size LogicToPixel( const Size& rLogicSize ) const;
Rectangle LogicToPixel( const Rectangle& rLogicRect ) const;
- Polygon LogicToPixel( const Polygon& rLogicPoly ) const;
+ tools::Polygon LogicToPixel( const tools::Polygon& rLogicPoly ) const;
tools::PolyPolygon LogicToPixel( const tools::PolyPolygon& rLogicPolyPoly ) const;
basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly ) const;
- vcl::Region LogicToPixel( const vcl::Region& rLogicRegion )const;
+ vcl::Region LogicToPixel( const vcl::Region& rLogicRegion )const;
Point LogicToPixel( const Point& rLogicPt,
const MapMode& rMapMode ) const;
Size LogicToPixel( const Size& rLogicSize,
const MapMode& rMapMode ) const;
Rectangle LogicToPixel( const Rectangle& rLogicRect,
const MapMode& rMapMode ) const;
- Polygon LogicToPixel( const Polygon& rLogicPoly,
+ tools::Polygon LogicToPixel( const tools::Polygon& rLogicPoly,
const MapMode& rMapMode ) const;
basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly,
const MapMode& rMapMode ) const;
@@ -1743,7 +1743,7 @@ public:
Point PixelToLogic( const Point& rDevicePt ) const;
Size PixelToLogic( const Size& rDeviceSize ) const;
Rectangle PixelToLogic( const Rectangle& rDeviceRect ) const;
- Polygon PixelToLogic( const Polygon& rDevicePoly ) const;
+ tools::Polygon PixelToLogic( const tools::Polygon& rDevicePoly ) const;
tools::PolyPolygon PixelToLogic( const tools::PolyPolygon& rDevicePolyPoly ) const;
basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly ) const;
vcl::Region PixelToLogic( const vcl::Region& rDeviceRegion ) const;
@@ -1753,7 +1753,7 @@ public:
const MapMode& rMapMode ) const;
Rectangle PixelToLogic( const Rectangle& rDeviceRect,
const MapMode& rMapMode ) const;
- Polygon PixelToLogic( const Polygon& rDevicePoly,
+ tools::Polygon PixelToLogic( const tools::Polygon& rDevicePoly,
const MapMode& rMapMode ) const;
basegfx::B2DPolygon PixelToLogic( const basegfx::B2DPolygon& rDevicePoly,
const MapMode& rMapMode ) const;
@@ -1923,7 +1923,7 @@ private:
@returns Polygon based on physical device pixel coordinates and units.
*/
- SAL_DLLPRIVATE Polygon ImplLogicToDevicePixel( const Polygon& rLogicPoly ) const;
+ SAL_DLLPRIVATE tools::Polygon ImplLogicToDevicePixel( const tools::Polygon& rLogicPoly ) const;
/** Convert a logical polypolygon to a polypolygon in physical device pixel units.
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 927b6075fc8b..2a72f9357b75 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -45,9 +45,11 @@ class Point;
class OutputDevice;
class GDIMetaFile;
class MapMode;
-class Polygon;
class LineInfo;
-namespace tools { class PolyPolygon; }
+namespace tools {
+ class Polygon;
+ class PolyPolygon;
+}
class Bitmap;
class BitmapEx;
class Image;
@@ -789,11 +791,11 @@ The following structure describes the permissions used in PDF security
void DrawLine( const Point& rStartPt, const Point& rEndPt );
void DrawLine( const Point& rStartPt, const Point& rEndPt,
const LineInfo& rLineInfo );
- void DrawPolyLine( const Polygon& rPoly );
- void DrawPolyLine( const Polygon& rPoly,
+ void DrawPolyLine( const tools::Polygon& rPoly );
+ void DrawPolyLine( const tools::Polygon& rPoly,
const LineInfo& rLineInfo );
- void DrawPolyLine( const Polygon& rPoly, const ExtLineInfo& rInfo );
- void DrawPolygon( const Polygon& rPoly );
+ void DrawPolyLine( const tools::Polygon& rPoly, const ExtLineInfo& rInfo );
+ void DrawPolygon( const tools::Polygon& rPoly );
void DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly );
void DrawRect( const Rectangle& rRect );
void DrawRect( const Rectangle& rRect,
diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx
index 4cbca18af40b..c169a615422c 100644
--- a/include/vcl/region.hxx
+++ b/include/vcl/region.hxx
@@ -27,8 +27,12 @@
class ImplRegionBand;
class RegionBand;
-class Polygon;
-namespace tools { class PolyPolygon; }
+
+namespace tools {
+ class Polygon;
+ class PolyPolygon;
+}
+
namespace vcl { class Window; }
class OutputDevice;
class Bitmap;
@@ -66,7 +70,7 @@ public:
explicit Region(bool bIsNull = false); // default creates empty region, with true a null region is created
explicit Region(const Rectangle& rRect);
- explicit Region(const Polygon& rPolygon);
+ explicit Region(const tools::Polygon& rPolygon);
explicit Region(const tools::PolyPolygon& rPolyPoly);
explicit Region(const basegfx::B2DPolyPolygon&);
Region(const vcl::Region& rRegion);
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index d67b8984e23f..a105bddcdc44 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1239,7 +1239,7 @@ public:
void HideTracking();
void InvertTracking( const Rectangle& rRect,
sal_uInt16 nFlags = SHOWTRACK_SMALL );
- void InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags = 0 );
+ void InvertTracking( const tools::Polygon& rPoly, sal_uInt16 nFlags = 0 );
void StartTracking( StartTrackingFlags nFlags = StartTrackingFlags::NONE );
void EndTracking( TrackingEventFlags nFlags = TrackingEventFlags::NONE );
generated by cgit (git 2.34.1) at 2025-02-03 22:02:49 +0000