From 5ea1466c4f06737669bedbaa4ee608d6a6060bf9 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Tue, 26 Mar 2013 23:54:45 +0200
Subject: Move two text-related functions to svptext.cxx

Change-Id: I6c45d44fd38d9fde8cad7f712973f11bde51675a
---
 vcl/headless/svpgdi.cxx  | 29 -----------------------------
 vcl/headless/svptext.cxx | 21 ++++++++++++++++++++-
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 0fc35290d704..ca95dc3157df 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -358,15 +358,6 @@ void SvpSalGraphics::SetROPFillColor( SalROPColor nROPColor )
     }
 }
 
-#ifndef IOS
-
-void SvpSalGraphics::SetTextColor( SalColor nSalColor )
-{
-    m_aTextColor = basebmp::Color( nSalColor );
-}
-
-#endif
-
 void SvpSalGraphics::drawPixel( long nX, long nY )
 {
     if( m_bUseLineColor )
@@ -703,26 +694,6 @@ sal_Bool SvpSalGraphics::drawEPS( long, long, long, long, void*, sal_uLong )
     return sal_False;
 }
 
-#ifndef IOS
-
-SystemFontData SvpSalGraphics::GetSysFontData( int nFallbacklevel ) const
-{
-    SystemFontData aSysFontData;
-
-    if (nFallbacklevel >= MAX_FALLBACK) nFallbacklevel = MAX_FALLBACK - 1;
-    if (nFallbacklevel < 0 ) nFallbacklevel = 0;
-
-    aSysFontData.nSize = sizeof( SystemFontData );
-    aSysFontData.nFontId = 0;
-    aSysFontData.nFontFlags = 0;
-    aSysFontData.bFakeBold = false;
-    aSysFontData.bFakeItalic = false;
-    aSysFontData.bAntialias = true;
-    return aSysFontData;
-}
-
-#endif
-
 SystemGraphicsData SvpSalGraphics::GetGraphicsData() const
 {
     return SystemGraphicsData();
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index 834f6a005199..b4429b22a2f6 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -539,6 +539,25 @@ void SvpSalGraphics::DrawServerFontLayout( const ServerFontLayout& rSalLayout )
     }
 }
 
-// ===========================================================================
+void SvpSalGraphics::SetTextColor( SalColor nSalColor )
+{
+    m_aTextColor = basebmp::Color( nSalColor );
+}
+
+SystemFontData SvpSalGraphics::GetSysFontData( int nFallbacklevel ) const
+{
+    SystemFontData aSysFontData;
+
+    if (nFallbacklevel >= MAX_FALLBACK) nFallbacklevel = MAX_FALLBACK - 1;
+    if (nFallbacklevel < 0 ) nFallbacklevel = 0;
+
+    aSysFontData.nSize = sizeof( SystemFontData );
+    aSysFontData.nFontId = 0;
+    aSysFontData.nFontFlags = 0;
+    aSysFontData.bFakeBold = false;
+    aSysFontData.bFakeItalic = false;
+    aSysFontData.bAntialias = true;
+    return aSysFontData;
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit