diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-03-21 16:57:27 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-21 17:00:28 +0000 |
commit | 3b1cca8c547ce53b2af29b3edecc22c7694a0621 (patch) | |
tree | 326e1300555a43469232223580065c76ef58c1cd | |
parent | coverity#982461 Unchecked dynamic_cast (diff) | |
download | core-3b1cca8c547ce53b2af29b3edecc22c7694a0621.tar.gz core-3b1cca8c547ce53b2af29b3edecc22c7694a0621.zip |
Related: fdo#74468 drop hard-coded 'sec' and use FUNIT_SECONDS
Change-Id: I11e2aa39d77c01446387b13ba4bc9f40b61a958a
-rw-r--r-- | sd/uiconfig/simpress/ui/slidetransitionspanel.ui | 1 | ||||
-rw-r--r-- | vcl/source/control/field.cxx | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui index 2d7bde2be671..52836f355e55 100644 --- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui +++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui @@ -255,7 +255,6 @@ <property name="can_focus">True</property> <property name="invisible_char">●</property> <property name="invisible_char_set">True</property> - <property name="format">sec</property> <property name="digits">2</property> <property name="spin_size">25</property> </object> diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index ad67f9ffc047..bd60588d78e4 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1592,12 +1592,7 @@ Size MetricField::CalcMinimumSize() const bool MetricField::set_property(const OString &rKey, const OString &rValue) { - if (rKey == "format") - { - maCustomUnitText = OStringToOUString(rValue, RTL_TEXTENCODING_UTF8); - meUnit = FUNIT_CUSTOM; - } - else if (rKey == "digits") + if (rKey == "digits") SetDecimalDigits(rValue.toInt32()); else if (rKey == "spin-size") SetSpinSize(rValue.toInt32()); |