summaryrefslogtreecommitdiff
path: root/sfx2/qa
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2010-01-19 16:48:52 +0100
committerMichael Stahl <mst@openoffice.org>2010-01-19 16:48:52 +0100
commit2a609ffe951abc0af3b70467f5475b5ee1bb381a (patch)
tree930f992bedbe67c3ddbcbfe1af982da5d99bd5fe /sfx2/qa
parenta8195ceb6cb0a5526377d67da12ca0ce125b7b3b (diff)
sw33bf02: #i108347#: change util::Duration to support MilliSeconds:
SfxDocumentMetaData: adapt. dinfdlg.src: adapt dialog to milliseconds. sax::Converter: adapt. sax::Converter::convertDuration(): fix a bug in parsing fractional seconds.
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 54b0f7afd3be..06770bbde053 100644
--- a/sfx2/qa/complex/DocumentMetaData.java
+++ b/sfx2/qa/complex/DocumentMetaData.java
@@ -370,7 +370,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));
@@ -447,7 +447,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")));
@@ -514,7 +518,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;
}