[Libreoffice-commits] core.git: svx/source
Henry Castro (via logerrit)
logerrit at kemper.freedesktop.org
Sun Apr 5 18:19:16 UTC 2020
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 11 +++++++++++
svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 2 ++
2 files changed, 13 insertions(+)
New commits:
commit f9a9938868338985aa10664fb8529f8cc6975003
Author: Henry Castro <hcastro at collabora.com>
AuthorDate: Mon Mar 23 15:34:57 2020 -0400
Commit: Henry Castro <hcastro at collabora.com>
CommitDate: Sun Apr 5 20:18:43 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/+/91576
Tested-by: Jenkins
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 0f0697a40452..9f4d06be9d16 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -39,6 +39,7 @@
#include <svx/svdpagv.hxx>
#include <svx/svdview.hxx>
#include <svx/transfrmhelper.hxx>
+#include <boost/property_tree/json_parser.hpp>
#include <svtools/unitconv.hxx>
@@ -807,6 +808,16 @@ 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 )
{
bool bPosXBlank = false;
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 7e5b7b4eea3b..ccb32fbc4f21 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -65,6 +65,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