summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/drviews2.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-08-16 13:39:18 +0200
committerNoel Grandin <noel@peralex.com>2016-08-17 08:45:15 +0200
commit430b93f7f3c9f5aeb89db634447cb554acd125aa (patch)
treea38e466a9f8cacfe753ac7373016ce01191bbfa9 /sd/source/ui/view/drviews2.cxx
parent49561be0fd2041fc9d32c4ac1ab1063f620a4e08 (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 'sd/source/ui/view/drviews2.cxx')
-rw-r--r--sd/source/ui/view/drviews2.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index abe829c7fc37..db985f2db4eb 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -3039,10 +3039,10 @@ void DrawViewShell::ExecChar( SfxRequest &rReq )
SvxEscapementItem aItem( EE_CHAR_ESCAPEMENT );
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;
@@ -3051,10 +3051,10 @@ void DrawViewShell::ExecChar( SfxRequest &rReq )
SvxEscapementItem aItem( EE_CHAR_ESCAPEMENT );
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;