sd/sdi/_drvwsh.sdi | 5 +++++
sd/source/ui/view/drviews2.cxx | 12 ++++++++++++
sd/source/ui/view/drviewsf.cxx | 1 +
3 files changed, 18 insertions(+)
New commits:
commit aa7b71aaa49ea2cffe85aa8d68f933588b3d829a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Nov 11 21:30:04 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Nov 12 14:02:47 2019 +0100
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
