From 7bf1e66ac51a582527b35b852586cf7474bc7ba8 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 12 Apr 2017 14:03:04 +0200 Subject: convert AX_FONTDATA to o3tl::typed_flags Change-Id: If51119fbdde4b1d923b794d126fdae99ca238f81 Reviewed-on: https://gerrit.libreoffice.org/36463 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sc/source/filter/oox/drawingfragment.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sc/source/filter/oox/drawingfragment.cxx') diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index 6f34a89c3c54..9675067d168b 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -711,12 +711,12 @@ void VmlDrawing::convertControlFontData( AxFontData& rAxFontData, sal_uInt32& rn rAxFontData.setHeightPoints( static_cast< sal_Int16 >( (rFontModel.monSize.get( 200 ) + 10) / 20 ) ); // font effects - rAxFontData.mnFontEffects = 0; - setFlag( rAxFontData.mnFontEffects, AX_FONTDATA_BOLD, rFontModel.mobBold.get( false ) ); - setFlag( rAxFontData.mnFontEffects, AX_FONTDATA_ITALIC, rFontModel.mobItalic.get( false ) ); - setFlag( rAxFontData.mnFontEffects, AX_FONTDATA_STRIKEOUT, rFontModel.mobStrikeout.get( false ) ); + rAxFontData.mnFontEffects = AxFontFlags::NONE; + setFlag( rAxFontData.mnFontEffects, AxFontFlags::Bold, rFontModel.mobBold.get( false ) ); + setFlag( rAxFontData.mnFontEffects, AxFontFlags::Italic, rFontModel.mobItalic.get( false ) ); + setFlag( rAxFontData.mnFontEffects, AxFontFlags::Strikeout, rFontModel.mobStrikeout.get( false ) ); sal_Int32 nUnderline = rFontModel.monUnderline.get( XML_none ); - setFlag( rAxFontData.mnFontEffects, AX_FONTDATA_UNDERLINE, nUnderline != XML_none ); + setFlag( rAxFontData.mnFontEffects, AxFontFlags::Underline, nUnderline != XML_none ); rAxFontData.mbDblUnderline = nUnderline == XML_double; // font color -- cgit