[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sd/uiconfig vcl/source

[David Tardon]

 sd/uiconfig/simpress/ui/slidetransitionspanel.ui |    3 +++
 vcl/source/control/field.cxx                     |    2 ++
 2 files changed, 5 insertions(+)

New commits:
commit d7aa985411aede915df00881b36cf5914a1cfd22
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Feb 13 14:05:47 2014 +0100

    fdo#74468 fix timing of slide transitions
    
    Regression since commit 16428c9600964a4945cf6fd0d938dea047d1248b.
    
    Change-Id: Id274c21e08d10d2e727f3b5a3fd852cd297e4637
    (cherry picked from commit 78ff9d90f2a74792c437087ede11559c111c5c98)
    Reviewed-on: https://gerrit.libreoffice.org/8029
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
index 7155774..2d7bde2 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 4492147..cb75f3a 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1766,6 +1766,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;