sb123:#i111449# remove all subdirs in complex tests

sc/prj/build.lst

@@ -53,8 +53,5 @@ sc	sc\util							nmake	-	all	sc_util sc_addfu sc_adrot sc_adutil sc_app sc_attr
 # sc      sc\qa\complex\calcPreview                               nmake   -       all     qa_calcpreview   NULL
 
 sc      sc\qa\complex\cellRanges                                  nmake   -       all     qa_cellranges sc_util NULL
-sc      sc\qa\complex\dataPilot\interfaceTests\beans              nmake   -       all     qa_datapilot_ifacetst_beans sc_util NULL
-sc      sc\qa\complex\dataPilot\interfaceTests\container          nmake   -       all     qa_datapilot_ifacetst_container sc_util NULL
-sc      sc\qa\complex\dataPilot\interfaceTests\sheet              nmake   -       all     qa_datapilot_ifacetst_sheet sc_util NULL
 #sc      sc\qa\complex\dataPilot                                   nmake   -       all     qa_datapilot qa_datapilot_ifacetst_beans  qa_datapilot_ifacetst_container qa_datapilot_ifacetst_sheet sc_util NULL
 sc      sc\qa\complex\sc                                          nmake   -       all     qa_sc sc_util NULL

sc/qa/complex/dataPilot/CheckDataPilot.java

@@ -47,10 +47,10 @@ import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.XCloseable;
-import complex.dataPilot.interfaceTests.beans._XPropertySet;
-import complex.dataPilot.interfaceTests.container._XNamed;
-import complex.dataPilot.interfaceTests.sheet._XDataPilotDescriptor;
-import complex.dataPilot.interfaceTests.sheet._XDataPilotTable;
+import complex.dataPilot._XPropertySet;
+import complex.dataPilot._XNamed;
+import complex.dataPilot._XDataPilotDescriptor;
+import complex.dataPilot._XDataPilotTable;
 // import complexlib.ComplexTestCase;
 import lib.StatusException;
 import lib.TestParameters;

sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.java → sc/qa/complex/dataPilot/_XDataPilotDescriptor.java

@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-package complex.dataPilot.interfaceTests.sheet;
+package complex.dataPilot;
 
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;

sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.java → sc/qa/complex/dataPilot/_XDataPilotTable.java

@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-package complex.dataPilot.interfaceTests.sheet;
+package complex.dataPilot;
 
 import com.sun.star.sheet.XDataPilotTable;
 import com.sun.star.table.CellAddress;

sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.java → sc/qa/complex/dataPilot/_XNamed.java

@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-package complex.dataPilot.interfaceTests.container;
+package complex.dataPilot;
 
 import com.sun.star.container.XNamed;
 import lib.TestParameters;

sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.java → sc/qa/complex/dataPilot/_XPropertySet.java

@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-package complex.dataPilot.interfaceTests.beans;
+package complex.dataPilot;
 
 import com.sun.star.beans.Property;
 import com.sun.star.beans.PropertyAttribute;

sc/qa/complex/dataPilot/makefile.mk

@@ -38,13 +38,15 @@ PACKAGE = complex/dataPilot
 JAVATESTFILES = \
     CheckDataPilot.java
 
-JAVAFILES = $(JAVATESTFILES)
+JAVAFILES = $(JAVATESTFILES) \
+    _XDataPilotDescriptor.java \
+    _XDataPilotTable.java \
+    _XNamed.java \
+    _XPropertySet.java
+
 JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
 EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class)
-SUBDIRS         = interfaceTests/beans interfaceTests/container interfaceTests/sheet
-
 .END
 
 .INCLUDE: settings.mk