diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-05-14 13:42:52 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-05-26 16:55:01 +0200 |
| commit | 671cca13e11e48112ec18e6d3f90efff6c177804 (patch) | |
| tree | 713bd0cd2783ab6f0e27f2bad2ebba7dbda405f4 /include | |
| parent | 3c60b9cced6d5deebc1ca46933d3e3dbac923675 (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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94820
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/itemwin.hxx | 4 | ||||
| -rw-r--r-- | include/svx/linectrl.hxx | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index 62a479b870be..03e74fdc5f5f 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -60,7 +60,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; @@ -79,7 +79,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 a2b1a484e18a..37dc0750bc35 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -62,6 +62,8 @@ public: class SVX_DLLPUBLIC SvxLineWidthToolBoxControl : public SfxToolBoxControl { + static MapUnit GetCoreMetric(); + public: SFX_DECL_TOOLBOX_CONTROL(); |