diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-11-11 07:25:37 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-11-11 07:25:37 +0100 |
| commit | e5bbf7a28b93ed84d0ab99219ba04cb74046c236 (patch) | |
| tree | aac9f582be1fd8648f1a4451ba45cbcb56be4a9e /xmerge | |
| parent | a0553f344c61ab20639706e62b6d1acee49254ae (diff) | |
#i103496#: sandbox removed
Diffstat (limited to 'xmerge')
6 files changed, 2 insertions, 6 deletions
diff --git a/xmerge/java/build.xml b/xmerge/java/build.xml index 59ff9625324e..6f8d2f799c45 100644 --- a/xmerge/java/build.xml +++ b/xmerge/java/build.xml @@ -63,7 +63,6 @@ <pathelement location="${solar.jar}/jurt.jar"/> <pathelement location="${solar.jar}/unoil.jar"/> <pathelement location="${solar.jar}/ridl.jar"/> - <pathelement location="${solar.jar}/sandbox.jar"/> <pathelement location="${solar.jar}/juh.jar"/> <pathelement location="${solar.jar}/jmc.jar"/> </path> diff --git a/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/docbook/docbookfilter/makefile.mk b/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/docbook/docbookfilter/makefile.mk index b2c709523a97..6b695eced864 100644 --- a/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/docbook/docbookfilter/makefile.mk +++ b/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/docbook/docbookfilter/makefile.mk @@ -37,7 +37,7 @@ TARGET =DBFilter CLASSDIR!:=$(CLASSDIR)$/$(TARGET) #USE_UDK_EXTENDED_MANIFESTFILE=TRUE #USE_EXTENDED_MANIFESTFILE=TRUE -JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar JAVAFILES = $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES))) CUSTOMMANIFESTFILE = Manifest #JARMANIFEST = Manifest diff --git a/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/Makefile b/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/Makefile index 96ce07d2d032..7f4d624235f8 100755 --- a/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/Makefile +++ b/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/Makefile @@ -72,7 +72,6 @@ DK_CLASSPATH = $(subst $(EMPTYSTRING) $(EMPTYSTRING),, \ $(CLASSES_DIR)$(PS)jurt.jar\ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)unoil.jar\ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)ridl.jar\ - $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)sandbox.jar\ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)java_uno.jar\ $(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)juh.jar\ $(PATH_SEPARATOR)$(CLASSPATH) \ diff --git a/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/makefile.mk b/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/makefile.mk index 58563ba29302..bd0afda3bbcc 100755 --- a/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/makefile.mk +++ b/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/makefile.mk @@ -36,7 +36,7 @@ TARGET = examples_java_converterbridge # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk -JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar ridl.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar ridl.jar JAVAFILES = $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES))) JARCOMPRESS = TRUE CUSTOMMANIFESTFILE = manifest diff --git a/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java_prettyprint/Makefile b/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java_prettyprint/Makefile index e5055361d80a..63ec8b5b2d77 100644 --- a/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java_prettyprint/Makefile +++ b/xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java_prettyprint/Makefile @@ -34,7 +34,6 @@ $(COMPONENT_NAME)_CLASSFILES = *.class SDK_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_CLASS)) diff --git a/xmerge/java/org/openoffice/xmerge/xmergebridge/Makefile_sdk b/xmerge/java/org/openoffice/xmerge/xmergebridge/Makefile_sdk index d59f398511de..288679bc667b 100644 --- a/xmerge/java/org/openoffice/xmerge/xmergebridge/Makefile_sdk +++ b/xmerge/java/org/openoffice/xmerge/xmergebridge/Makefile_sdk @@ -38,7 +38,6 @@ $(COMPONENT_NAME)_CLASSFILES = *.class SDK_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)$(OFFICE_CLASSES_DIR)/xmerge.jar\ $(PATH_SEPARATOR)$(OUT_COMP_CLASS)) |