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

Henry Castro (via logerrit) logerrit at kemper.freedesktop.org
Wed May 20 22:40:52 UTC 2020


 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |    9 +++++++++
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx |    2 ++
 2 files changed, 11 insertions(+)

New commits:
commit 6d2b3e68c0b2929177ad61fb4b6c377bd44d0829
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Mon Mar 23 15:34:57 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Thu May 21 00:40:20 2020 +0200

    lok: update the measure units if changed
    
    Change-Id: If793e5e678277e27d66e7bcfbf3fbec999e46c63
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90937
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94515
    Tested-by: Henry Castro <hcastro at collabora.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 148d8e696be7..5dde7497a0d8 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -866,6 +866,15 @@ void PosSizePropertyPanel::executeSize()
     }
 }
 
+boost::property_tree::ptree PosSizePropertyPanel::DumpAsPropertyTree()
+{
+    if (meDlgUnit != GetCurrentUnit(SfxItemState::DEFAULT, nullptr))
+    {
+        mpBindings->Update( SID_ATTR_METRIC );
+    }
+
+    return PanelLayout::DumpAsPropertyTree();
+}
 
 void PosSizePropertyPanel::MetricState( SfxItemState eState, const SfxPoolItem* pState )
 {
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 2ac505428c36..ab72632649c9 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -73,6 +73,8 @@ public:
         const SfxItemState eState,
         const SfxPoolItem* pState) override;
 
+    virtual boost::property_tree::ptree DumpAsPropertyTree() override;
+
     SfxBindings* GetBindings() { return mpBindings;}
 
     // constructor/destructor


More information about the Libreoffice-commits mailing list