summaryrefslogtreecommitdiff
path: root/sfx2/qa
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2010-04-07 13:14:23 +0200
committersb <sb@openoffice.org>2010-04-07 13:14:23 +0200
commita28edb7950d225af13b0107f529efd2cefaad213 (patch)
treea48cdb9e86d45dc49015b1dcd7abb8053fcc7ca8 /sfx2/qa
parent9207e47b5eea02b02abcf6450a990992d677c750 (diff)
parenta39db3bbdbfa3867733328b4e36bd45c23d95b1d (diff)
sb118: merged in re/DEV300_next towards DEV300_m76
Diffstat (limited to 'sfx2/qa')
-rw-r--r--sfx2/qa/complex/DocumentMetaData.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/sfx2/qa/complex/DocumentMetaData.java b/sfx2/qa/complex/DocumentMetaData.java
index de3b22f299..e4ed104c4a 100644
--- a/sfx2/qa/complex/DocumentMetaData.java
+++ b/sfx2/qa/complex/DocumentMetaData.java
@@ -367,7 +367,7 @@ public class DocumentMetaData extends ComplexTestCase
dur.Hours = 777;
dur.Minutes = 666;
dur.Seconds = 555;
- dur.HundredthSeconds = 444;
+ dur.MilliSeconds = 444;
udpc.addProperty("Frobnicate", PropertyAttribute.REMOVEABLE,
new Boolean(b));
@@ -444,7 +444,11 @@ public class DocumentMetaData extends ComplexTestCase
udps.getPropertyValue("Frobnicate")));
assure ("UserDefined duration", eqDuration(dur, (Duration)
udps.getPropertyValue("FrobDuration")));
- assure ("UserDefined time", eqTime(t, (Time)
+ // this is now a Duration!
+ Duration t_dur = new Duration(false, (short)0, (short)0, (short)0,
+ t.Hours, t.Minutes, t.Seconds,
+ (short)(10 * t.HundredthSeconds));
+ assure ("UserDefined time", eqDuration(t_dur, (Duration)
udps.getPropertyValue("FrobDuration2")));
assure ("UserDefined date", eqDate(date, (Date)
udps.getPropertyValue("FrobEndDate")));
@@ -511,7 +515,7 @@ public class DocumentMetaData extends ComplexTestCase
return a.Years == b.Years && a.Months == b.Months && a.Days == b.Days
&& a.Hours == b.Hours && a.Minutes == b.Minutes
&& a.Seconds == b.Seconds
- && a.HundredthSeconds == b.HundredthSeconds
+ && a.MilliSeconds == b.MilliSeconds
&& a.Negative == b.Negative;
}