summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2019-11-29 12:32:24 +0100
committerSzymon Kłos <szymon.klos@collabora.com>2019-11-29 19:16:16 +0100
commita172516a4ded78d096cb436f1b3328ef3fcd6b50 (patch)
treec72f62b38ed155f8bc45b42ef3ea46305bb6220d /svx
parentb24fc665c83f734b29e3aeb69150fb1a2fa46331 (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>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdedtv1.cxx5
-rw-r--r--svx/source/xoutdev/xattr.cxx22
2 files changed, 20 insertions, 7 deletions
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),