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 /forms/source/richtext | |
| 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 'forms/source/richtext')
| -rw-r--r-- | forms/source/richtext/rtattributehandler.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index fce2049d9ae3..ededc66730cb 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -237,12 +237,12 @@ namespace frm EscapementHandler::EscapementHandler( AttributeId _nAttributeId ) :AttributeHandler( _nAttributeId, EE_CHAR_ESCAPEMENT ) - ,m_eEscapement( SVX_ESCAPEMENT_OFF ) + ,m_eEscapement( SvxEscapement::Off ) { switch ( getAttribute() ) { - case SID_SET_SUPER_SCRIPT : m_eEscapement = SVX_ESCAPEMENT_SUPERSCRIPT; break; - case SID_SET_SUB_SCRIPT : m_eEscapement = SVX_ESCAPEMENT_SUBSCRIPT; break; + case SID_SET_SUPER_SCRIPT : m_eEscapement = SvxEscapement::Superscript; break; + case SID_SET_SUB_SCRIPT : m_eEscapement = SvxEscapement::Subscript; break; default: OSL_FAIL( "EscapementHandler::EscapementHandler: invalid slot!" ); break; @@ -264,7 +264,7 @@ namespace frm (void)_pAdditionalArg; bool bIsChecked = getCheckState( _rCurrentAttribs ) == eChecked; - _rNewAttribs.Put( SvxEscapementItem( bIsChecked ? SVX_ESCAPEMENT_OFF : m_eEscapement, getWhich() ) ); + _rNewAttribs.Put( SvxEscapementItem( bIsChecked ? SvxEscapement::Off : m_eEscapement, getWhich() ) ); } SlotHandler::SlotHandler( AttributeId _nAttributeId, WhichId _nWhichId ) |