[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - include/svl svl/source sw/source

[Szymon Kłos (via logerrit)]

 include/svl/intitem.hxx           |    3 +++
 svl/source/items/intitem.cxx      |    8 ++++++++
 sw/source/uibase/shells/grfsh.cxx |    7 +++++++
 3 files changed, 18 insertions(+)

New commits:
commit 601a0173497bd4995d16e1529bf8964845855df2
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Nov 26 15:03:27 2019 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Nov 28 08:34:51 2019 +0100

    jsdialogs: send graphic items updates
    
    Change-Id: I57d05726f80115b92e7599a7d033bf1ea8f79695
    Reviewed-on: https://gerrit.libreoffice.org/83773
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx
index 448eda8a514b..c72ae3ad52d4 100644
--- a/include/svl/intitem.hxx
+++ b/include/svl/intitem.hxx
@@ -22,6 +22,7 @@
 
 #include <svl/svldllapi.h>
 #include <svl/cintitem.hxx>
+#include <boost/property_tree/json_parser.hpp>
 
 
 class SVL_DLLPUBLIC SfxByteItem: public CntByteItem
@@ -59,6 +60,8 @@ public:
                                                 const IntlWrapper&)
         const override;
 
+    virtual boost::property_tree::ptree dumpAsJSON() const override;
+
     virtual bool QueryValue( css::uno::Any& rVal,
                              sal_uInt8 nMemberId = 0 ) const override;
 
diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx
index 37d07926e2bf..7a80264d3039 100644
--- a/svl/source/items/intitem.cxx
+++ b/svl/source/items/intitem.cxx
@@ -75,6 +75,14 @@ bool SfxInt16Item::GetPresentation(SfxItemPresentation,
 }
 
 
+boost::property_tree::ptree SfxInt16Item::dumpAsJSON() const
+{
+    boost::property_tree::ptree aTree = SfxPoolItem::dumpAsJSON();
+    aTree.put("state", GetValue());
+    return aTree;
+}
+
+
 // virtual
 bool SfxInt16Item::QueryValue(css::uno::Any& rVal, sal_uInt8) const
 {
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 01ee602142d9..c1c837d0808f 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -76,6 +76,9 @@
 #include <unocrsr.hxx>
 #include <memory>
 
+#include <comphelper/lok.hxx>
+#include <LibreOfficeKit/LibreOfficeKitEnums.h>
+
 #define TOOLBOX_NAME "colorbar"
 
 class SwGrfShell::SwExternalToolEdit
@@ -920,6 +923,10 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
         nWhich = aIter.NextWhich();
     }
     SetGetStateSet( nullptr );
+
+    SfxViewShell* pViewShell = GetShell().GetSfxViewShell();
+    if (pViewShell && comphelper::LibreOfficeKit::isActive())
+        pViewShell->sendUnoStatus( &rSet );
 }
 
 void SwGrfShell::ExecuteRotation(SfxRequest const &rReq)