From 990082f37c31380d9fedd62c5dac1b5bff4c9636 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 29 May 2016 20:23:09 +0200 Subject: Convert FontRelief to scoped enum Change-Id: I545c83d742db27f1a004b66e5eb1ef768f62e011 Reviewed-on: https://gerrit.libreoffice.org/25626 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sc/source/core/data/docpool.cxx | 2 +- sc/source/filter/xml/xmlcelli.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sc/source') diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 3b23782a0fc9..bb0055ca659a 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -250,7 +250,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool) ppPoolDefaults[ ATTR_FONT_EMPHASISMARK-ATTR_STARTINDEX ] = new SvxEmphasisMarkItem( FontEmphasisMark::NONE, ATTR_FONT_EMPHASISMARK ); ppPoolDefaults[ ATTR_USERDEF - ATTR_STARTINDEX ] = new SvXMLAttrContainerItem( ATTR_USERDEF ); ppPoolDefaults[ ATTR_FONT_WORDLINE - ATTR_STARTINDEX ] = new SvxWordLineModeItem(false, ATTR_FONT_WORDLINE ); - ppPoolDefaults[ ATTR_FONT_RELIEF - ATTR_STARTINDEX ] = new SvxCharReliefItem( RELIEF_NONE, ATTR_FONT_RELIEF ); + ppPoolDefaults[ ATTR_FONT_RELIEF - ATTR_STARTINDEX ] = new SvxCharReliefItem( FontRelief::NONE, ATTR_FONT_RELIEF ); ppPoolDefaults[ ATTR_HYPHENATE - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_HYPHENATE ); ppPoolDefaults[ ATTR_SCRIPTSPACE - ATTR_STARTINDEX ] = new SvxScriptSpaceItem( false, ATTR_SCRIPTSPACE); ppPoolDefaults[ ATTR_HANGPUNCTUATION - ATTR_STARTINDEX ] = new SvxHangingPunctuationItem( false, ATTR_HANGPUNCTUATION); diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 47c1a84296d9..eac311dfe17d 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -523,7 +523,7 @@ void ScXMLTableRowCellContext::PushFormat(sal_Int32 nBegin, sal_Int32 nEnd, cons case EE_CHAR_RELIEF: { if (!pPoolItem) - pPoolItem.reset(new SvxCharReliefItem(RELIEF_NONE, pEntry->mnItemID)); + pPoolItem.reset(new SvxCharReliefItem(FontRelief::NONE, pEntry->mnItemID)); pPoolItem->PutValue(it->maValue, pEntry->mnFlag); } -- cgit