From 3187193a6142b4b1c974ae1e1de572fa74a3c8ee Mon Sep 17 00:00:00 2001
From: Chris Sherlock <chris.sherlock79@gmail.com>
Date: Fri, 29 Jan 2016 17:43:42 +1100
Subject: tools: rename FontUnderline to FontLineStyle

Change-Id: I4750ad8569a1003b2f8c29052f3e25003ee433ca
Reviewed-on: https://gerrit.libreoffice.org/21892
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
---
 .../controller/itemsetwrapper/CharacterPropertyItemConverter.cxx      | 4 ++--
 chart2/source/view/main/DummyXShape.cxx                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'chart2/source')

diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index fae05e753885..1991ef6baa51 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -141,7 +141,7 @@ void CharacterPropertyItemConverter::FillSpecialItem(
 
         case EE_CHAR_UNDERLINE:
         {
-            SvxUnderlineItem aItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE);
+            SvxUnderlineItem aItem(LINESTYLE_NONE, EE_CHAR_UNDERLINE);
             bool bModified = false;
 
             uno::Any aValue( GetPropertySet()->getPropertyValue( "CharUnderline" ));
@@ -173,7 +173,7 @@ void CharacterPropertyItemConverter::FillSpecialItem(
 
         case EE_CHAR_OVERLINE:
         {
-            SvxOverlineItem aItem( UNDERLINE_NONE, EE_CHAR_OVERLINE );
+            SvxOverlineItem aItem( LINESTYLE_NONE, EE_CHAR_OVERLINE );
             bool bModified = false;
 
             uno::Any aValue( GetPropertySet()->getPropertyValue( "CharOverline" ) );
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index e2e54dfc80e2..955ea05c4e9e 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -771,7 +771,7 @@ struct FontAttribSetter
         }
         else if(rPropName == "CharUnderline")
         {
-            FontUnderline eUnderline = static_cast<FontUnderline>(rProp.second.get<sal_Int16>());
+            FontLineStyle eUnderline = static_cast<FontLineStyle>(rProp.second.get<sal_Int16>());
             mrFont.SetUnderline(eUnderline);
         }
         else if(rPropName == "CharWeight")
-- 
cgit