merge with DEV300_m68

12 files changed, 11 insertions, 12 deletions

diff --git a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
index d48817b51a6c..c1909a807863 100755
--- a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
+++ b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
@@ -39,7 +39,7 @@ PACKAGE	= org$/openoffice$/java$/accessibility
 .INCLUDE :  settings.mk
 
 JAVADIR = $(OUT)$/misc$/java
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar
+JARFILES = jurt.jar unoil.jar ridl.jar
 JAVAFILES = \
     logging$/XAccessibleEventLog.java \
     logging$/XAccessibleHypertextLog.java \
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 847c8ad2f0af..5f264b388fda 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -32,7 +32,7 @@
 #define INCLUDED_ACCESSIBILITY_TEXTWINDOWACCESSIBILITY_HXX
 
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/textdata.hxx>
 #include <svtools/texteng.hxx>
 #include <svtools/textview.hxx>
diff --git a/accessibility/prj/build.lst b/accessibility/prj/build.lst
index cd30f3452a30..f410ece56d9b 100755
--- a/accessibility/prj/build.lst
+++ b/accessibility/prj/build.lst
@@ -14,4 +14,5 @@ ac accessibility\workben\org\openoffice\accessibility\misc          nmake   -
 ac accessibility\workben\org\openoffice\accessibility\awb\canvas    nmake   -   all ac_awb_canvas ac_awb_tree NULL
 ac accessibility\workben\org\openoffice\accessibility\awb\tree      nmake   -   all ac_awb_tree ac_awb_misc NULL
 ac accessibility\workben\org\openoffice\accessibility\awb\view      nmake   -   all ac_awb_view ac_awb_view_text NULL
-ac accessibility\workben\org\openoffice\accessibility\awb\view\text nmake   -   all ac_awb_view_text NULL
+# dependency on ac_awb_misc to avoid concurrent creation of java_ver.mk
+ac accessibility\workben\org\openoffice\accessibility\awb\view\text nmake   -   all ac_awb_view_text ac_awb_misc NULL
diff --git a/accessibility/workben/makefile.in b/accessibility/workben/makefile.in
index ad97448e7780..d81df5fb7363 100644
--- a/accessibility/workben/makefile.in
+++ b/accessibility/workben/makefile.in
@@ -11,7 +11,6 @@ CLASS_FILES = $(patsubst %.java, %.class, $(JAVAFILES))
 CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(OFFICE_CLASSES_DIR)/jurt.jar\
 		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/unoil.jar\
 		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/ridl.jar\
-		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/sandbox.jar\
 		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/juh.jar\
 		$(PATH_SEPARATOR)$(OUT_COMP_JAVA)\
 		$(PATH_SEPARATOR).\
diff --git a/accessibility/workben/makefile.mk b/accessibility/workben/makefile.mk
index 33c1e2a0ef5e..7f19d8936757 100644
--- a/accessibility/workben/makefile.mk
+++ b/accessibility/workben/makefile.mk
@@ -15,7 +15,6 @@ JAR_PATH = $(SOLARBINDIR)$/
 
 JAR_FILES =		\
     unoil.jar	\
-    sandbox.jar	\
     ridl.jar	\
     jurt.jar	\
     juh.jar		\
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common
index 3b7262a8489d..5bb567414220 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common
+++ b/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common
@@ -56,7 +56,7 @@
 #
 #*************************************************************************
 
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar 
+JARFILES = jurt.jar unoil.jar ridl.jar 
 JAVAFILES = 		\
 	CanvasShape.java  	\
 	Canvas.java        	\
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk b/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk
index eb744d465cfb..032a75b16d04 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk
+++ b/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk
@@ -68,7 +68,7 @@ USE_JAVAVER:=TRUE
 .INCLUDE :  settings.mk
 
 .IF "$(JAVAVER:s/.//)" >= "140" 
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar 
+JARFILES = jurt.jar unoil.jar ridl.jar 
 
 .INCLUDE : makefile.common
 
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/manifest b/accessibility/workben/org/openoffice/accessibility/awb/manifest
index 951f9ec3128f..36111c54081d 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/manifest
+++ b/accessibility/workben/org/openoffice/accessibility/awb/manifest
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
 Main-Class: org.openoffice.accessibility.awb.AccessibilityWorkBench
-Class-Path: classes.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar jaxp.jar
+Class-Path: classes.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar jaxp.jar
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common
index 7a0813b099db..6b32a5db09a8 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common
@@ -56,7 +56,7 @@
 #
 #*************************************************************************
 
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar 
+JARFILES = jurt.jar unoil.jar ridl.jar 
 JAVAFILES = 						\
 	AccessibilityModel.java \
 	AccessibilityNode.java \
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common
index d4929e3f1cd8..4f5f99ed0cf1 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common
@@ -56,7 +56,7 @@
 #
 #*************************************************************************
 
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar 
+JARFILES = jurt.jar unoil.jar ridl.jar 
 JAVAFILES = 						\
 	ComponentView.java				\
 	ContextView.java				\
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common
index 32655a0c6a6f..e3303bb6890f 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common
@@ -56,7 +56,7 @@
 #
 #*************************************************************************
 
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar 
+JARFILES = jurt.jar unoil.jar ridl.jar 
 JAVAFILES = 					\
 	CaretSpinnerModel.java		\
 	TextActionDialog.java		\
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/makefile.common b/accessibility/workben/org/openoffice/accessibility/misc/makefile.common
index d06336e12c56..f2462a88f841 100644
--- a/accessibility/workben/org/openoffice/accessibility/misc/makefile.common
+++ b/accessibility/workben/org/openoffice/accessibility/misc/makefile.common
@@ -56,7 +56,7 @@
 #
 #*************************************************************************
 
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar
+JARFILES = jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar
 JAVAFILES = 					\
 	AccessibleEventMulticaster.java \
 	InformationWriter.java  \