rebase

15 files changed, 231 insertions, 12 deletions

diff --git a/autodoc/source/exes/adc_uni/cmd_sincedata.cxx b/autodoc/source/exes/adc_uni/cmd_sincedata.cxx
index 895a1b0853df..0a577eb8ef8f 100644
--- a/autodoc/source/exes/adc_uni/cmd_sincedata.cxx
+++ b/autodoc/source/exes/adc_uni/cmd_sincedata.cxx
@@ -60,18 +60,26 @@ SinceTagTransformationData::DoesTransform() const
 }
 
 const String &
-SinceTagTransformationData::DisplayOf( const String & i_sVersionNumber ) const
+SinceTagTransformationData::DisplayOf( const String & i_versionNumber ) const
 {
     if (DoesTransform())
     {
-        const String * ret = csv::find_in_map(aTransformationTable, i_sVersionNumber);
+        StreamLock
+            sl(200);
+        sl() << i_versionNumber;
+        sl().strip_frontback_whitespace();
+        String
+            sVersionNumber(sl().c_str());
+
+        const String *
+            ret = csv::find_in_map(aTransformationTable, sVersionNumber);
         return ret != 0
                 ?   *ret
                 :   String::Null_();
     }
     else
     {
-        return i_sVersionNumber;
+        return i_versionNumber;
     }
 }
 
diff --git a/autodoc/source/parser/inc/x_docu.hxx b/autodoc/source/parser/inc/x_docu.hxx
new file mode 100644
index 000000000000..36185dbac4ab
--- /dev/null
+++ b/autodoc/source/parser/inc/x_docu.hxx
@@ -0,0 +1,61 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ * $RCSfile: x_parse.hxx,v $
+ * $Revision: 1.4 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ADC_X_DOCU_HXX
+#define ADC_X_DOCU_HXX
+
+// BASE CLASSES
+#include <autodoc/x_parsing.hxx>
+
+
+
+
+class X_Docu : public autodoc::X_Parser_Ifc
+{
+  public:
+    // LIFECYCLE
+                        X_Docu(
+                            const char *        i_tag,
+                            const char *        i_explanation );
+                        ~X_Docu();
+    // INQUIRY
+    virtual E_Event     GetEvent() const;
+    virtual void        GetInfo(
+                            std::ostream &      o_rOutputMedium ) const;
+
+  private:
+    String              sTagName;
+    String              sExplanation;
+};
+
+
+
+
+#endif
diff --git a/autodoc/source/parser/kernel/makefile.mk b/autodoc/source/parser/kernel/makefile.mk
index df4b6a74bf84..340136565c7d 100644
--- a/autodoc/source/parser/kernel/makefile.mk
+++ b/autodoc/source/parser/kernel/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
@@ -50,6 +50,7 @@ PRJINC=$(PRJ)$/source
 
 OBJFILES= \
     $(OBJ)$/parsefct.obj    \
+    $(OBJ)$/x_docu.obj      \
     $(OBJ)$/x_parse.obj
 
 
diff --git a/autodoc/source/parser/kernel/x_docu.cxx b/autodoc/source/parser/kernel/x_docu.cxx
new file mode 100644
index 000000000000..992d1cb511d0
--- /dev/null
+++ b/autodoc/source/parser/kernel/x_docu.cxx
@@ -0,0 +1,64 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ * $RCSfile: x_parse.cxx,v $
+ * $Revision: 1.7 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <x_docu.hxx>
+
+// NOT FULLY DECLARED SERVICES
+
+
+
+X_Docu::X_Docu( const char *        i_tag,
+                const char *        i_explanation  )
+    :   sTagName(i_tag),
+        sExplanation(i_explanation)
+{
+}
+
+X_Docu::~X_Docu()
+{
+}
+
+X_Docu::E_Event
+X_Docu::GetEvent() const
+{
+     return x_Any;
+}
+
+void
+X_Docu::GetInfo( std::ostream & o_rOutputMedium ) const
+{
+    o_rOutputMedium
+        << "Error in tag '"
+        << sTagName
+        << "': "
+        << sExplanation
+        << Endl();
+}
diff --git a/autodoc/source/parser_i/idl/unoidl.cxx b/autodoc/source/parser_i/idl/unoidl.cxx
index aa1c0ecd3521..e8f86c885363 100644
--- a/autodoc/source/parser_i/idl/unoidl.cxx
+++ b/autodoc/source/parser_i/idl/unoidl.cxx
@@ -38,6 +38,7 @@
 #include <ary/ary.hxx>
 #include <ary/idl/i_gate.hxx>
 #include <ary/doc/d_oldidldocu.hxx>
+#include <../parser/inc/x_docu.hxx>
 #include <parser/parserinfo.hxx>
 #include <tools/filecoll.hxx>
 #include <tools/tkpchars.hxx>
@@ -113,6 +114,13 @@ IdlParser::Run( const autodoc::FileCollector_Ifc & i_rFiles )
                 = new FileParsePerformers(*pRepository,
                                           static_cast< ParserInfo& >(*this));
         }
+        catch (X_Docu & xd)
+        {
+            // Currently thic catches only wrong since tags, while since tags are
+            // transformed. In this case the program shall be terminated.
+            Cerr() << xd << Endl();
+            exit(1);
+        }
         catch (...)
         {
             Cout() << "Unknown error." << Endl();
diff --git a/autodoc/source/parser_i/idoc/docu_pe2.cxx b/autodoc/source/parser_i/idoc/docu_pe2.cxx
index b03e33491b92..687b189cf894 100644
--- a/autodoc/source/parser_i/idoc/docu_pe2.cxx
+++ b/autodoc/source/parser_i/idoc/docu_pe2.cxx
@@ -38,6 +38,7 @@
 #include <parser/parserinfo.hxx>
 #include <adc_cl.hxx>
 #include <adc_msg.hxx>
+#include <../parser/inc/x_docu.hxx>
 #include <s2_dsapi/dsapitok.hxx>
 #include <s2_dsapi/tk_atag2.hxx>
 #include <s2_dsapi/tk_html.hxx>
@@ -511,15 +512,44 @@ SapiDocu_PE::SetCurSinceAtTagVersion( DYN ary::inf::DocuToken & let_drNewToken )
         return;
     }
 
-    char cFirst = *pToken->GetText();
-    const char cCiphersend = '9' + 1;
-    if ( autodoc::CommandLine::Get_().DoesTransform_SinceTag()
-         AND NOT csv::in_range('0', cFirst, cCiphersend) )
+    const String
+        sVersion(pToken->GetText());
+    const char
+        cFirst = *sVersion.begin();
+    const char
+        cCiphersend = '9' + 1;
+    const autodoc::CommandLine &
+        rCommandLine = autodoc::CommandLine::Get_();
+
+
+    if ( rCommandLine.DoesTransform_SinceTag())
     {
-        delete &let_drNewToken;
-        return;
+        // The @since version number shall be interpreted,
+
+        if ( NOT csv::in_range('0', cFirst, cCiphersend) )
+        {
+            // But this is a non-number-part, so we wait for
+            // the next one.
+            delete &let_drNewToken;
+            return;
+        }
+        else if (rCommandLine.DisplayOf_SinceTagValue(sVersion).empty())
+        {
+            // This is the numbered part, but we don't know it.
+            delete &let_drNewToken;
+
+            StreamLock
+                sl(200);
+            sl()
+                << "Since-value '"
+                << sVersion
+                << "' not found in translation table.";
+            throw X_Docu("since", sl().c_str());
+        }
     }
 
+    // Either since tags are not specially interpreted, or
+    // we got a known one.
     pCurAtTag->AddToken(let_drNewToken);
     fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2SinceAtTag;
 }
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)