resync to trunk (close to AOO400)

8 files changed, 15 insertions, 18 deletions

diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
index 9dd2d611c4db..eb23796abf40 100644
--- a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
@@ -240,8 +240,7 @@ public class ParcelContainer implements XNameAccess
      * @param   language language for which entries are stored
      * @param   loadParcels set to <tt>true</tt> if parcels are to be loaded
      *          on construction.
-     * @return    name of <tt>ParcelContainer</tt>
-     * @throws    IllegalArgumentException
+     * @throws    com.sun.star.lang.IllegalArgumentException
      * @throws    WrappedTargetException
      */
     public ParcelContainer( XComponentContext xCtx, String containerUrl, String language, boolean loadParcels ) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.lang.WrappedTargetException
diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index 0008b0de6fbe..72884702da18 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -130,12 +130,12 @@ public class ScriptMetaData extends ScriptEntry implements Cloneable {
     // to be exposed at all
 
     private static final String SHARE =
-        "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" +
+        "vnd.sun.star.expand:${$OOO_BASE_DIR/program/" +
         PathUtils.BOOTSTRAP_NAME +
         "::BaseInstallation}/share";
 
     private static final String USER =
-        "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" +
+        "vnd.sun.star.expand:${$OOO_BASE_DIR/program/" +
         PathUtils.BOOTSTRAP_NAME +
         "::UserInstallation}/user";
 
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index a7b35d26ff02..f8e3912f83b3 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -138,7 +138,7 @@ public abstract class ScriptProvider
                 new Type(XMacroExpander.class), serviceObj);
 
             XMLParserFactory.setOfficeDTDURL(me.expandMacros(
-                "${$BRAND_BASE_DIR/program/bootstraprc::BaseInstallation}/share/dtd/officedocument/1_0/"));
+                "${$OOO_BASE_DIR/program/bootstraprc::BaseInstallation}/share/dtd/officedocument/1_0/"));
 
         }
         catch ( Exception e )
@@ -214,20 +214,20 @@ public abstract class ScriptProvider
                     if ( originalContextURL.startsWith( "bundled" ) )
                     {
                         contextUrl = "vnd.sun.star.expand:$BUNDLED_EXTENSIONS";
-                        extensionDb = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
+                        extensionDb = "vnd.sun.star.expand:${$OOO_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
                         extensionRepository = "bundled";
                     }
 
                     if ( originalContextURL.startsWith( "share" ) )
                     {
-                        contextUrl = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::BaseInstallation}/share";
-                        extensionDb = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
+                        contextUrl = "vnd.sun.star.expand:${$OOO_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::BaseInstallation}/share";
+                        extensionDb = "vnd.sun.star.expand:${$OOO_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
                         extensionRepository = "shared";
                     }
                     else if ( originalContextURL.startsWith( "user" ) )
                     {
-                        contextUrl = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
-                        extensionDb = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
+                        contextUrl = "vnd.sun.star.expand:${$OOO_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
+                        extensionDb = "vnd.sun.star.expand:${$OOO_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
                         extensionRepository = "user";
                     }
 
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index e27dd84c8627..2b0d15176008 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
@@ -240,4 +240,4 @@ class GlyphGutter extends JComponent {
         g.setColor(Color.black);
         g.drawPolygon(arrow);
     }
-};
+}
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index 6dd8f692b913..4dee4d21f281 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -189,9 +189,8 @@ public class ScriptEditorForBeanShell
      *  If an editor window is already open for that data it will be
      *  moved to the front.
      *
-     * @param  metadata    The metadata describing the script
      * @param  context     The context in which to execute the script
-     *
+     * @param  entry       The metadata describing the script
      */
     public void edit(final XScriptContext context, ScriptMetaData entry) {
         if (entry != null ) {
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
index 3d374aa8dd6a..bad84288a759 100644
--- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
@@ -165,7 +165,7 @@ class ScriptImpl implements XScript
          *  Invoke
          *
          *
-         * @param aParams           All parameters; pure, out params are undefined in
+         * @param params            All parameters; pure, out params are undefined in
          *                      sequence, i.e., the value has to be ignored by the callee
          * @param aOutParamIndex    Out indices
          * @param aOutParam         Out parameters
@@ -173,7 +173,7 @@ class ScriptImpl implements XScript
          * @throws IllegalArgumentException If there is no matching script name
          * @throws CannotConvertException   If args do not match or cannot be converted
          *                              the those of the invokee
-         * @throws InvocationTargetException If the running script throws an exception
+         * @throws com.sun.star.reflection.InvocationTargetException If the running script throws an exception
          *              this information is captured and rethrown as this exception type.
          */
 
diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
index c461db5edfd6..0bbdbc89acc5 100644
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
@@ -172,9 +172,8 @@ public class ScriptEditorForJavaScript implements ScriptEditor
      *  If an editor window is already open for that data it will be
      *  moved to the front.
      *
-     * @param  metadata    The metadata describing the script
      * @param  context     The context in which to execute the script
-     *
+     * @param  entry       The metadata describing the script
      */
     public void edit(final XScriptContext context, ScriptMetaData entry)
     {
diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
index cfb09770fba9..1027c9e085dd 100644
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
@@ -154,7 +154,7 @@ class ScriptImpl implements XScript
          *
          *
          *
-         * @param aParams           All parameters; pure, out params are
+         * @param params            All parameters; pure, out params are
          *                          undefined in sequence, i.e., the value
          *                          has to be ignored by the callee
          *