diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-02-21 00:30:16 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-02-21 08:11:23 +0100 |
commit | f00e891f3369f7b8c2532634d9ff4ab19da17c33 (patch) | |
tree | 752901b046836b0aab906cd7966a178636bf290e /include/svtools | |
parent | ba8a70365ef459c967cd8a71a6d48ca53dd341bd (diff) |
tdf#115892: properly get the box' saved value
Previously textual value like "10,5 pt" was converted to int as simply
10 (multiplied by 10, it became 100), which compared as different from
unchanged value of 105. This made the fractional values to be treated
as always changed.
This patch uses the same code to convert saved value as is used for
current edit box value.
Change-Id: I09a84a6bf33b17e0192b79b31af21ef14d7e9c63
Reviewed-on: https://gerrit.libreoffice.org/50066
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include/svtools')
-rw-r--r-- | include/svtools/ctrlbox.hxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index b446b7a0503d..5e557e24777f 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -362,6 +362,7 @@ class SVT_DLLPUBLIC FontSizeBox : public MetricBox protected: virtual OUString CreateFieldText( sal_Int64 nValue ) const override; + virtual sal_Int64 GetValueFromStringUnit(const OUString& rStr, FieldUnit eOutUnit) const override; public: FontSizeBox( vcl::Window* pParent, WinBits nWinStyle ); @@ -384,8 +385,6 @@ public: virtual void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ) override; virtual void SetValue( sal_Int64 nNewValue ) override; - virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const override; - virtual sal_Int64 GetValue() const override; private: FontSizeBox( const FontSizeBox& ) = delete; |