diff options
author | Szymon Kłos <szymon.klos@collabora.com> | 2019-11-29 12:32:24 +0100 |
---|---|---|
committer | Szymon Kłos <szymon.klos@collabora.com> | 2019-11-29 19:16:16 +0100 |
commit | a172516a4ded78d096cb436f1b3328ef3fcd6b50 (patch) | |
tree | c72f62b38ed155f8bc45b42ef3ea46305bb6220d | |
parent | b24fc665c83f734b29e3aeb69150fb1a2fa46331 (diff) |
jsdialogs: send fill transparency type updates
Change-Id: I3381968a7afe1f4db09401a0e6ead93b0b22f258
Reviewed-on: https://gerrit.libreoffice.org/84073
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
-rw-r--r-- | include/svx/xflftrit.hxx | 3 | ||||
-rw-r--r-- | svx/source/svdraw/svdedtv1.cxx | 5 | ||||
-rw-r--r-- | svx/source/xoutdev/xattr.cxx | 22 |
3 files changed, 23 insertions, 7 deletions
diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index df78d6645bd7..a6daf1006535 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -22,6 +22,7 @@ #include <svx/xflgrit.hxx> #include <svx/svxdllapi.h> +#include <boost/property_tree/json_parser.hpp> // class XFillFloatTransparenceItem - @@ -54,6 +55,8 @@ public: static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); std::unique_ptr<XFillFloatTransparenceItem> checkForUniqueItem( SdrModel* pModel ) const; + + virtual boost::property_tree::ptree dumpAsJSON() const override; }; #endif diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 5ce79bfd1721..5439a2810395 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -906,6 +906,11 @@ SfxItemSet SdrEditView::GetAttrFromMarked(bool bOnlyHardAttr) const aSet.ClearItem(EE_FEATURE_LINEBR); aSet.ClearItem(EE_FEATURE_NOTCONV); aSet.ClearItem(EE_FEATURE_FIELD); + + SfxViewShell* pViewShell = SfxViewShell::Current(); + if (pViewShell && comphelper::LibreOfficeKit::isActive()) + pViewShell->sendUnoStatus( &aSet ); + return aSet; } diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 327321bbc7dc..404d2eb9b359 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -1950,25 +1950,25 @@ std::string XGradient::GradientStyleToString(css::awt::GradientStyle eStyle) switch (eStyle) { case css::awt::GradientStyle::GradientStyle_LINEAR: - return "Linear"; + return "LINEAR"; case css::awt::GradientStyle::GradientStyle_AXIAL: - return "Axial"; + return "AXIAL"; case css::awt::GradientStyle::GradientStyle_RADIAL: - return "Radial"; + return "RADIAL"; case css::awt::GradientStyle::GradientStyle_ELLIPTICAL: - return "Elliptical"; + return "ELLIPTICAL"; case css::awt::GradientStyle::GradientStyle_SQUARE: - return "Square"; + return "SQUARE"; case css::awt::GradientStyle::GradientStyle_RECT: - return "Rect"; + return "RECT"; case css::awt::GradientStyle::GradientStyle_MAKE_FIXED_SIZE: - return "FixedSize"; + return "MAKE_FIXED_SIZE"; } return ""; @@ -2448,6 +2448,14 @@ std::unique_ptr<XFillFloatTransparenceItem> XFillFloatTransparenceItem::checkFor return nullptr; } +boost::property_tree::ptree XFillFloatTransparenceItem::dumpAsJSON() const +{ + boost::property_tree::ptree aTree = XFillGradientItem::dumpAsJSON(); + aTree.put("commandName", ".uno:FillFloatTransparence"); + + return aTree; +} + XHatch::XHatch(const Color& rCol, css::drawing::HatchStyle eTheStyle, long nTheDistance, long nTheAngle) : eStyle(eTheStyle), |