include/svx/xflftrit.hxx | 3 +++ svx/source/svdraw/svdedtv1.cxx | 5 +++++ svx/source/xoutdev/xattr.cxx | 22 +++++++++++++++------- 3 files changed, 23 insertions(+), 7 deletions(-)
New commits: commit 8aecc7786b1dc824c256d7de697b9306f9a8add2 Author: Szymon Kłos <[email protected]> AuthorDate: Fri Nov 29 12:32:24 2019 +0100 Commit: Szymon Kłos <[email protected]> CommitDate: Fri Nov 29 19:16:17 2019 +0100 jsdialogs: send fill transparency type updates Change-Id: I3381968a7afe1f4db09401a0e6ead93b0b22f258 Reviewed-on: https://gerrit.libreoffice.org/84072 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Szymon Kłos <[email protected]> diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index b8c4ed88c30a..c75d2e905c1e 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 - @@ -55,6 +56,8 @@ public: static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); 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 7304c592e8d3..3189215e29cc 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -904,6 +904,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 e083aa5ed5a4..4a898d440fa9 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -1956,25 +1956,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 ""; @@ -2469,6 +2469,14 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM 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), _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
