Related: tdf#121239 overline missing in draw/impress
where underline already exists
Change-Id: I87df3f3965526266b94f10fa04448b32a81fd99a
Reviewed-on: https://gerrit.libreoffice.org/82459
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 6a30f87..73f9bf4 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -2717,6 +2717,11 @@ interface DrawView
ExecMethod = ExecChar ;
StateMethod = GetAttrState ;
]
SID_ATTR_CHAR_OVERLINE
[
ExecMethod = ExecChar ;
StateMethod = GetAttrState ;
]
SID_ATTR_CHAR_UNDERLINE
[
ExecMethod = ExecChar ;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index ebed254..00a595b 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -3542,7 +3542,22 @@ void DrawViewShell::ExecChar( SfxRequest &rReq )
{
FontLineStyle eFU = aEditAttr.Get( EE_CHAR_UNDERLINE ).GetLineStyle();
aNewAttr.Put( SvxUnderlineItem( eFU != LINESTYLE_NONE ?LINESTYLE_NONE : LINESTYLE_SINGLE, EE_CHAR_UNDERLINE ) );
}//aNewAttr.Put( (const SvxUnderlineItem&)aEditAttr.Get( EE_CHAR_UNDERLINE ) );
}
}
break;
case SID_ATTR_CHAR_OVERLINE:
if( rReq.GetArgs() )
{
const SvxOverlineItem* pItem = rReq.GetArg<SvxOverlineItem>(SID_ATTR_CHAR_OVERLINE);
if (pItem)
{
aNewAttr.Put(*pItem);
}
else
{
FontLineStyle eFU = aEditAttr.Get( EE_CHAR_OVERLINE ).GetLineStyle();
aNewAttr.Put( SvxOverlineItem( eFU != LINESTYLE_NONE ?LINESTYLE_NONE : LINESTYLE_SINGLE, EE_CHAR_OVERLINE ) );
}
}
break;
case SID_ATTR_CHAR_SHADOWED:
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 0c28df0..0ecfefe 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -389,6 +389,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
case SID_ATTR_CHAR_FONTHEIGHT:
case SID_ATTR_CHAR_SHADOWED:
case SID_ATTR_CHAR_POSTURE:
case SID_ATTR_CHAR_OVERLINE:
case SID_ATTR_CHAR_UNDERLINE:
case SID_ATTR_CHAR_STRIKEOUT:
case SID_ATTR_CHAR_WEIGHT:
