summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2014-02-13 14:05:47 +0100
committerDavid Tardon <dtardon@redhat.com>2014-02-13 14:19:46 +0100
commit78ff9d90f2a74792c437087ede11559c111c5c98 (patch)
tree88e6e86af3480da655e1de2cceb97ffca509e824
parent515b5c7688631679fe1d39932478a835dc0a35a2 (diff)
fdo#74468 fix timing of slide transitions
Regression since commit 16428c9600964a4945cf6fd0d938dea047d1248b. Change-Id: Id274c21e08d10d2e727f3b5a3fd852cd297e4637
-rw-r--r--sd/uiconfig/simpress/ui/slidetransitionspanel.ui3
-rw-r--r--vcl/source/control/field.cxx2
2 files changed, 5 insertions, 0 deletions
diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
index 715577407c1f..2d7bde2be671 100644
--- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
+++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
@@ -255,6 +255,9 @@
<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>
<packing>
<property name="left_attach">1</property>
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 96bfbdb25c74..e71820220872 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1596,6 +1596,8 @@ bool MetricField::set_property(const OString &rKey, const OString &rValue)
}
else if (rKey == "digits")
SetDecimalDigits(rValue.toInt32());
+ else if (rKey == "spin-size")
+ SetSpinSize(rValue.toInt32());
else
return SpinField::set_property(rKey, rValue);
return true;