diff options
author | Lars Langhans <lla@openoffice.org> | 2010-08-23 10:38:44 +0200 |
---|---|---|
committer | Lars Langhans <lla@openoffice.org> | 2010-08-23 10:38:44 +0200 |
commit | 43a2391a2e5e81f88cd25efa1deb6fc260cc2104 (patch) | |
tree | 4d8ce44e23708b4c9d50810493efcb88be8aa781 /sc/qa | |
parent | sb123: #i111449# building sc/qa/complex/dataPilot fails due to SUBDIRS in mak... (diff) | |
download | core-43a2391a2e5e81f88cd25efa1deb6fc260cc2104.tar.gz core-43a2391a2e5e81f88cd25efa1deb6fc260cc2104.zip |
sb123:#i111449# remove all subdirs in complex tests
Diffstat (limited to 'sc/qa')
-rw-r--r-- | sc/qa/complex/dataPilot/CheckDataPilot.java | 8 | ||||
-rw-r--r-- | sc/qa/complex/dataPilot/_XDataPilotDescriptor.java (renamed from sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.java) | 2 | ||||
-rw-r--r-- | sc/qa/complex/dataPilot/_XDataPilotTable.java (renamed from sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.java) | 2 | ||||
-rw-r--r-- | sc/qa/complex/dataPilot/_XNamed.java (renamed from sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.java) | 2 | ||||
-rw-r--r-- | sc/qa/complex/dataPilot/_XPropertySet.java (renamed from sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.java) | 2 | ||||
-rw-r--r-- | sc/qa/complex/dataPilot/makefile.mk | 10 |
6 files changed, 14 insertions, 12 deletions
diff --git a/sc/qa/complex/dataPilot/CheckDataPilot.java b/sc/qa/complex/dataPilot/CheckDataPilot.java index 5fae88450c04..b042f259072e 100644 --- a/sc/qa/complex/dataPilot/CheckDataPilot.java +++ b/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; diff --git a/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.java b/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java index a0cd423fc2a3..e611d8f4e147 100644 --- a/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.java +++ b/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; diff --git a/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.java b/sc/qa/complex/dataPilot/_XDataPilotTable.java index 29c6274ef7a8..e27daffab985 100644 --- a/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.java +++ b/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; diff --git a/sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.java b/sc/qa/complex/dataPilot/_XNamed.java index d92b680e197e..ff4c647307d5 100644 --- a/sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.java +++ b/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; diff --git a/sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.java b/sc/qa/complex/dataPilot/_XPropertySet.java index cae15163cbaa..e598a0c28890 100644 --- a/sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.java +++ b/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; diff --git a/sc/qa/complex/dataPilot/makefile.mk b/sc/qa/complex/dataPilot/makefile.mk index 2777971e2f5a..85512f8e5bc4 100644 --- a/sc/qa/complex/dataPilot/makefile.mk +++ b/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 |