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
---
 sw/inc/hhcwrp.hxx  | 2 +-
 sw/inc/ndtxt.hxx   | 2 +-
 sw/inc/numrule.hxx | 4 ++--
 sw/inc/splargs.hxx | 9 +++++----
 4 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'sw/inc')

diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index 9ff03b66ca8c..d90d2fe7f7ed 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -93,7 +93,7 @@ public:
         SwView* pView,
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
         LanguageType nSourceLanguage, LanguageType nTargetLanguage,
-        const Font *pTargetFont,
+        const vcl::Font *pTargetFont,
         sal_Int32 nConvOptions, bool bIsInteractive,
         bool bStart, bool bOther, bool bSelection );
 
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index a46e8bc57cb1..8c7a0491a7d5 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -155,7 +155,7 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
 
     SAL_DLLPRIVATE void SetLanguageAndFont( const SwPaM &rPaM,
             LanguageType nLang, sal_uInt16 nLangWhichId,
-            const Font *pFont,  sal_uInt16 nFontWhichId );
+            const vcl::Font *pFont,  sal_uInt16 nFontWhichId );
 
     /// Start: Data collected during idle time
 
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 0ba4f7a768a6..10d9eefa1804 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -35,7 +35,7 @@
 class SwTxtFmtColl;
 class IDocumentListsAccess;
 class SwNodeNum;
-class Font;
+namespace vcl { class Font; }
 class SvxBrushItem;
 class SfxGrabBagItem;
 class SvxNumRule;
@@ -298,7 +298,7 @@ namespace numfunc
 
         @author OD
     */
-    SW_DLLPUBLIC const Font& GetDefBulletFont();
+    SW_DLLPUBLIC const vcl::Font& GetDefBulletFont();
 
     /** retrieve unicode of character used for the default bullet list for the given list level
 
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 2771e90d6b3b..8a09c261b437 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -24,13 +24,14 @@
 #include <tools/gen.hxx>
 #include <limits.h>
 
-class SwTxtNode;
-class SwIndex;
-class Font;
 #include <com/sun/star/linguistic2/XSpellAlternatives.hpp>
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 
+class SwTxtNode;
+class SwIndex;
+namespace vcl { class Font; }
+
 struct SwArgsBase     // used for text conversion (Hangul/Hanja, ...)
 {
     SwTxtNode  *pStartNode;
@@ -65,7 +66,7 @@ struct SwConversionArgs : SwArgsBase
 
     // used for chinese translation
     LanguageType    nConvTargetLang;    // target language of text to be changed
-    const Font     *pTargetFont;        // target font of text to be changed
+    const vcl::Font *pTargetFont;        // target font of text to be changed
     // explicitly enables or disables application of the above two
     bool            bAllowImplicitChangesForNotConvertibleText;
 
-- 
cgit