merge commit

9 files changed, 49 insertions, 2 deletions

diff --git a/odk/pack/checkbin/makefile.mk b/odk/pack/checkbin/makefile.mk
index abc2687f2749..38183ff1c766 100644
--- a/odk/pack/checkbin/makefile.mk
+++ b/odk/pack/checkbin/makefile.mk
@@ -36,6 +36,8 @@ TARGET=checkbin
 .INCLUDE: settings.mk
 .INCLUDE: $(PRJ)$/util$/makefile.pmk
 #----------------------------------------------------------------
+.IF "$(L10N_framework)"==""
+
 ODKCHECKFILE=$(MISC)$/$(TARGET).txt
 
 all: $(ODKCHECKFILE)
@@ -46,3 +48,8 @@ $(ODKCHECKFILE) : $(SDK_CONTENT_CHECK_FILES)
     $(PERL) $(PRJ)$/util$/check.pl $(DESTDIR) $(DESTPLATFROM) "$(EXEPOSTFIX)" $(ODKCHECKFILE)
 # RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE
     cat $(ODKCHECKFILE)
+
+.ELSE
+pseudo:
+
+.ENDIF
diff --git a/odk/pack/checkidl/makefile.mk b/odk/pack/checkidl/makefile.mk
index e0fcd53924bd..707c89df66ed 100644
--- a/odk/pack/checkidl/makefile.mk
+++ b/odk/pack/checkidl/makefile.mk
@@ -36,6 +36,8 @@ TARGET=checkidl
 .INCLUDE: settings.mk
 .INCLUDE: $(PRJ)$/util$/makefile.pmk
 #----------------------------------------------------------------
+
+.IF "$(L10N_framework)"==""
 ODKCHECKFILE=$(MISC)$/$(TARGET).txt
 
 all : $(ODKCHECKFILE)
@@ -46,3 +48,8 @@ $(ODKCHECKFILE) : $(SDK_CONTENT_CHECK_FILES)
     -diff -br $(DESTDIRIDL) $(SOLARIDLDIR) $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
 # RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE
     cat $(ODKCHECKFILE)
+
+.ELSE
+pseudo:
+
+.ENDIF
diff --git a/odk/pack/checkinc/makefile.mk b/odk/pack/checkinc/makefile.mk
index d61b46fb3676..9c1e67bbc55a 100644
--- a/odk/pack/checkinc/makefile.mk
+++ b/odk/pack/checkinc/makefile.mk
@@ -36,6 +36,7 @@ TARGET=checkinc
 .INCLUDE: settings.mk
 .INCLUDE: $(PRJ)$/util$/makefile.pmk
 #----------------------------------------------------------------
+.IF "$(L10N_framework)"==""
 ODKCHECKFILE=$(MISC)$/$(TARGET).txt
 
 all : $(ODKCHECKFILE)
@@ -51,3 +52,7 @@ $(ODKCHECKFILE) : $(SDK_CONTENT_CHECK_FILES)
     -diff -br $(DESTDIRINC)$/vos   $(SOLARINCDIR)$/vos $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
 # RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE
     cat $(ODKCHECKFILE)
+.ELSE
+pseudo:
+
+.ENDIF
diff --git a/odk/pack/checkinc2/makefile.mk b/odk/pack/checkinc2/makefile.mk
index cac17f49838e..933591907aa6 100644
--- a/odk/pack/checkinc2/makefile.mk
+++ b/odk/pack/checkinc2/makefile.mk
@@ -36,6 +36,7 @@ TARGET=checkinc2
 .INCLUDE: settings.mk
 .INCLUDE: $(PRJ)$/util$/makefile.pmk
 #----------------------------------------------------------------
+.IF "$(L10N_framework)"==""
 ODKCHECKFILE=$(MISC)$/$(TARGET).txt
 
 all : $(ODKCHECKFILE)
@@ -51,3 +52,7 @@ $(ODKCHECKFILE) : $(SDK_CONTENT_CHECK_FILES)
     -diff -br $(DESTDIRINC)$/cppuhelper 		$(SOLARINCDIR)$/cppuhelper 		$(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
 # RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE
     cat $(ODKCHECKFILE)
+.ELSE
+pseudo:
+
+.ENDIF
diff --git a/odk/pack/copying/apiref-autodoc.since b/odk/pack/copying/apiref-autodoc.since
index 76f505da4c72..576df44c7708 100644
--- a/odk/pack/copying/apiref-autodoc.since
+++ b/odk/pack/copying/apiref-autodoc.since
@@ -1,12 +1,21 @@
+"3.2.0" "OpenOffice 3.2.0"
+"3.2" "OpenOffice 3.2"
+"3.1.0" "OpenOffice 3.1.0"
+"3.1" "OpenOffice 3.1"
+"3.0.1" "OpenOffice 3.0.1"
 "3.0.0" "OpenOffice 3.0.0"
 "3.0" "OpenOffice 3.0"
 "2.4.1" "OpenOffice 2.4.1"
+"2.4.0" "OpenOffice 2.4.0"
 "2.4" "OpenOffice 2.4"
 "2.3.1" "OpenOffice 2.3.1"
+"2.3.0" "OpenOffice 2.3.0"
 "2.3" "OpenOffice 2.3"
 "2.2.1" "OpenOffice 2.2.1"
+"2.2.0" "OpenOffice 2.2.0"
 "2.2" "OpenOffice 2.2"
 "2.1" "OpenOffice 2.1"
+"2.0.6" "OpenOffice 2.0.6"
 "2.0.4" "OpenOffice 2.0.4"
 "2.0.3" "OpenOffice 2.0.3"
 "2.0.2" "OpenOffice 2.0.2"
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk
index 24bbdc271a40..f67cbd193a9d 100644
--- a/odk/pack/copying/makefile.mk
+++ b/odk/pack/copying/makefile.mk
@@ -214,10 +214,15 @@ MYZIPLIST=com$/* win$/*
 #--------------------------------------------------
 # TARGETS
 #--------------------------------------------------
+
+.IF "$(L10N_framework)"==""
+
 all : CLEAN_DKVERSION_CHECK \
     $(DIR_FILE_LIST) \
     $(DIR_FILE_FLAG) \
 
+.ENDIF
+
 #--------------------------------------------------
 # use global rules
 #--------------------------------------------------
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index 697d5cbfc34c..5b070ca043f6 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -37,6 +37,7 @@ TARGET=gendocu
 .INCLUDE: settings.mk
 .INCLUDE: $(PRJ)$/util$/makefile.pmk
 #----------------------------------------------------------------
+.IF "$(L10N_framework)"==""
 
 CPPDOCREFNAME="UDK $(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) C/C++ API Reference"
 JAVADOCREFNAME="UDK $(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) Java API Reference"
@@ -120,3 +121,7 @@ $(JAVA_DOCU_INDEX_FILE) .SEQUENTIAL : $(JAVA_SRC_FILES)
     -$(MKDIRHIER) $(@:d)        
     $(JAVADOC) -J-Xmx120m $(JAVADOCPARAMS) > $(JAVADOCLOG)
 .ENDIF
+
+.ELSE
+pseudo:
+.ENDIF
diff --git a/odk/source/com/sun/star/lib/loader/Loader.java b/odk/source/com/sun/star/lib/loader/Loader.java
index b499aef33f30..1e116c399f87 100644
--- a/odk/source/com/sun/star/lib/loader/Loader.java
+++ b/odk/source/com/sun/star/lib/loader/Loader.java
@@ -135,6 +135,7 @@ public final class Loader {
         // invoke the main method
         if ( className != null ) {
             ClassLoader cl = getCustomLoader();
+            Thread.currentThread().setContextClassLoader(cl);
             Class c = cl.loadClass( className );
             Method m = c.getMethod( "main", new Class[] { String[].class } );
             m.invoke( null, new Object[] { args } );
diff --git a/odk/util/makefile.mk b/odk/util/makefile.mk
index 078ecb987157..a2e62ad17891 100644
--- a/odk/util/makefile.mk
+++ b/odk/util/makefile.mk
@@ -6,18 +6,21 @@ TARGET=odk
 .INCLUDE: settings.mk
 .INCLUDE: makefile.pmk
 # ------------------------------------------------------------------
+.IF "$(L10N_framework)"==""
 
 ZIP1TARGET=odkexamples
 ZIP1FLAGS=-u -r
 ZIP1DIR=$(PRJ)
 ZIP1LIST=examples -x "*.svn*" -x "*CVS*" -x "*makefile.mk" -x "*Inspector*" -x "*Container1*" -x "*Storage*" -x "*register_component*" -x "*examples.html"
 
-.INCLUDE :  target.mk
+.ENDIF
 
+.INCLUDE :  target.mk
+.IF "$(L10N_framework)"==""
 ALLTAR:\
     $(BIN)$/$(PRODUCTZIPFILE)
 #    $(BIN)$/odk_oo.zip
-
+.ENDIF
 
 $(BIN)$/$(PRODUCTZIPFILE) : $(SDK_CONTENT_CHECK_FILES) $(SDK_CHECK_FLAGS)
     cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/$(PRODUCTZIPFILE) . $(CHECKZIPRESULT)