summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-05-14 13:42:52 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-05-14 17:27:55 +0200
commitdadc965b6ff5b86526420c5f1812fe4baca52b3d (patch)
tree4b749bcb9f246fa8226479d78e6e0aa6472bc929 /include
parenta9a19777d53beb762fabad3a67ddc68ad75bca6c (diff)
tdf#132169 we always get the value in MapUnit::Map100thMM
but must set it in the core metric of the target application since... commit f7c751439d4616f43509301d71af92b13b576a84 Date: Thu Nov 7 15:53:49 2019 +0100 jsdialog: consume .uno:LineWidth double value added parameters for online, but with parameters its no longer considered a simple slot and for non-simple slots the auto-conversion of values to/from twips isn't done. there's probably a much and older deeper bug here, but lets get this known broken line width working Change-Id: I8683431f02d2d14936411d35ba070944b9b80e1f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94200 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/svx/itemwin.hxx4
-rw-r--r--include/svx/linectrl.hxx2
2 files changed, 4 insertions, 2 deletions
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index 02ca9548bd45..f7da4cc9becf 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -52,7 +52,7 @@ class SvxMetricField final : public InterimItemWindow
private:
std::unique_ptr<weld::MetricSpinButton> m_xWidget;
int nCurValue;
- MapUnit ePoolUnit;
+ MapUnit eDestPoolUnit;
FieldUnit eDlgUnit;
css::uno::Reference< css::frame::XFrame > mxFrame;
@@ -73,7 +73,7 @@ public:
virtual ~SvxMetricField() override;
void Update( const XLineWidthItem* pItem );
- void SetCoreUnit( MapUnit eUnit );
+ void SetDestCoreUnit( MapUnit eUnit );
void RefreshDlgUnit();
void set_sensitive(bool bSensitive);
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index 657d0f7d9262..62f428aa5136 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -69,6 +69,8 @@ private:
class SVX_DLLPUBLIC SvxLineWidthToolBoxControl final : public SfxToolBoxControl
{
+ static MapUnit GetCoreMetric();
+
public:
SFX_DECL_TOOLBOX_CONTROL();