INTEGRATION: CWS notesapi (1.2.100); FILE MERGED

2005/01/04 16:27:37 sw 1.2.100.1: #i36871#

2 files changed, 29 insertions, 4 deletions

diff --git a/qadevOOo/tests/java/ifc/drawing/_LineProperties.java b/qadevOOo/tests/java/ifc/drawing/_LineProperties.java
index 923b9c9a6..b817a923f 100644
--- a/qadevOOo/tests/java/ifc/drawing/_LineProperties.java
+++ b/qadevOOo/tests/java/ifc/drawing/_LineProperties.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _LineProperties.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change:$Date: 2003-09-08 10:28:55 $
+ *  last change:$Date: 2005-01-13 17:39:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,6 +61,8 @@
 
 package ifc.drawing;
 
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.drawing.LineDash;
 import lib.MultiPropertyTest;
 
 /**
@@ -106,5 +108,27 @@ public class _LineProperties extends MultiPropertyTest {
         log.println("Testing with custom Property tester");
         testProperty("LineStartName", LineTester) ;
     }
+    
+    public void _LineDash() {
+        LineDash aLineDash = new LineDash();
+        LineDash aLineDash2 = new LineDash();
+        aLineDash.DashLen = 5;
+        aLineDash2.DashLen = 1;
+        PropertyValue[] firstValue = new PropertyValue[2];
+        firstValue[0] = new PropertyValue();
+        firstValue[0].Name = "Name";
+        firstValue[0].Value = "Name1";
+        firstValue[1] = new PropertyValue();
+        firstValue[1].Name = "LineDash";
+        firstValue[1].Value = aLineDash;        
+        PropertyValue[] secondValue = new PropertyValue[2];
+        secondValue[0] = new PropertyValue();
+        secondValue[0].Name = "Name";
+        secondValue[0].Value = "Name2";
+        secondValue[1] = new PropertyValue();
+        secondValue[1].Name = "LineDash";
+        secondValue[1].Value = aLineDash2;                
+        testProperty("LineDash",firstValue,secondValue);
+    }
 }
 
diff --git a/qadevOOo/tests/java/ifc/drawing/_XShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_XShapeDescriptor.java
index aa46b8a98..b3300b9ad 100644
--- a/qadevOOo/tests/java/ifc/drawing/_XShapeDescriptor.java
+++ b/qadevOOo/tests/java/ifc/drawing/_XShapeDescriptor.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _XShapeDescriptor.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change:$Date: 2003-09-08 10:32:51 $
+ *  last change:$Date: 2005-01-13 17:39:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -114,6 +114,7 @@ public class _XShapeDescriptor extends MultiMethodTest {
         if (stype.equals("com.sun.star.chart.ChartObject")) result=true;
         if (stype.equals("com.sun.star.drawing.ControlShape")) result=true;
         if (stype.equals("com.sun.star.drawing.ClosedBezierShape")) result=true;
+        if (stype.equals("com.sun.star.drawing.CaptionShape")) result=true;
 
         //Writer has its own behaviour it returns a 'FrameShape'
         if (stype.equals("FrameShape")) result=true;