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
---
 sd/source/ui/func/fuhhconv.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sd/source/ui/func/fuhhconv.cxx')

diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index 24a3f0b1212f..c5049a502c01 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -97,7 +97,7 @@ rtl::Reference<FuPoor> FuHangulHanjaConversion::Create( ViewShell* pViewSh, ::sd
  * Search and replace
  */
 void FuHangulHanjaConversion::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage,
-        const Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive )
+        const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive )
 {
 
     mpView->BegUndo(SD_RESSTR(STR_UNDO_HANGULHANJACONVERSION));
@@ -148,7 +148,7 @@ void FuHangulHanjaConversion::StartConversion( sal_Int16 nSourceLanguage, sal_In
         mpView->EndUndo();
 }
 
-void FuHangulHanjaConversion::ConvertStyles( sal_Int16 nTargetLanguage, const Font *pTargetFont )
+void FuHangulHanjaConversion::ConvertStyles( sal_Int16 nTargetLanguage, const vcl::Font *pTargetFont )
 {
     if( !mpDoc )
         return;
@@ -241,7 +241,7 @@ void FuHangulHanjaConversion::StartChineseConversion()
                     if( !bCommonTerms )
                         nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER;
 
-                    Font aTargetFont = OutputDevice::GetDefaultFont(
+                    vcl::Font aTargetFont = OutputDevice::GetDefaultFont(
                                         DEFAULTFONT_CJK_PRESENTATION,
                                         nTargetLang, DEFAULTFONT_FLAGS_ONLYONE );
 
-- 
cgit