diff options
author | Pranam Lashkari <lpranam@collabora.com> | 2020-04-07 18:29:35 +0530 |
---|---|---|
committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-04-23 13:21:49 +0200 |
commit | 24a90870991d2629014b60435e3ca98a64dd3043 (patch) | |
tree | 2fc3c863ba4f480f111f826b0278481934038235 /svx | |
parent | 9ed61699760544b780bd3eb5820d92233cd5fb4d (diff) |
Added parameter to FillPageColor command
Change-Id: I22943815b69eeb7628eb243e0dbc6c8e0ea3487e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92213
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/sdi/svx.sdi | 2 | ||||
-rw-r--r-- | svx/source/xoutdev/xattr.cxx | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index ad31871008af..cb02b6c7816c 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -2629,7 +2629,7 @@ XFillColorItem FillColor SID_ATTR_FILL_COLOR ] XFillColorItem FillPageColor SID_ATTR_PAGE_COLOR - +(SfxStringItem Color SID_ATTR_COLOR_STR) [ /* flags: */ AutoUpdate = TRUE, diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 5de523490104..a015d4af8561 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -1916,6 +1916,18 @@ void XFillColorItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterEndElement(pWriter); } +boost::property_tree::ptree XFillColorItem::dumpAsJSON() const +{ + boost::property_tree::ptree aTree = SfxPoolItem::dumpAsJSON(); + + if (Which() == XATTR_FILLCOLOR) + aTree.put("commandName", ".uno:FillPageColor"); + + aTree.put("state", GetColorValue().AsRGBHexString()); + + return aTree; +} + XSecondaryFillColorItem::XSecondaryFillColorItem(const OUString& rName, const Color& rTheColor) : XColorItem(XATTR_SECONDARYFILLCOLOR, rName, rTheColor) { |