From 45654a1d4d96732912e6e4dc254c9612d3f241c0 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Sat, 16 Jan 2016 12:20:45 -0600
Subject: revert vcl patch series that brok Mac and Windows

revert:
9bc2f3de8672e812f3a67541c6d7069b434a7e42
 vcl: add comment about ImplFontMetric::{Get|Set}LineHeight()
26371f105bc44e04469ec03fc5bb12505e651c6b
 vcl: FontAttributes::GetSlantType() -> FontAttributes::GetItalic()
2dd0b4317372b8022efe3911b38b4fa02956d8b9
 vcl: font.hxx and metric.hxx cleanup, make ctors explicit and the dtor virtual
5ab13bf3ead3539e4ad847656da81e7eb6029652
 vcl: tabify font.hxx
f99550dae55e40e49bf9c9875053fe2abb4c71ca
 vcl: change Font::SetName() to Font::SetFamilyName()
2b297116cb6bb1061c43e5714e2609c8ee9f57d2
 vcl: rename Font::GetName to Font::GetFamilyName

Change-Id: I23f38921187d66b970ca815eb30dda4222a2da62
---
 dbaccess/source/ui/misc/TokenWriter.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dbaccess/source/ui/misc/TokenWriter.cxx')

diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 1c4b3c596f43..ffbb1158b6a0 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -384,7 +384,7 @@ bool ORTFImportExport::Write()
     OString aFonts(OUStringToOString(m_aFont.Name, eDestEnc));
     if (aFonts.isEmpty())
     {
-        OUString aName = Application::GetSettings().GetStyleSettings().GetAppFont().GetFamilyName();
+        OUString aName = Application::GetSettings().GetStyleSettings().GetAppFont().GetName();
         aFonts = OUStringToOString(aName, eDestEnc);
     }
 
-- 
cgit