2 files changed, 20 insertions, 7 deletions
diff --git a/testtools/com/sun/star/comp/bridge/TestComponent.java b/testtools/com/sun/star/comp/bridge/TestComponent.java
index f5f5c1f455b8..c63ff7fe2293 100644
--- a/testtools/com/sun/star/comp/bridge/TestComponent.java
+++ b/testtools/com/sun/star/comp/bridge/TestComponent.java
@@ -47,7 +47,10 @@ import test.testtools.bridgetest.TestStruct;
 import test.testtools.bridgetest.SmallStruct;
 import test.testtools.bridgetest.MediumStruct;
 import test.testtools.bridgetest.BigStruct;
-import test.testtools.bridgetest.AllFloats;
+import test.testtools.bridgetest.TwoFloats;
+import test.testtools.bridgetest.FourFloats;
+import test.testtools.bridgetest.MixedFloatAndInteger;
+import test.testtools.bridgetest.ThreeByteStruct;
 import test.testtools.bridgetest.XBridgeTest;
 import test.testtools.bridgetest.XBridgeTest2;
 import test.testtools.bridgetest.XCurrentContextChecker;
@@ -488,7 +491,19 @@ public class TestComponent {
             return i_Struct;
         }
 
-        public AllFloats echoAllFloats( AllFloats i_Struct) throws com.sun.star.uno.RuntimeException {
+        public TwoFloats echoTwoFloats( TwoFloats i_Struct) throws com.sun.star.uno.RuntimeException {
+            return i_Struct;
+        }
+
+        public FourFloats echoFourFloats( FourFloats i_Struct) throws com.sun.star.uno.RuntimeException {
+            return i_Struct;
+        }
+
+        public MixedFloatAndInteger echoMixedFloatAndInteger( MixedFloatAndInteger i_Struct) throws com.sun.star.uno.RuntimeException {
+            return i_Struct;
+        }
+
+        public ThreeByteStruct echoThreeByteStruct( ThreeByteStruct i_Struct) throws com.sun.star.uno.RuntimeException {
             return i_Struct;
         }
 
diff --git a/testtools/com/sun/star/comp/bridge/makefile.mk b/testtools/com/sun/star/comp/bridge/makefile.mk
index 6f0129ac7b48..7083f2381698 100644
--- a/testtools/com/sun/star/comp/bridge/makefile.mk
+++ b/testtools/com/sun/star/comp/bridge/makefile.mk
@@ -30,17 +30,16 @@ PRJNAME=testtools
 PACKAGE=com$/sun$/star$/comp$/bridge
 TARGET=com_sun_star_comp_bridge
 
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
 
 # ------------------------------------------------------------------
 
+.IF "$(SOLAR_JAVA)" != ""
 
 JARFILES 		= ridl.jar jurt.jar juh.jar
 
-
 JAVACLASSFILES= \
     $(CLASSDIR)$/$(PACKAGE)$/CurrentContextChecker.class \
     $(CLASSDIR)$/$(PACKAGE)$/TestComponent.class \
@@ -48,14 +47,13 @@ JAVACLASSFILES= \
 
 JAVAFILES		= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
 
-
 JARCLASSDIRS	= $(PACKAGE) test$/testtools$/bridgetest
 JARTARGET		= testComponent.jar
 JARCOMPRESS 	= TRUE
 CUSTOMMANIFESTFILE = manifest
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
-
-