wizards/com/sun/star/wizards/document/Control.java | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 148770af39a82f52a5d267e40941684791df4c66
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Wed Oct 30 05:35:42 2013 +0100
fdo#70674 adapt wizard code to incompatible Date/Time API change
Change-Id: I0338777bf46c10f6082c7eb3886883e92952eb99
Reviewed-on: https://gerrit.libreoffice.org/6482
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/wizards/com/sun/star/wizards/document/Control.java
b/wizards/com/sun/star/wizards/document/Control.java
index cf5c9c0..e8b78f1 100644
--- a/wizards/com/sun/star/wizards/document/Control.java
+++ b/wizards/com/sun/star/wizards/document/Control.java
@@ -34,6 +34,8 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.AnyConverter;
import com.sun.star.drawing.XShapes;
import com.sun.star.lang.IllegalArgumentException;
+import com.sun.star.util.Date;
+import com.sun.star.util.Time;
public class Control extends Shape
{
@@ -304,13 +306,22 @@ public class Control extends Shape
}
else if (getControlType() == FormHandler.SODATECONTROL)
{
- xPropertySet.setPropertyValue("Date", 4711); //TODO find
a better date
+ Date d = new Date();
+ d.Day = 30;
+ d.Month = 12;
+ d.Year = 9999;
+ xPropertySet.setPropertyValue("Date", d);
aPreferredSize = getPeer().getPreferredSize();
xPropertySet.setPropertyValue("Date",
com.sun.star.uno.Any.VOID);
}
else if (getControlType() == FormHandler.SOTIMECONTROL)
{
- xPropertySet.setPropertyValue("Time", 47114); //TODO find
a better time
+ Time t = new Time();
+ t.NanoSeconds = 999999999;
+ t.Seconds = 59;
+ t.Minutes = 59;
+ t.Hours = 22;
+ xPropertySet.setPropertyValue("Time", t);
aPreferredSize = getPeer().getPreferredSize();
xPropertySet.setPropertyValue("Time",
com.sun.star.uno.Any.VOID);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
