summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-05-14 13:42:52 +0100
committerXisco Faulí <xiscofauli@libreoffice.org>2020-05-19 20:34:39 +0200
commitf53a6e025e58f723d15ac601b3759b5929c83627 (patch)
tree771abc367981738650e02afb0f69eca2207f4734 /include
parent595fcef52915f0ac54ea704b0f9dee85b43efa56 (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/+/94203 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
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 dc8b8682a98c..7f46e8f020e3 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -61,7 +61,7 @@ class SVX_DLLPUBLIC SvxMetricField : public MetricField
using Window::Update;
OUString aCurTxt;
- MapUnit ePoolUnit;
+ MapUnit eDestPoolUnit;
FieldUnit eDlgUnit;
Size aLogicalSize;
css::uno::Reference< css::frame::XFrame > mxFrame;
@@ -80,7 +80,7 @@ public:
const css::uno::Reference< css::frame::XFrame >& rFrame );
void Update( const XLineWidthItem* pItem );
- void SetCoreUnit( MapUnit eUnit );
+ void SetDestCoreUnit( MapUnit eUnit );
void RefreshDlgUnit();
};
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index 68f92e9a64fa..d3c1e394b970 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -57,6 +57,8 @@ public:
class SVX_DLLPUBLIC SvxLineWidthToolBoxControl final : public SfxToolBoxControl
{
+ static MapUnit GetCoreMetric();
+
public:
SFX_DECL_TOOLBOX_CONTROL();