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/editeng | |
| 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/editeng')
| -rw-r--r-- | include/editeng/editeng.hxx | 2 | ||||
| -rw-r--r-- | include/editeng/outliner.hxx | 2 | ||||
| -rw-r--r-- | include/editeng/txtrange.hxx | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index e10b7a1b826c..882b0a4428ee 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -76,7 +76,7 @@ class MapMode; class Color; namespace vcl { class Font; } class KeyEvent; -class PolyPolygon; +namespace tools { class PolyPolygon; } class Size; class Point; class Rectangle; diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 5a020c147830..ac5f18b6ffab 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -56,7 +56,7 @@ class Pointer; class CommandEvent; class MapMode; class OutputDevice; -class PolyPolygon; +namespace tools { class PolyPolygon; } class SfxStyleSheetPool; class SfxStyleSheet; class SfxItemPool; diff --git a/include/editeng/txtrange.hxx b/include/editeng/txtrange.hxx index b18a79302f2d..8fe6b4f2bb5d 100644 --- a/include/editeng/txtrange.hxx +++ b/include/editeng/txtrange.hxx @@ -24,7 +24,7 @@ #include <tools/gen.hxx> #include <deque> -class PolyPolygon; +namespace tools { class PolyPolygon; } class Rectangle; namespace basegfx { @@ -43,8 +43,8 @@ class EDITENG_DLLPUBLIC TextRanger RangeCache(const Range& rng) : range(rng) {}; }; std::deque<RangeCache> mRangeCache; //!< Cached range calculations. - PolyPolygon *mpPolyPolygon; // Surface polygon - PolyPolygon *mpLinePolyPolygon; // Line polygon + tools::PolyPolygon *mpPolyPolygon; // Surface polygon + tools::PolyPolygon *mpLinePolyPolygon; // Line polygon Rectangle *pBound; // Comprehensive rectangle sal_uInt16 nCacheSize; // Cache-Size sal_uInt16 nRight; // Distance Contour-Text @@ -75,8 +75,8 @@ public: bool IsInner() const { return bInner; } bool IsVertical() const { return bVertical; } bool HasBorder() const { return nRight || nLeft; } - const PolyPolygon& GetPolyPolygon() const { return *mpPolyPolygon; } - const PolyPolygon* GetLinePolygon() const { return mpLinePolyPolygon; } + const tools::PolyPolygon& GetPolyPolygon() const { return *mpPolyPolygon; } + const tools::PolyPolygon* GetLinePolygon() const { return mpLinePolyPolygon; } const Rectangle& GetBoundRect() { return pBound ? static_cast< const Rectangle& >(*pBound) : _GetBoundRect(); } void SetUpper( sal_uInt16 nNew ){ nUpper = nNew; } |