dba33b: merge

7 files changed, 4 insertions, 55 deletions

diff --git a/wizards/com/sun/star/wizards/agenda/makefile.mk b/wizards/com/sun/star/wizards/agenda/makefile.mk
index 375476c9c4af..2cd9dcabf182 100644
--- a/wizards/com/sun/star/wizards/agenda/makefile.mk
+++ b/wizards/com/sun/star/wizards/agenda/makefile.mk
@@ -42,7 +42,6 @@ PACKAGE = com$/sun$/star$/wizards$/agenda
 JARFILES= unoil.jar \
     jurt.jar \
     ridl.jar \
-    sandbox.jar \
     juh.jar \
     java_uno.jar \
     java_uno_accessbridge \
@@ -73,4 +72,4 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
 # --- Targets ------------------------------------------------------
 
-.INCLUDE :  target.mk
\ No newline at end of file
+.INCLUDE :  target.mk
diff --git a/wizards/com/sun/star/wizards/fax/makefile.mk b/wizards/com/sun/star/wizards/fax/makefile.mk
index 66e56132d6ab..0e1b9e17be63 100644
--- a/wizards/com/sun/star/wizards/fax/makefile.mk
+++ b/wizards/com/sun/star/wizards/fax/makefile.mk
@@ -39,7 +39,7 @@ PACKAGE = com$/sun$/star$/wizards$/fax
 .INCLUDE : settings.mk
 #.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
-JARFILES= unoil.jar jurt.jar ridl.jar sandbox.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar
+JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar
 
 CUSTOMMANIFESTFILE= MANIFEST.MF
 
diff --git a/wizards/com/sun/star/wizards/form/makefile.mk b/wizards/com/sun/star/wizards/form/makefile.mk
index 1853e0844fe8..2237ac207759 100644
--- a/wizards/com/sun/star/wizards/form/makefile.mk
+++ b/wizards/com/sun/star/wizards/form/makefile.mk
@@ -39,7 +39,7 @@ PACKAGE = com$/sun$/star$/wizards$/form
 .INCLUDE : settings.mk
 #.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
-JARFILES= unoil.jar jurt.jar ridl.jar sandbox.jar juh.jar java_uno.jar commonwizards.jar
+JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar
 CUSTOMMANIFESTFILE= MANIFEST.MF
 
 JARCLASSDIRS	= com$/sun$/star$/wizards$/form
diff --git a/wizards/com/sun/star/wizards/table/makefile.mk b/wizards/com/sun/star/wizards/table/makefile.mk
index f7cfcfe5c160..d845f6456efb 100644
--- a/wizards/com/sun/star/wizards/table/makefile.mk
+++ b/wizards/com/sun/star/wizards/table/makefile.mk
@@ -38,7 +38,7 @@ PACKAGE = com$/sun$/star$/wizards$/table
 .INCLUDE : settings.mk
 #.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
-JARFILES= unoil.jar jurt.jar ridl.jar sandbox.jar juh.jar java_uno.jar commonwizards.jar
+JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar
 CUSTOMMANIFESTFILE= MANIFEST.MF
 
 JARCLASSDIRS	= com$/sun$/star$/wizards$/table
diff --git a/wizards/source/launcher/FontOOo.xba b/wizards/source/launcher/FontOOo.xba
deleted file mode 100644
index c05e0c11bb2c..000000000000
--- a/wizards/source/launcher/FontOOo.xba
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="FontOOo" script:language="StarBasic">Option Explicit
-
-Sub StartFontOOo
-
-Dim ThePath as string
-Dim aService as object
-Dim MyFontOOo as string
-dim TheDoc as object 
-dim args(1) as new com.sun.star.beans.PropertyValue
-
-on error resume next
-
-&apos; Find path
-aService = CreateUnoService(&quot;com.sun.star.util.PathSubstitution&quot;)
-ThePath =ConvertToURL(aService.substituteVariables(&quot;$(prog)&quot;, true))
-ThePath=ThePath &amp; &quot;/../share/dict/ooo&quot;
-
-if  fileExists(ThePath &amp; &quot;/FontOOo.lst&quot;) then
-&apos;read FontOOo.lst file
-        Open ThePath &amp; &quot;/FontOOo.lst&quot; for input as #1
-                line input #1, MyFontOOo
-        close #1
-else
-&apos;create default FontOOo.lst file
-        Open ThePath &amp; &quot;/FontOOo.lst&quot; for output as #1
-                MyFontOOo=ThePath &amp; &quot;/FontOOo.sxw&quot;
-                print #1, MyFontOOo
-        close #1
-endif
-
-&apos;security
-if Not fileExists(MyFontOOo) then
-        MyFontOOo= ThePath &amp; &quot;/FontOOo.sxw&quot;
-endif
-MyFontOOo=ConvertToURL(MyFontOOo) 
-
-&apos;Opens FontOOo main file
-args(0).name=&quot;InteractionHandler&quot;
-args(0).value=&quot;&quot;
-args(1).name=&quot;MacroExecutionMode&quot;
-args(1).value=com.sun.star.document.MacroExecMode.ALWAYS_EXECUTE_NO_WARN &apos;4
-TheDoc=StarDesktop.loadComponentFromURL(MyFontOOo,&quot;_blank&quot;,0,args())
-
-End Sub</script:module>
diff --git a/wizards/source/launcher/makefile.mk b/wizards/source/launcher/makefile.mk
index d20cc073f39a..6efbcc54792e 100644
--- a/wizards/source/launcher/makefile.mk
+++ b/wizards/source/launcher/makefile.mk
@@ -42,9 +42,6 @@ TARGET=launcher
 
 ZIP1TARGET      = $(LAUNCHER_ALL_TARGET)
 XBAFILES	= DicOOo.xba
-.IF "$(WITH_FONTOOO)" == "YES"
-XBAFILES	+= FontOOo.xba
-.ENDIF
 ZIP1LIST        = *.xdl $(XBAFILES) *.xlb
 
 # --- Targets ------------------------------------------------------
diff --git a/wizards/source/launcher/script.xlb b/wizards/source/launcher/script.xlb
index 88a6e68b5aad..55310d9fb286 100644
--- a/wizards/source/launcher/script.xlb
+++ b/wizards/source/launcher/script.xlb
@@ -2,5 +2,4 @@
 <!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
 <library:library xmlns:library="http://openoffice.org/2000/library" library:name="Launcher" library:readonly="true" library:passwordprotected="false">
  <library:element library:name="DicOOo"/>
- <library:element library:name="FontOOo"/>
 </library:library>