diff options
author | Noel Grandin <noel@peralex.com> | 2016-08-16 13:39:18 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-08-17 08:45:15 +0200 |
commit | 430b93f7f3c9f5aeb89db634447cb554acd125aa (patch) | |
tree | a38e466a9f8cacfe753ac7373016ce01191bbfa9 /sw/source/filter/html/htmlatr.cxx | |
parent | 49561be0fd2041fc9d32c4ac1ab1063f620a4e08 (diff) |
convert SvxEscapement to scoped enum
and fix a potential bug with footnotes and superscripts in writer in
ndtxt.cxx, where it was passing bad args to the SvxEscapementItem
constructor
Change-Id: I0d2de34c056e7824f3b456a86d502e10ac93a1c1
Diffstat (limited to 'sw/source/filter/html/htmlatr.cxx')
-rw-r--r-- | sw/source/filter/html/htmlatr.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index a842c8f437a8..1a116fc84c44 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -1223,11 +1223,11 @@ HTMLOnOffState HTMLEndPosLst::GetHTMLItemState( const SfxPoolItem& rItem ) switch( (const SvxEscapement) static_cast<const SvxEscapementItem&>(rItem).GetEnumValue() ) { - case SVX_ESCAPEMENT_SUPERSCRIPT: - case SVX_ESCAPEMENT_SUBSCRIPT: + case SvxEscapement::Superscript: + case SvxEscapement::Subscript: eState = HTML_ON_VALUE; break; - case SVX_ESCAPEMENT_OFF: + case SvxEscapement::Off: eState = HTML_OFF_VALUE; break; default: @@ -2812,8 +2812,8 @@ static Writer& OutHTML_SvxEscapement( Writer& rWrt, const SfxPoolItem& rHt ) const sal_Char *pStr = nullptr; switch( eEscape ) { - case SVX_ESCAPEMENT_SUPERSCRIPT: pStr = OOO_STRING_SVTOOLS_HTML_superscript; break; - case SVX_ESCAPEMENT_SUBSCRIPT: pStr = OOO_STRING_SVTOOLS_HTML_subscript; break; + case SvxEscapement::Superscript: pStr = OOO_STRING_SVTOOLS_HTML_superscript; break; + case SvxEscapement::Subscript: pStr = OOO_STRING_SVTOOLS_HTML_subscript; break; default: ; } |