diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-16 12:44:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-17 06:04:30 +0000 |
| commit | f2a873cd13adf0b74d18af203676f2de86d1cb2e (patch) | |
| tree | 8b0f044b217e86db3c7320855e4df133fbabf3ae /writerfilter/source | |
| parent | 1bffa5e110772a7d6183ac64e56c23f2c3019f93 (diff) | |
convert SvxBorderStyle to scoped enum
and rename to SvxBorderLineStyle
Change-Id: I19e530f162e4ca6290a0ad076e7fe3d5775ae6bc
Reviewed-on: https://gerrit.libreoffice.org/35265
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/ConversionHelper.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx index 3e342ebd3395..805bac53d2e0 100644 --- a/writerfilter/source/dmapper/ConversionHelper.cxx +++ b/writerfilter/source/dmapper/ConversionHelper.cxx @@ -263,10 +263,10 @@ void MakeBorderLine( sal_Int32 nLineThickness, sal_Int32 nLineToken, // thickness, or one of smaller thickness. If too small we // can make the deficit up in additional white space or // object size - ::editeng::SvxBorderStyle const nLineStyle( + SvxBorderLineStyle const nLineStyle( ::editeng::ConvertBorderStyleFromWord(nLineType)); - rToFill.LineStyle = nLineStyle; - double const fConverted( (table::BorderLineStyle::NONE == nLineStyle) ? 0.0 : + rToFill.LineStyle = (sal_Int16)nLineStyle; + double const fConverted( (SvxBorderLineStyle::NONE == nLineStyle) ? 0.0 : ::editeng::ConvertBorderWidthFromWord(nLineStyle, nLineThickness, nLineType)); rToFill.LineWidth = convertTwipToMM100(fConverted); |