diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-11-11 21:30:04 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-11-12 14:02:47 +0100 |
| commit | aa7b71aaa49ea2cffe85aa8d68f933588b3d829a (patch) | |
| tree | 2d805d8de6437655082a60331bc5a9fd8fd7955e /sd | |
| parent | 1a2926a995fdbdcdae0ca6407877084f3520e539 (diff) | |
Related: tdf#121239 missing contour toggle in draw/impress
Change-Id: I384ba1f4fc67d1da7738f25f8b5d3fade315342c
Reviewed-on: https://gerrit.libreoffice.org/82471
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/sdi/_drvwsh.sdi | 5 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 12 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewsf.cxx | 1 |
3 files changed, 18 insertions, 0 deletions
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index 69fde762bfee..dd64ae35cd4e 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -2757,6 +2757,11 @@ interface DrawView ExecMethod = ExecChar ; StateMethod = GetAttrState ; ] + SID_ATTR_CHAR_CONTOUR // ole : ?, status : ? + [ + ExecMethod = ExecChar ; + StateMethod = GetAttrState; + ] SID_ATTR_CHAR_COLOR [ ExecMethod = ExecChar ; diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 435aea90a925..664609e87597 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -39,6 +39,7 @@ #include <comphelper/propertysequence.hxx> #include <comphelper/scopeguard.hxx> +#include <editeng/contouritem.hxx> #include <editeng/editdata.hxx> #include <editeng/eeitem.hxx> #include <editeng/flditem.hxx> @@ -3602,6 +3603,17 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) } } break; + case SID_ATTR_CHAR_CONTOUR: + if( rReq.GetArgs() ) + { + const SvxContourItem* pItem = rReq.GetArg<SvxContourItem>(SID_ATTR_CHAR_CONTOUR); + if (pItem) + { + aNewAttr.Put(*pItem); + } + } + break; + case SID_ATTR_CHAR_STRIKEOUT: if( rReq.GetArgs() ) { diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index f5bffd9929d4..565283ce1c3a 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -426,6 +426,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) case SID_ATTR_CHAR_OVERLINE: case SID_ATTR_CHAR_UNDERLINE: case SID_ATTR_CHAR_STRIKEOUT: + case SID_ATTR_CHAR_CONTOUR: case SID_ATTR_CHAR_WEIGHT: case SID_ATTR_CHAR_COLOR: case SID_ATTR_CHAR_KERNING: |