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 /sc/source/ui/drawfunc | |
| 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 'sc/source/ui/drawfunc')
| -rw-r--r-- | sc/source/ui/drawfunc/drtxtob.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 6c6165bdc2ac..3e428457f632 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -720,10 +720,10 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) SvxEscapement eEsc = (SvxEscapement) static_cast<const SvxEscapementItem&>( aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) - aItem.SetEscapement( SVX_ESCAPEMENT_OFF ); + if( eEsc == SvxEscapement::Superscript ) + aItem.SetEscapement( SvxEscapement::Off ); else - aItem.SetEscapement( SVX_ESCAPEMENT_SUPERSCRIPT ); + aItem.SetEscapement( SvxEscapement::Superscript ); aNewAttr.Put( aItem ); } break; @@ -734,10 +734,10 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) SvxEscapement eEsc = (SvxEscapement) static_cast<const SvxEscapementItem&>( aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) - aItem.SetEscapement( SVX_ESCAPEMENT_OFF ); + if( eEsc == SvxEscapement::Subscript ) + aItem.SetEscapement( SvxEscapement::Off ); else - aItem.SetEscapement( SVX_ESCAPEMENT_SUBSCRIPT ); + aItem.SetEscapement( SvxEscapement::Subscript ); aNewAttr.Put( aItem ); } break; @@ -1096,9 +1096,9 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) SvxEscapement eEsc = (SvxEscapement) static_cast<const SvxEscapementItem&>( aAttrSet.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) + if( eEsc == SvxEscapement::Superscript ) rDestSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, true ) ); - else if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) + else if( eEsc == SvxEscapement::Subscript ) rDestSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, true ) ); // Unterstreichung |