rebase to DEV300_m69

6 files changed, 8 insertions, 8 deletions

diff --git a/stoc/test/javavm/testapplet/TestApplet.java b/stoc/test/javavm/testapplet/TestApplet.java
index 07467cc54c0f..55916cff784b 100644
--- a/stoc/test/javavm/testapplet/TestApplet.java
+++ b/stoc/test/javavm/testapplet/TestApplet.java
@@ -5,7 +5,6 @@ import java.io.IOException;
 import java.net.URL;
 import java.io.InputStream;
 import java.net.MalformedURLException;
-import com.sun.star.lib.sandbox.*;
 /*
  * TestApplet.java
  *
diff --git a/stoc/test/javavm/testapplet/makefile.mk b/stoc/test/javavm/testapplet/makefile.mk
index 706180655f06..da5a21e4f166 100644
--- a/stoc/test/javavm/testapplet/makefile.mk
+++ b/stoc/test/javavm/testapplet/makefile.mk
@@ -40,7 +40,7 @@ TARGET  = TestApplet
 #.INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE : settings.mk
 # Files --------------------------------------------------------
-JARFILES = sandbox.jar ridl.jar jurt.jar unoil.jar
+JARFILES = ridl.jar jurt.jar unoil.jar
 
 JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
 
diff --git a/stoc/test/javavm/testcomponent/TestComponent.java b/stoc/test/javavm/testcomponent/TestComponent.java
index a0fb1d01a858..5622ba087d7a 100644
--- a/stoc/test/javavm/testcomponent/TestComponent.java
+++ b/stoc/test/javavm/testcomponent/TestComponent.java
@@ -4,7 +4,7 @@ import com.sun.star.uno.*;
 import com.sun.star.registry.XRegistryKey;
 import java.io.*;
 import java.net.*;
-import com.sun.star.lib.sandbox.*;
+//import com.sun.star.lib.sandbox.*;
 
 
 /** This component implements XTypeProvider for use with StarBasic.
@@ -74,10 +74,11 @@ public class TestComponent implements XServiceInfo, XTypeProvider
         }catch( IOException e) {
             String s= e.getMessage();
             System.out.println(s);
-        }catch( SandboxSecurityException sse) {
+        }/*catch( SandboxSecurityException sse) {
             String s= sse.getMessage();
             System.out.println("s");
         }
+*/
 
         return __serviceName;
     }
diff --git a/stoc/test/javavm/testcomponent/makefile.mk b/stoc/test/javavm/testcomponent/makefile.mk
index 68f3f5bd6431..9fcd390b02a1 100644
--- a/stoc/test/javavm/testcomponent/makefile.mk
+++ b/stoc/test/javavm/testcomponent/makefile.mk
@@ -40,7 +40,7 @@ TARGET  = JavaTestComponent
 #.INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE : settings.mk
 # Files --------------------------------------------------------
-JARFILES = sandbox.jar ridl.jar jurt.jar unoil.jar
+JARFILES = ridl.jar jurt.jar unoil.jar
 
 CUSTOMMANIFESTFILE= manifest
 
diff --git a/stoc/test/uriproc/makefile.mk b/stoc/test/uriproc/makefile.mk
index 85e3a294f434..78b54bb2a5a2 100644
--- a/stoc/test/uriproc/makefile.mk
+++ b/stoc/test/uriproc/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -56,7 +56,7 @@ UNOTYPES = \
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_uriproc.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx
index f1032276eb89..71f92e504d64 100644
--- a/stoc/test/uriproc/test_uriproc.cxx
+++ b/stoc/test/uriproc/test_uriproc.cxx
@@ -47,7 +47,7 @@
 #include "com/sun/star/uri/XVndSunStarScriptUrlReference.hpp"
 #include "com/sun/star/util/XMacroExpander.hpp"
 #include "cppuhelper/servicefactory.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "osl/diagnose.h"
 #include "osl/thread.h"
 #include "rtl/string.h"