diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-16 10:09:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-18 08:54:37 +0200 |
| commit | 60e78fbb806bb45e635ba1de45ceffe187938ac0 (patch) | |
| tree | 17ff5aaa57f4d23e177f1fe423def1691139a4a8 /include/vcl/graph.hxx | |
| parent | 9c818268767d6a1c1bc731ae30c45883bab987e7 (diff) | |
fdo#82577: Handle Font
Put the VCL Font class in the vcl namespace. Avoids clash with the X11
Font typedef.
Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
Diffstat (limited to 'include/vcl/graph.hxx')
| -rw-r--r-- | include/vcl/graph.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index e248efe66b84..24d9e427de3b 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -40,7 +40,7 @@ namespace com { namespace sun { namespace star { namespace graphic { class XGrap class ImpGraphic; class OutputDevice; -class Font; +namespace vcl { class Font; } class GfxLink; class VCL_DLLPUBLIC GraphicConversionParameters @@ -147,7 +147,7 @@ public: const Point& rDestPt, const Size& rDestSize ) const; static void DrawEx( OutputDevice* pOutDev, const OUString& rText, - Font& rFont, const BitmapEx& rBitmap, + vcl::Font& rFont, const BitmapEx& rBitmap, const Point& rDestPt, const Size& rDestSize ); void StartAnimation( OutputDevice* pOutDev, |