From 60e78fbb806bb45e635ba1de45ceffe187938ac0 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 16 Sep 2014 10:09:58 +0200
Subject: fdo#82577: Handle Font

Put the VCL Font class in the vcl namespace. Avoids clash with the X11
Font typedef.

Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
---
 include/editeng/svxrtf.hxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'include/editeng/svxrtf.hxx')

diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 33a8339c0423..9e516cdc4ad3 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -32,7 +32,7 @@
 #include <boost/ptr_container/ptr_map.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 
-class Font;
+namespace vcl { class Font; }
 class Color;
 class Graphic;
 class DateTime;
@@ -78,7 +78,7 @@ public:
 
 typedef Color* ColorPtr;
 typedef std::deque< ColorPtr > SvxRTFColorTbl;
-typedef boost::ptr_map<short, Font> SvxRTFFontTbl;
+typedef boost::ptr_map<short, vcl::Font> SvxRTFFontTbl;
 typedef boost::ptr_map<sal_uInt16, SvxRTFStyleType> SvxRTFStyleTbl;
 
 // SvxRTFItemStack can't be "std::stack< SvxRTFItemStackType* >" type, because
@@ -190,7 +190,7 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
     SvxPosition* pInsPos;
     SfxItemPool* pAttrPool;
     Color*  pDfltColor;
-    Font*   pDfltFont;
+    vcl::Font*   pDfltFont;
     ::com::sun::star::uno::Reference<
         ::com::sun::star::document::XDocumentProperties> m_xDocProps;
     SfxItemSet *pRTFDefaults;
@@ -326,7 +326,7 @@ public:
     virtual SvParserState CallParser() SAL_OVERRIDE;
 
     inline const Color& GetColor( size_t nId ) const;
-    const Font& GetFont( sal_uInt16 nId );      // Changes the default Font
+    const vcl::Font& GetFont( sal_uInt16 nId );      // Changes the default Font
 
     virtual bool IsEndPara( SvxNodeIdx* pNd, sal_Int32 nCnt ) const = 0;
 
-- 
cgit