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

Szymon Kłos (via logerrit) logerrit at kemper.freedesktop.org
Thu Nov 21 14:13:06 UTC 2019


 include/svx/itemwin.hxx         |    1 +
 svx/source/tbxctrls/itemwin.cxx |    7 +++++++
 2 files changed, 8 insertions(+)

New commits:
commit 9e700aa47570ebd0abfdf9b2c7f78e4a9786d05b
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Nov 18 13:39:54 2019 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Nov 21 15:12:01 2019 +0100

    jsdialogs: export FillStyle command to JSON
    
    Change-Id: I4115580bd3aad807c43fb8aaa20c898ad84cbab6
    Reviewed-on: https://gerrit.libreoffice.org/83381
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index a50126eb6440..62a479b870be 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -89,6 +89,7 @@ public:
     SvxFillTypeBox( vcl::Window* pParent );
 
     void            Selected() { bSelect = true; }
+    virtual boost::property_tree::ptree DumpAsPropertyTree() override;
 
 protected:
     virtual bool    PreNotify( NotifyEvent& rNEvt ) override;
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index c41ba2a86dc1..5dd5ae966506 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -456,6 +456,13 @@ void SvxFillTypeBox::ReleaseFocus_Impl()
     }
 }
 
+boost::property_tree::ptree SvxFillTypeBox::DumpAsPropertyTree()
+{
+    boost::property_tree::ptree aTree = FillTypeLB::DumpAsPropertyTree();
+    aTree.put("command", ".uno:FillStyle");
+    return aTree;
+}
+
 SvxFillAttrBox::SvxFillAttrBox( vcl::Window* pParent ) :
     ListBox(pParent, WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL | WB_TABSTOP),
     nCurPos( 0 )


More information about the Libreoffice-commits mailing list