diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-08-16 23:36:06 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-08-17 06:30:01 +0000 |
| commit | 5109114856898a67f0538a2c04a73d41b0f2fc78 (patch) | |
| tree | 427a776875ab809075699efb995eb9aeb837ca42 /include | |
| parent | ef46917ff3163d3fdd5152bda5d16c4503b6ab69 (diff) | |
Put Line under tools namespace
Change-Id: I7442848951c0d4579fb2a2a3eef3bfed7135aac4
Reviewed-on: https://gerrit.libreoffice.org/17791
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/postmac.h | 1 | ||||
| -rw-r--r-- | include/premac.h | 1 | ||||
| -rw-r--r-- | include/tools/line.hxx | 9 | ||||
| -rw-r--r-- | include/vcl/outdev.hxx | 6 |
4 files changed, 11 insertions, 6 deletions
diff --git a/include/postmac.h b/include/postmac.h index 0b846a93aec3..5e1342d658c9 100644 --- a/include/postmac.h +++ b/include/postmac.h @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#undef Line #undef Point #undef Size #undef TimeValue diff --git a/include/premac.h b/include/premac.h index 8bcf6833dc12..6b5a3c9909a7 100644 --- a/include/premac.h +++ b/include/premac.h @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define Line MacOSLine #define Point MacOSPoint #define Size MacOSSize #define TimeValue MacOSTimeValue diff --git a/include/tools/line.hxx b/include/tools/line.hxx index 7508a8fbb468..8a0486adf3fe 100644 --- a/include/tools/line.hxx +++ b/include/tools/line.hxx @@ -22,6 +22,9 @@ #include <tools/toolsdllapi.h> #include <tools/gen.hxx> +namespace tools +{ + class TOOLS_DLLPUBLIC Line { private: @@ -40,13 +43,15 @@ public: double GetLength() const; - bool Intersection( const Line& rLine, double& rIntersectionX, double& rIntersectionY ) const; - bool Intersection( const Line& rLine, Point& rIntersection ) const; + bool Intersection( const tools::Line& rLine, double& rIntersectionX, double& rIntersectionY ) const; + bool Intersection( const tools::Line& rLine, Point& rIntersection ) const; double GetDistance( const double& rPtX, const double& rPtY ) const; double GetDistance( const Point& rPoint ) const { return( GetDistance( rPoint.X(), rPoint.Y() ) ); } }; +} // namespace tools + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 339c10ab00f6..b1169561e3af 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -80,7 +80,9 @@ class TextRectInfo; class FontMetric; class GDIMetaFile; class GfxLink; -class Line; +namespace tools { + class Line; +} class LineInfo; class AlphaMask; class FontCharMap; @@ -972,7 +974,7 @@ public: private: SAL_DLLPRIVATE void CalcHatchValues( const Rectangle& rRect, long nDist, sal_uInt16 nAngle10, Point& rPt1, Point& rPt2, Size& rInc, Point& rEndPt1 ); - SAL_DLLPRIVATE void DrawHatchLine( const Line& rLine, const tools::PolyPolygon& rPolyPoly, Point* pPtBuffer, bool bMtf ); + SAL_DLLPRIVATE void DrawHatchLine( const tools::Line& rLine, const tools::PolyPolygon& rPolyPoly, Point* pPtBuffer, bool bMtf ); ///@} |