summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java7
-rw-r--r--odk/CustomTarget_javadoc.mk5
2 files changed, 6 insertions, 6 deletions
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
index 0a8a924856a0..cd8c51d682d1 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
@@ -117,7 +117,7 @@ XMultiPropertySet
* initialization of the inheriting class (i.e. within the contructor)
* @param name The property's name (Property.Name).
* @param handle The property's handle (Property.Handle).
- * @param Type The property's type (Property.Type).
+ * @param type The property's type (Property.Type).
* @param attributes The property's attributes (Property.Attributes).
* @param id Identifies the property's storage.
*/
@@ -135,8 +135,7 @@ XMultiPropertySet
* Registration has to occur during
* initialization of the inheriting class (i.e. within the contructor).
* @param name The property's name (Property.Name).
- * @param handle The property's handle (Property.Handle).
- * @param Type The property's type (Property.Type).
+ * @param type The property's type (Property.Type).
* @param attributes The property's attributes (Property.Attributes).
* @param id Identifies the property's storage.
*/
@@ -788,7 +787,7 @@ XMultiPropertySet
* If a property has the READONLY attribute set, and one of the setter methods, such as setPropertyValue, has been
* called, then this method is not going to be called.
* @param property the property for which the new value is set
- * @param value the new value for the property.
+ * @param newVal the new value for the property.
* @throws com.sun.star.lang.WrappedTargetException An exception, which has to be made known to the caller,
* occurred during the setting of the value.
*/
diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk
index 3795a9ae580b..3f88d12b5d40 100644
--- a/odk/CustomTarget_javadoc.mk
+++ b/odk/CustomTarget_javadoc.mk
@@ -25,11 +25,12 @@ $(odk_WORKDIR)/docs/java/ref/index.html: $(call gb_Jar_get_outdir_target,ridl)
$(JAVADOC) -J-Xmx120m -use -splitindex \
-windowtitle "Java UNO Runtime Reference" \
-header "$(PRODUCTNAME) $(PRODUCTVERSION) SDK Java API Reference"\
+ -tag attention:a:"Attention:" \
-d $(dir $@) \
-sourcepath "$(SRCDIR)/ridljar/source/unoloader$(gb_CLASSPATHSEP)$(SRCDIR)/ridljar$(gb_CLASSPATHSEP)$(SRCDIR)/jurt$(gb_CLASSPATHSEP)$(SRCDIR)/javaunohelper" \
-classpath $(OUTDIR)/bin/ridl.jar \
- -linkoffline ../../common/reg ./uno \
- -linkoffline http://java.sun.com/j2se/1.5/docs/api ./java \
+ -linkoffline ../../common/reg $(SRCDIR)/odk/pack/gendocu/uno \
+ -linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/pack/gendocu/java \
$(odk_JAVAPACKAGES) \
$(if $(JAVADOCISGJDOC),,-notimestamp) \
> $(odk_WORKDIR)/javadoc_log.txt