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-21 10:13:37 +0200 |
commit | e389822312144d3c6525820da8a463da1e298a7e (patch) | |
tree | 5d0a4d413c6f052a41c275348c187eb9eb400f12 /svx | |
parent | d9a0e2fe5bf95bf0bfba424a3625d7f952884932 (diff) |
Added parameter to FillPageColor command
Change-Id: I22943815b69eeb7628eb243e0dbc6c8e0ea3487e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91825
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
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 5261f616308b..23a98354b09f 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -2614,7 +2614,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 1de52ad51ee5..3651205de848 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -1926,6 +1926,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) { |