diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-28 07:51:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-30 11:47:41 +0200 |
| commit | c9d4a2887c13a5df244022276dd79a5bef8af0ea (patch) | |
| tree | fb849270affd5fca01fa26094c89595d18c6f588 /include/filter | |
| parent | d17d4d48b5dc3332fd03f6ef186ed2bda4665e7c (diff) | |
fdo#82577: Handle PolyPolygon
Put the TOOLS PolyPolygon class in the tools namespace. Avoids clash with the Windows
PolyPolygon typedef.
Change-Id: I811ecbb3d55ba4ce66e4555a8586f60fcd57fb66
Diffstat (limited to 'include/filter')
| -rw-r--r-- | include/filter/msfilter/escherex.hxx | 4 | ||||
| -rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 2 | ||||
| -rw-r--r-- | include/filter/msfilter/svdfppt.hxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 29de8abcfec6..82c84e3fc074 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -1327,10 +1327,10 @@ public: bool IsFontWork() const; // helper functions which are also used by the escher import - static PolyPolygon GetPolyPolygon( + static tools::PolyPolygon GetPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape ); - static PolyPolygon GetPolyPolygon( const ::com::sun::star::uno::Any& rSource ); + static tools::PolyPolygon GetPolyPolygon( const ::com::sun::star::uno::Any& rSource ); static MSO_SPT GetCustomShapeType( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, sal_uInt32& nMirrorFlags diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 5f2d1c9a2132..33cbc41fd221 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -54,7 +54,7 @@ class SvStream; class SdrObject; class SdrOle2Obj; class Polygon; -class PolyPolygon; +namespace tools { class PolyPolygon; } class FmFormModel; class SdrModel; class SwFlyFrmFmt; diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 74c044233cb1..594cb54391e0 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -45,7 +45,7 @@ class SdrPage; class SdrObject; class SvStream; class Polygon; -class PolyPolygon; +namespace tools { class PolyPolygon; } class SfxItemSet; class Outliner; class Graphic; |