svn commit: r400863 - in branches/2015Q4/editors/openoffice-4: . files
Don Lewis
truckman at FreeBSD.org
Thu Nov 5 19:21:30 UTC 2015
Author: truckman
Date: Thu Nov 5 19:21:27 2015
New Revision: 400863
URL: https://svnweb.freebsd.org/changeset/ports/400863
Log:
MFH r398966, r399536, r399605, r400064, r400472
Upgrade to Apache OpenOffice 4.1.2 to fix:
CVE-2015-4551
CVE-2015-5212
CVE-2015-5213
CVE-2015-5214
Approved by: ports-secteam (feld)
Security: 18b3c61b-83de-11e5-905b-ac9e174be3af
Added:
branches/2015Q4/editors/openoffice-4/files/patch-configure.in
- copied unchanged from r400472, head/editors/openoffice-4/files/patch-configure.in
branches/2015Q4/editors/openoffice-4/files/patch-desktop_scripts_soffice.sh
- copied unchanged from r400064, head/editors/openoffice-4/files/patch-desktop_scripts_soffice.sh
branches/2015Q4/editors/openoffice-4/files/patch-openjdk8
- copied unchanged from r399605, head/editors/openoffice-4/files/patch-openjdk8
branches/2015Q4/editors/openoffice-4/files/patch-sdext_prj_build.lst
- copied unchanged from r398966, head/editors/openoffice-4/files/patch-sdext_prj_build.lst
branches/2015Q4/editors/openoffice-4/files/patch-solenv_bin_modules_installer_scriptitems.pm
- copied unchanged from r400472, head/editors/openoffice-4/files/patch-solenv_bin_modules_installer_scriptitems.pm
Deleted:
branches/2015Q4/editors/openoffice-4/files/patch-CVE-2015-1774
branches/2015Q4/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_cpp2uno.cxx
branches/2015Q4/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_except.cxx
branches/2015Q4/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx
branches/2015Q4/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_uno2cpp.cxx
branches/2015Q4/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_cpp2uno.cxx
branches/2015Q4/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx
branches/2015Q4/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx
branches/2015Q4/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx
branches/2015Q4/editors/openoffice-4/files/patch-build_framework
branches/2015Q4/editors/openoffice-4/files/patch-jpeg
branches/2015Q4/editors/openoffice-4/files/patch-nss
branches/2015Q4/editors/openoffice-4/files/patch-sal
branches/2015Q4/editors/openoffice-4/files/patch-shell_source_unix_sysshell_recently__used__file__handler.cxx
branches/2015Q4/editors/openoffice-4/files/patch-testtools_source_bridgetest_bridgetest.cxx
branches/2015Q4/editors/openoffice-4/files/patch-webdav
Modified:
branches/2015Q4/editors/openoffice-4/Makefile
branches/2015Q4/editors/openoffice-4/distinfo
branches/2015Q4/editors/openoffice-4/files/Makefile.others
branches/2015Q4/editors/openoffice-4/files/pkg-message.in
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/editors/openoffice-4/Makefile
==============================================================================
--- branches/2015Q4/editors/openoffice-4/Makefile Thu Nov 5 19:13:54 2015 (r400862)
+++ branches/2015Q4/editors/openoffice-4/Makefile Thu Nov 5 19:21:27 2015 (r400863)
@@ -3,7 +3,6 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION}
-PORTREVISION= 16
CATEGORIES= editors java
MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \
http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
@@ -97,10 +96,10 @@ RUN_DEPENDS= \
AOOVERSION1= 4
AOOVERSION2= 1
-AOOVERSION3= 1
+AOOVERSION3= 2
# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
-AOOTAG= AOO411m6\(Build:9775\)
-SVNREVISION= 1617669
+AOOTAG= AOO412m3\(Build:9782\)
+SVNREVISION= 1709696
EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
@@ -121,6 +120,7 @@ USE_GL= gl glu
USE_GNOME= gtk20 libxslt libidl glib20
USE_JAVA= yes
JAVA_BUILD= jdk
+JAVA_RUN= jdk
JAVA_VENDOR= openjdk
JAVA_VERSION= 1.6+
USE_PERL5= build
@@ -128,17 +128,19 @@ USE_XORG= ice x11 xau xaw xcomposite xcu
xrandr xrender xt
USES= autoreconf:autoconf bison compiler cpe desktop-file-utils \
gettext-runtime gmake iconv jpeg perl5 pkgconfig python \
- tar:bzip2
+ shared-mime-info tar:bzip2
INSTALLS_ICONS= yes
WITHOUT_CPU_CFLAGS= true
CPE_PRODUCT= ${PORTNAME:S|apache-||}
CPE_VENDOR= apache
-OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA CCACHE
-OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA
+OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA SDK WIKI_PUBLISHER CCACHE
+OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA WIKI_PUBLISHER
GNOME_DESC= GConf + screensaver presentation control via DBUS
GNOMEVFS_DESC= GNOME Virtual File System
MMEDIA_DESC= Multimedia backend for impress
+SDK_DESC= Build and install software development kit
+WIKI_PUBLISHER_DESC= Build and install Wiki Publisher extension
CCACHE_DESC= Mimimize compile time of C/C++ programs
CUPS_CONFIGURE_ENABLE= cups
@@ -156,6 +158,11 @@ GNOMEVFS_USE= GNOME=gnomevfs2
MMEDIA_CONFIGURE_ENABLE= gstreamer
MMEDIA_USE= GSTREAMER=yes
+SDK_CONFIGURE_ENABLE= odk
+
+WIKI_PUBLISHER_CONFIGURE_ENABLE= wiki-publisher
+WIKI_PUBLISHER_VARS= BUNDLED_EXTENSIONS+=swext/wiki-publisher.oxt
+
.include <bsd.port.pre.mk>
.include <${FILESDIR}/Makefile.localized>
@@ -249,21 +256,18 @@ CONFIGURE_ARGS+= \
--with-system-sane \
--with-system-serf \
--with-system-stdlibs \
- --enable-symbols=small \
--without-stlport \
--with-vendor="FreeBSD ports system" \
--enable-verbose \
--with-system-vigra \
- --enable-wiki-publisher \
--with-system-xrender \
--with-system-zlib
-#AOOEXTENSIONS+= minimizer/presentation-minimizer.oxt
-#AOOEXTENSIONS+= presenter/presenter-screen.oxt
-#AOOEXTENSIONS+= pdfimport/pdfimport.oxt
-AOOEXTENSIONS+= swext/wiki-publisher.oxt
+.if defined (BUNDLED_EXTENSIONS)
+CONFIGURE_ARGS+= --with-bundled-prereg-extensions="${BUNDLED_EXTENSIONS}"
+.endif
-ICONS= ${WRKSRC}/sysui/desktop/icons
+CREATE_TREE= ${WRKSRC}/sysui/desktop/share/create_tree.sh
.include <${FILESDIR}/Makefile.knobs>
@@ -324,6 +328,9 @@ post-extract:
post-patch:
${REINPLACE_CMD} -e "/^ICONVERSION/s/=.*/= '-${AOOSUFFIX}'/" \
${WRKSRC}/sysui/desktop/productversion.mk
+ ${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${JAVA_HOME}|" \
+ ${WRKSRC}/desktop/scripts/soffice.sh
+ ${REINPLACE_CMD} -e '/^mkdir -p/,$$d' ${CREATE_TREE}
.if ${COMPILER_TYPE} == gcc
# g++49 -Os sometimes leaves inline class methods undefined,
# affects fmgridif.cxx and ColumnControl.cxx
@@ -388,23 +395,15 @@ do-build:
LANG=C LC_ALL=C build.pl --all -P$${numproc} -- -P$${dmproc}
do-install:
- @${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR}/extensions \
- ${STAGEDIR}${OOPATH}/uno_packages/cache/uno_packages \
- ${STAGEDIR}${DESKTOPDIR}
+ @${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
+ ${STAGEDIR}${DESKTOPDIR} \
+ ${STAGEDIR}${PREFIX}/share/mime/packages
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \
for i in *.tar.?z ; do \
${ECHO_CMD} "extracting $$i" ; \
- ${TAR} -s '|./[^/]*/||' -xz -f $$i - \
+ ${TAR} -s '|./[^/]*/||' -xz -f $$i \
-C ${STAGEDIR}${PRINSTALLATION_BASEDIR} ; \
done
- @${ECHO_CMD} "installing extensions" ; \
- cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; \
- ${INSTALL_DATA} ${AOOEXTENSIONS} \
- ${STAGEDIR}${PRINSTALLATION_BASEDIR}/extensions/
- @cd ${STAGEDIR}${OOPATH}/program ; \
- ${ECHO_CMD} "stripping executables and shared libraries" ; \
- ${STRIP_CMD} crashrep pagein uri-encode javaldx regmerge \
- regview *.so* *.bin
${FIND} ${STAGEDIR}${PRINSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
${REINPLACE_CMD} \
-e '/^UserInstallation/s/=.*/=$$SYSUSERCONFIG\/${AOOUDIR}/' \
@@ -421,30 +420,33 @@ do-install:
simpress smath spadmin swriter ; do \
${LN} -f ${EXECBASE} ${EXECBASE}-$${i} ; \
done
- ${LN} -sf ${XDGDIR} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
- @${ECHO_CMD} "installing application icons"
- @cd ${ICONS} ; for dir in hicolor/*/apps ; do \
- ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/$${dir} ; \
- for app in base calc draw impress math printeradmin startcenter writer; do \
- icon_src=$${dir}/$${app}.png; \
- icon_dst=share/icons/$${dir}/${EXECBASE}-$${app}.png; \
- if [ -r $${icon_src} ]; then \
- ${INSTALL_DATA} $${icon_src} \
- ${STAGEDIR}${PREFIX}/$${icon_dst} ; \
- fi \
- done ; \
- done
- @${ECHO_CMD} "installing mimetype icons"
- @cd ${ICONS} ; for dir in hicolor/*/mimetypes ; do \
- dstdir=${STAGEDIR}${PREFIX}/share/icons/$${dir} ; \
- ${MKDIR} $${dstdir} ; \
- ${INSTALL_DATA} $${dir}/*.png $${dstdir}/ ; \
- done
+ @${ECHO_CMD} "adding desktop support"
+ @${LN} -sf ${XDGDIR} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
+ @cd ${WRKSRC}/sysui/unxfbsd?.pro/misc/openoffice ; \
+ DESTDIR=${STAGEDIR} \
+ GNOMEDIR=${PREFIX} \
+ ICON_PREFIX=openoffice${AOOVERSION1} \
+ ICON_SOURCE_DIR=${WRKSRC}/sysui/desktop/icons \
+ ICON_THEMES="hicolor/??x??" \
+ KDEMAINDIR=${PREFIX} \
+ PREFIX=openoffice${AOOVERSION1} \
+ ${SH} ${CREATE_TREE} ; \
+ ${INSTALL_DATA} apacheopenoffice.xml \
+ ${STAGEDIR}/${PREFIX}/share/mime/packages
+
+do-install-SDK-on:
+ ${TAR} -s '|./[^/]*/||' -xz -C ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
+ -f ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice_SDK/archive/install/${LOCALIZED_LANG}/*.tar.gz
+ @f=${STAGEDIR}${OOPATH}/sdk/bin/unoapploader ; \
+ ${CHMOD} 644 $${f} ; ${STRIP_CMD} $${f} ; ${CHMOD} 444 $${f}
+
+post-install:
@${ECHO_CMD} "generating plist";
@cd ${STAGEDIR}${PREFIX} ; (\
- ${ECHO_CMD} "share/applications/${EXECBASE}" ; \
${FIND} -s bin -name "${EXECBASE}*" ; \
- ${FIND} -s ${INSTALLATION_BASEDIR} share/icons \! -type d ; \
+ ${FIND} -s ${INSTALLATION_BASEDIR} share/applications \
+ share/application-registry share/icons \
+ share/mime-info share/mime share/mimelnk \! -type d ; \
${FIND} ${INSTALLATION_BASEDIR} -type d -empty | ${SORT} -r | \
${SED} -e 's/^/@dir /' ; \
) >> ${TMPPLIST}
Modified: branches/2015Q4/editors/openoffice-4/distinfo
==============================================================================
--- branches/2015Q4/editors/openoffice-4/distinfo Thu Nov 5 19:13:54 2015 (r400862)
+++ branches/2015Q4/editors/openoffice-4/distinfo Thu Nov 5 19:21:27 2015 (r400863)
@@ -1,5 +1,5 @@
-SHA256 (openoffice/apache-openoffice-4.1.1-r1617669-src.tar.bz2) = bb89a6d2324ddfe4c475e5484fde0dea316078f6b8ff4d8a4ebc801d17f3ff9f
-SIZE (openoffice/apache-openoffice-4.1.1-r1617669-src.tar.bz2) = 219054455
+SHA256 (openoffice/apache-openoffice-4.1.2-r1709696-src.tar.bz2) = 2e06774424eb564559f9e6d63ff79aa00522b210067717c5a8cfb54b3b7f1812
+SIZE (openoffice/apache-openoffice-4.1.2-r1709696-src.tar.bz2) = 219041975
SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa
SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
Modified: branches/2015Q4/editors/openoffice-4/files/Makefile.others
==============================================================================
--- branches/2015Q4/editors/openoffice-4/files/Makefile.others Thu Nov 5 19:13:54 2015 (r400862)
+++ branches/2015Q4/editors/openoffice-4/files/Makefile.others Thu Nov 5 19:21:27 2015 (r400863)
@@ -3,43 +3,9 @@
# $FreeBSD$
#other stuffs which are not directly related to making ports
-#package-rename: rename package for uploading
-#package-canonical: making official packages (WIP)
-#ure: URE (Uno Runtime Environment) packages (WIP)
#solver: solver
#languagepack: language pack
-package-rename:
- @${ECHO_MSG} "===> Rename package for Apache OpenOffice mirror upload";
- @${LN} ${PKGFILE} \
- ${WRKDIR}/../${PACKAGE_PREFIX}_${PACKAGE_MIDDLE}_install_${LOCALIZED_LANG}${PKG_SUFX}
-
-package-canonical:
- @${ECHO_MSG} "===> Canonical packaging for Apache OpenOffice";
- @${CP} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/${PACKAGE_PREFIX}* ${WRKDIR}/../.
-
-sdk:
- @${ECHO_MSG} "===> Make SDK of Apache OpenOffice"
- @${RM} -fr ${WRKDIR}/sdk_tmp
- @${MKDIR} ${WRKDIR}/sdk_tmp
- @cd ${WRKDIR}/sdk_tmp ; \
- ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice_SDK/archive/install/${LOCALIZED_LANG}/Apache_OpenOffice-*SDK*.tar.gz
- @cd ${WRKDIR}/sdk_tmp/Apache_*/openoffice* ; \
- ${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
- ${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
- ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-SDK_${PACKAGE_MIDDLE}_install_en-US.tbz ${INSTALLATION_BASEDIR}_sdk
-
-ure:
- @${ECHO_MSG} "===> Make Uno Runtime Environment of Apache OpenOffice"
- @${RM} -fr ${WRKDIR}/ure_tmp
- @${MKDIR} ${WRKDIR}/ure_tmp
- @cd ${WRKDIR}/ure_tmp ; \
- ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/URE/archive/install/${LOCALIZED_LANG}/Apache_OpenOffice_*URE*.tar.gz
- @cd ${WRKDIR}/ure_tmp/Apache_OpenOffice*URE* ; \
- ${MKDIR} ../${INSTALLATION_BASEDIR} ; \
- ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
- ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-URE_${PACKAGE_MIDDLE}_install_en-US.tbz ${INSTALLATION_BASEDIR}
-
solver:
@${ECHO_MSG} "===> Make Solver of Apache OpenOffice"
@cd ${WRKSRC} ; ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-solver_${PACKAGE_MIDDLE}.tar.bz2 solver
Copied: branches/2015Q4/editors/openoffice-4/files/patch-configure.in (from r400472, head/editors/openoffice-4/files/patch-configure.in)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/editors/openoffice-4/files/patch-configure.in Thu Nov 5 19:21:27 2015 (r400863, copy of r400472, head/editors/openoffice-4/files/patch-configure.in)
@@ -0,0 +1,32 @@
+--- configure.in.orig 2015-10-09 07:11:14 UTC
++++ configure.in
+@@ -369,11 +369,11 @@ AC_ARG_WITH(bundled-extension-blobs,
+ and comply with their distribution requirements by updating the
+ files LICENSE_aggregated and NOTICE_aggregated accordingly
+ ],,)
+-#AC_ARG_WITH(bundled-prereg-extensions,
+-#[ --with-bundled-prereg-extensions Whitespace seperated list of files in the tarball directory that
+-# are to be bundled as pre-registered extensions. Make sure to only bundle
+-# extensions which can be installed without requiring a license dialog
+-#],,)
++AC_ARG_WITH(bundled-prereg-extensions,
++[ --with-bundled-prereg-extensions Whitespace seperated list of files in the tarball directory that
++ are to be bundled as pre-registered extensions. Make sure to only bundle
++ extensions which can be installed without requiring a license dialog
++],,)
+ AC_ARG_ENABLE(bundled-dictionaries,
+ [ --enable-bundled-dictionaries Download dictionaries (spelling, hyphenation, thesaurus)
+ according to main/extensions.lst and bundle them. Make sure to
+@@ -1540,9 +1540,9 @@ else
+ fi
+ AC_SUBST(BUNDLED_EXTENSION_BLOBS)
+
+-#dnl ===================================================================
+-#dnl Check extensions that are to be bundled as pre-registerd
+-#dnl ===================================================================
++dnl ===================================================================
++dnl Check extensions that are to be bundled as pre-registerd
++dnl ===================================================================
+ if test -n "$with_bundled_prereg_extensions"; then
+ BUNDLED_PREREG_EXTENSIONS="$with_bundled_prereg_extensions"
+ else
Copied: branches/2015Q4/editors/openoffice-4/files/patch-desktop_scripts_soffice.sh (from r400064, head/editors/openoffice-4/files/patch-desktop_scripts_soffice.sh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/editors/openoffice-4/files/patch-desktop_scripts_soffice.sh Thu Nov 5 19:21:27 2015 (r400863, copy of r400064, head/editors/openoffice-4/files/patch-desktop_scripts_soffice.sh)
@@ -0,0 +1,16 @@
+--- desktop/scripts/soffice.sh.orig 2014-02-25 08:22:34 UTC
++++ desktop/scripts/soffice.sh
+@@ -90,11 +90,11 @@ if [ -x "$sd_prog/javaldx" ] ; then
+ case "`uname -s`" in
+ FreeBSD)
+ sd_prog1="$sd_prog"
+- LD_LIBRARY_PATH=$sd_prog1:${LD_LIBRARY_PATH}}
++ LD_LIBRARY_PATH=$sd_prog1${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ export LD_LIBRARY_PATH
+ ;;
+ esac
+- my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS \
++ my_path=`JAVA_HOME="%%JAVA_HOME%%" "$sd_prog/javaldx" $BOOTSTRAPVARS \
+ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
+ if [ -n "$my_path" ] ; then
+ LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
Copied: branches/2015Q4/editors/openoffice-4/files/patch-openjdk8 (from r399605, head/editors/openoffice-4/files/patch-openjdk8)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/editors/openoffice-4/files/patch-openjdk8 Thu Nov 5 19:21:27 2015 (r400863, copy of r399605, head/editors/openoffice-4/files/patch-openjdk8)
@@ -0,0 +1,1808 @@
+--- javaunohelper/com/sun/star/comp/helper/Bootstrap.java.orig 2014-02-25 08:30:16 UTC
++++ javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+@@ -97,6 +97,7 @@ public class Bootstrap {
+ @param context_entries the hash table contains mappings of entry names (type string) to
+ context entries (type class ComponentContextEntry).
+ @return a new context.
++ @throws java.lang.Exception
+ */
+ static public XComponentContext createInitialComponentContext( Hashtable context_entries )
+ throws Exception
+@@ -148,7 +149,8 @@ public class Bootstrap {
+ * Bootstraps a servicemanager with the jurt base components registered.
+ * <p>
+ * @return a freshly boostrapped service manager
+- * @see com.sun.star.lang.ServiceManager
++ * @see "com.sun.star.lang.ServiceManager"
++ * @throws java.lang.Exception
+ */
+ static public XMultiServiceFactory createSimpleServiceManager() throws Exception
+ {
+@@ -157,10 +159,12 @@ public class Bootstrap {
+ }
+
+
+- /** Bootstraps the initial component context from a native UNO installation.
+-
+- @see cppuhelper/defaultBootstrap_InitialComponentContext()
+- */
++ /**
++ * Bootstraps the initial component context from a native UNO installation.
++ * <p>
++ * @return
++ * @see defaultBootstrap_InitialComponentContext()
++ */
+ static public final XComponentContext defaultBootstrap_InitialComponentContext()
+ throws Exception
+ {
+@@ -173,7 +177,7 @@ public class Bootstrap {
+ @param bootstrap_parameters
+ bootstrap parameters (maybe null)
+
+- @see cppuhelper/defaultBootstrap_InitialComponentContext()
++ @see defaultBootstrap_InitialComponentContext()
+ */
+ static public final XComponentContext defaultBootstrap_InitialComponentContext(
+ String ini_file, Hashtable bootstrap_parameters )
+--- javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java.orig 2014-02-25 08:30:16 UTC
++++ javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
+@@ -29,7 +29,7 @@ package com.sun.star.comp.helper;
+ The first one is commonly used for singleton objects of the component
+ context, that are raised on first-time retrieval of the key.
+ You have to pass a com.sun.star.lang.XSingleComponentFactory
+- or string (=> service name) object for this.
++ or string (=> service name) object for this.
+ </p>
+ */
+ public class ComponentContextEntry
+--- javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java.orig 2014-02-25 08:30:16 UTC
++++ javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
+@@ -34,9 +34,9 @@ import com.sun.star.registry.XRegistryKe
+ * The <code>SharedLibraryLoader</code> class provides the functionality of the <code>com.sun.star.loader.SharedLibrary</code>
+ * service.
+ * <p>
+- * @see com.sun.star.loader.SharedLibrary
++ * @see "com.sun.star.loader.SharedLibrary"
+ * @see com.sun.star.comp.servicemanager.ServiceManager
+- * @see com.sun.star.lang.ServiceManager
++ * @see "com.sun.star.lang.ServiceManager"
+ */
+ public class SharedLibraryLoader {
+ /**
+@@ -70,9 +70,9 @@ public class SharedLibraryLoader {
+ * @return the factory for the "com.sun.star.comp.stoc.DLLComponentLoader" component.
+ * @param smgr the ServiceManager
+ * @param regKey the root registry key
+- * @see com.sun.star.loader.SharedLibrary
+- * @see com.sun.star.lang.ServiceManager
+- * @see com.sun.star.registry.RegistryKey
++ * @see "com.sun.star.loader.SharedLibrary"
++ * @see "com.sun.star.lang.ServiceManager"
++ * @see "com.sun.star.registry.RegistryKey"
+ */
+ public static XSingleServiceFactory getServiceFactory(
+ XMultiServiceFactory smgr,
+@@ -93,9 +93,9 @@ public class SharedLibraryLoader {
+ * @param impName the implementation name of the component
+ * @param smgr the ServiceManager
+ * @param regKey the root registry key
+- * @see com.sun.star.loader.SharedLibrary
+- * @see com.sun.star.lang.ServiceManager
+- * @see com.sun.star.registry.RegistryKey
++ * @see "com.sun.star.loader.SharedLibrary"
++ * @see "com.sun.star.lang.ServiceManager"
++ * @see "com.sun.star.registry.RegistryKey"
+ */
+ public static XSingleServiceFactory getServiceFactory(
+ String libName,
+@@ -116,9 +116,9 @@ public class SharedLibraryLoader {
+ * @return true if the registration was successfull - otherwise false
+ * @param smgr the ServiceManager
+ * @param regKey the root key under that the component should be registered
+- * @see com.sun.star.loader.SharedLibrary
+- * @see com.sun.star.lang.ServiceManager
+- * @see com.sun.star.registry.RegistryKey
++ * @see "com.sun.star.loader.SharedLibrary"
++ * @see "com.sun.star.lang.ServiceManager"
++ * @see "com.sun.star.registry.RegistryKey"
+ */
+ public static boolean writeRegistryServiceInfo(
+ com.sun.star.lang.XMultiServiceFactory smgr,
+@@ -136,9 +136,9 @@ public class SharedLibraryLoader {
+ * @param libName name of the shared library
+ * @param smgr the ServiceManager
+ * @param regKey the root key under that the component should be registered
+- * @see com.sun.star.loader.SharedLibrary
+- * @see com.sun.star.lang.ServiceManager
+- * @see com.sun.star.registry.RegistryKey
++ * @see "com.sun.star.loader.SharedLibrary"
++ * @see "com.sun.star.lang.ServiceManager"
++ * @see "com.sun.star.registry.RegistryKey"
+ */
+ public static boolean writeRegistryServiceInfo(
+ String libName,
+--- javaunohelper/com/sun/star/lib/uno/helper/Factory.java.orig 2014-02-25 08:30:16 UTC
++++ javaunohelper/com/sun/star/lib/uno/helper/Factory.java
+@@ -34,7 +34,8 @@ import com.sun.star.uno.UnoRuntime;
+ /** Factory helper class supporting com.sun.star.lang.XServiceInfo and
+ com.sun.star.lang.XSingleComponentFactory.
+
+- @attention
++ Attention:
++ <br>
+ This factory implementation does not support lang.XSingleServiceFactory.
+ */
+ public class Factory
+--- javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java.orig 2014-02-25 08:30:16 UTC
++++ javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
+@@ -467,6 +467,8 @@ public class InterfaceContainer implemen
+ /** The iterator keeps a copy of the list. Changes to InterfaceContainer do not
+ * affect the data of the iterator. Conversly, changes to the iterator are effect
+ * InterfaceContainer.
++ *
++ * @param index
+ */
+ synchronized public ListIterator listIterator(int index)
+ {
+--- javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java.orig 2014-02-25 08:30:16 UTC
++++ javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
+@@ -122,7 +122,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.
+ */
+@@ -140,8 +140,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.
+ */
+@@ -563,11 +562,11 @@ XMultiPropertySet
+ * {@link #setFastPropertyValue XFastPropertySet.setFastPropertyValue}
+ * and {@link #setPropertyValues XMultiPropertySet.setPropertyValues}.
+ * If this method fails, that is, it returns false or throws an exception, then no listeners are notified and the
+- * property value, that was intended to be changed, remains untouched.<br /> This method does not have to deal with property attributes, such as
++ * property value, that was intended to be changed, remains untouched.<br> This method does not have to deal with property attributes, such as
+ * PropertyAttribute.READONLY or PropertyAttribute.MAYBEVOID. The processing of these attributes occurs
+- * in the calling methods.<br />
++ * in the calling methods.<br>
+ * Only if this method returns successfully further processing, such
+- * as listener notification and finally the modifiction of the property's value, will occur.<br />
++ * as listener notification and finally the modifiction of the property's value, will occur.<br>
+ *
+ * The actual modification of a property's value is done by {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast}
+ * which is called subsequent to convertPropertyValue.
+@@ -593,10 +592,10 @@ XMultiPropertySet
+ * Then, no conversion is necessary, since they can hold all possible values. However, if
+ * the member is an Object and <em>setVal</em> is an Any then the object contained in the any is assigned to
+ * the member. The extra type information which exists as Type object in the Any will get lost. If this is not
+- * intended then use an Any variable rather then an Object.<br />
++ * intended then use an Any variable rather then an Object.<br>
+ * If a member is an Object or Any and the argument <em>setVal</em> is an Object, other than String or array,
+ * then it is presumed to be an UNO object and queried for XInterface. If successful, the out-param <em>newVal</em>
+- * returns the XInterface.<br />
++ * returns the XInterface.<br>
+ * If a member is an UNO interface, then <em>setVal</em> is queried for this interface and the result is returned.
+ * If <em>setVal</em> is null then <em>newVal</em> will be null too after return.
+ * <p>
+@@ -793,7 +792,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,
+ * occured during the setting of the value.
+ */
+--- javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java.orig 2014-02-25 08:30:16 UTC
++++ javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
+@@ -193,7 +193,7 @@ public final class PropertySetMixin {
+ @param newValue the property value corresponding to the new
+ attribute value. This is only used as
+ <code>com.sun.star.beans.PropertyChangeEvent.NewValue</code>, which is
+- rather useless, anyway (see “Using the Observer Pattern&rdquo: in
++ rather useless, anyway (see “Using the Observer Pattern” in
+ <a href="http://tools.openoffice.org/CodingGuidelines.sxw">
+ <cite>OpenOffice.org Coding Guidelines</cite></a>), <em>unless</em> the
+ attribute that is going to be set is constrained. If the attribute
+--- ridljar/com/sun/star/uno/IEnvironment.java.orig 2014-02-25 08:33:14 UTC
++++ ridljar/com/sun/star/uno/IEnvironment.java
+@@ -63,7 +63,7 @@ public interface IEnvironment {
+ * given bridge <var>B2</var>.</li>
+ * <li>A proxy object, created as a remote object is mapped into this
+ * environment via a given bridge.</li>
+- * </ul></p>
++ * </ul>
+ *
+ * <p>The object actually registered may differ from the specified
+ * <code>object</code> that is passed as an argument. This enables an
+--- ridljar/com/sun/star/uno/IMethodDescription.java.orig 2014-02-25 08:33:14 UTC
++++ ridljar/com/sun/star/uno/IMethodDescription.java
+@@ -52,7 +52,7 @@ public interface IMethodDescription exte
+ boolean isConst();
+
+ /**
+- * Gives any array of <code>ITypeDescription> of
++ * Gives any array of <code>ITypeDescription</code> of
+ * the [in] parameters.
+ * <p>
+ * @return the in parameters
+@@ -60,7 +60,7 @@ public interface IMethodDescription exte
+ ITypeDescription[] getInSignature();
+
+ /**
+- * Gives any array of <code>ITypeDescription> of
++ * Gives any array of <code>ITypeDescription</code> of
+ * the [out] parameters.
+ * <p>
+ * @return the out parameters
+--- ridljar/com/sun/star/uno/ITypeDescription.java.orig 2014-02-25 08:33:14 UTC
++++ ridljar/com/sun/star/uno/ITypeDescription.java
+@@ -103,8 +103,8 @@ public interface ITypeDescription {
+ /**
+ * Gets the (UNO) type name.
+ *
+- * <p>The following table lists how UNO types map to type names:</p>
+ * <table>
++ * <caption>The following table lists how UNO types map to type names:</caption>
+ * <thead>
+ * <tr><th>UNO type</th><th>type name</th></tr>
+ * </thead>
+@@ -119,15 +119,15 @@ public interface ITypeDescription {
+ * </tr>
+ * <tr><td>LONG</td><td><code>"long"</code></td></tr>
+ * <tr><td>UNSIGNED LONG</td><td><code>"unsigned long"</code></td></tr>
+- * <tr><td>HYPER</td><td></td><code>"hyper"</code></tr>
++ * <tr><td>HYPER</td><td><code>"hyper"</code></td></tr>
+ * <tr>
+- * <td>UNSIGNED HYPER</td><td></td><code>"unsigned hyper"</code>
++ * <td>UNSIGNED HYPER</td><td><code>"unsigned hyper"</code></td>
+ * </tr>
+- * <tr><td>FLOAT</td><td></td><code>"float"</code></tr>
+- * <tr><td>DOUBLE</td><td></td><code>"double"</code></tr>
+- * <tr><td>STRING</td><td></td><code>"string"</code></tr>
+- * <tr><td>TYPE</td><td></td><code>"type"</code></tr>
+- * <tr><td>ANY</td><td></td><code>"any"</code></tr>
++ * <tr><td>FLOAT</td><td><code>"float"</code></td></tr>
++ * <tr><td>DOUBLE</td><td><code>"double"</code></td></tr>
++ * <tr><td>STRING</td><td><code>"string"</code></td></tr>
++ * <tr><td>TYPE</td><td><code>"type"</code></td></tr>
++ * <tr><td>ANY</td><td><code>"any"</code></td></tr>
+ * <tr>
+ * <td>sequence type of base type <var>T</var></td>
+ * <td><code>"[]"</code> followed by type name for <var>T</var></td>
+@@ -148,7 +148,7 @@ public interface ITypeDescription {
+ * <td>interface type named <var>N</var></td>
+ * <td><var>N</var> (see below)</td>
+ * </tr>
+- * <tbody>
++ * </tbody>
+ * </table>
+ * <p>For a UNO type named <var>N</var>, consisting of a sequence of module
+ * names <var>M<sub>1</sub></var>, ..., <var>M<sub>n</sub></var> followed by
+--- ridljar/com/sun/star/uno/Type.java.orig 2014-02-25 08:33:14 UTC
++++ ridljar/com/sun/star/uno/Type.java
+@@ -33,7 +33,7 @@ import java.util.HashMap;
+ * SHORT</code>) do not have a matching Java class. For another, it can be
+ * necessary to describe a type which is unknown to the Java runtime system
+ * (for example, for delaying the need of a class, so that it is possible to
+- * generate it on the fly.)</p>
++ * generate it on the fly.)
+ *
+ * <p>A <code>Type</code> is uniquely determined by its type class (a
+ * <code>TypeClass</code>) and its type name (a <code>String</code>); these two
+@@ -204,7 +204,7 @@ public class Type {
+ *
+ * <p>In certain cases, one Java class corresponds to two UNO types (e.g.,
+ * the Java class <code>short[].class</code> corresponds to both a sequence
+- * of <codde>SHORT</code> and a sequence of <code>UNSIGNED SHORT</code> in
++ * of <code>SHORT</code> and a sequence of <code>UNSIGNED SHORT</code> in
+ * UNO). In such ambiguous cases, the parameter <code>alternative</code>
+ * controls which UNO type is chosen:</p>
+ * <ul>
+--- ridljar/com/sun/star/uno/Union.java.orig 2014-02-25 08:33:14 UTC
++++ ridljar/com/sun/star/uno/Union.java
+@@ -27,7 +27,7 @@ package com.sun.star.uno;
+ * The Union class is the base class for all classes generated
+ * as java binding for the IDL type union.
+ * <p>
+- * Note: The idl type <code>union<code> is currently not fully
++ * Note: The idl type <code>union</code> is currently not fully
+ * integrated into the UNO framework, so don't use it.
+ *
+ * @version $Revision: 1.5 $ $ $Date: 2008-04-11 11:15:07 $
+--- xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java.orig 2014-02-25 08:29:05 UTC
++++ xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java
+@@ -44,7 +44,7 @@ import org.openoffice.xmerge.util.Debug;
+ * AportisDoc implementation of <code>DocumentMerger</code>
+ * for the {@link
+ * org.openoffice.xmerge.converter.xml.sxw.aportisdoc.PluginFactoryImpl
+- * PluginFactoryImpl}.</p>
++ * PluginFactoryImpl}.
+ */
+ public class DocumentMergerImpl implements DocumentMerger {
+
+--- xmerge/source/bridge/java/XMergeBridge.java.orig 2014-02-25 08:29:07 UTC
++++ xmerge/source/bridge/java/XMergeBridge.java
+@@ -92,7 +92,6 @@ public class XMergeBridge {
+
+ /** This inner class provides the component as a concrete implementation
+ * of the service description. It implements the needed interfaces.
+- * @implements XTypeProvider
+ */
+ static public class _XMergeBridge implements
+ XImportFilter,
+--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java.orig 2014-02-25 08:29:13 UTC
++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java
+@@ -44,9 +44,6 @@ public class BeginningOfFile implements
+
+ /**
+ * Constructor that initializes the member values.
+- *
+- * @param ver Version Number
+- * Substream type (workbook = 0x05, worksheet = 0x10)
+ */
+ public BeginningOfFile(boolean global) {
+ setVersion((short) 271);
+@@ -61,6 +58,10 @@ public class BeginningOfFile implements
+ read(is);
+ }
+
++ /**
++ *
++ * @param version Version Number
++ */
+ private void setVersion(short version) {
+ this.version = EndianConverter.writeShort(version);
+ }
+@@ -79,6 +80,10 @@ public class BeginningOfFile implements
+ subStream = EndianConverter.writeShort((short) 0x10);
+ }
+
++ /**
++ *
++ * @return Substream type (workbook = 0x05, worksheet = 0x10)
++ */
+ int getSubStreamType() {
+ return EndianConverter.readShort(subStream);
+ }
+--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java.orig 2014-02-25 08:29:14 UTC
++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java
+@@ -49,8 +49,7 @@ public class BlankCell extends CellValue
+ * Constructs a <code>BlankCell</code> using specified attributes
+ *
+ * @param row row number
+- * @param col column number
+- * @param cellContents contents of the cell
++ * @param column column number
+ * @param ixfe font index
+ */
+ public BlankCell(int row, int column, int ixfe) throws IOException {
+@@ -83,7 +82,7 @@ public class BlankCell extends CellValue
+ /**
+ * Reads a BlankCell <code>InputStream</code>
+ *
+- * @param is InputStream containing a BlankCell.
++ * @param input InputStream containing a BlankCell.
+ */
+ public int read(InputStream input) throws IOException {
+
+--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java.orig 2014-02-25 08:29:13 UTC
++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java
+@@ -43,7 +43,7 @@ public class BoolErrCell extends CellVal
+ * Constructs a BoolErrCell from arguments
+ *
+ * @param row row number
+- * @param col column number
++ * @param column column number
+ * @param ixfe font index
+ * @param bBoolErr Boolean value or error value
+ * @param fError Boolean error flag
+@@ -78,7 +78,7 @@ public class BoolErrCell extends CellVal
+ /**
+ * Writes a <code>BoolErrCell</code> to the specified <code>Outputstream</code>
+ *
+- * @param os the <code>OutputStream</code> to write to
++ * @param output the <code>OutputStream</code> to write to
+ */
+ public void write(OutputStream output) throws IOException {
+
+@@ -95,7 +95,7 @@ public class BoolErrCell extends CellVal
+ /**
+ * Reads a BoolErrCell from the <code>InputStream</code>
+ *
+- * @param is InputStream containing a BoolErrCell
++ * @param input InputStream containing a BoolErrCell
+ */
+ public int read(InputStream input) throws IOException {
+
+--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java.orig 2014-02-25 08:29:14 UTC
++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java
+@@ -64,7 +64,7 @@ public class BoundSheet implements BIFFR
+ * Sets the worksheet name. The sheetname length must be doubled as the
+ * String is stored in unicode format.
+ *
+- * @param sheetname worksheet name
++ * @param sheetName worksheet name
+ */
+ void setSheetName(String sheetName) throws IOException {
+ this.cch = (byte) sheetName.length();
+@@ -95,7 +95,7 @@ public class BoundSheet implements BIFFR
+ /**
+ * Write this particular <code>BIFFRecord</code> to the <code>OutputStream</code>
+ *
+- * @param ouput the <code>OutputStream</code>
++ * @param output the <code>OutputStream</code>
+ */
+ public void write(OutputStream output) throws IOException {
+
+@@ -111,7 +111,7 @@ public class BoundSheet implements BIFFR
+ * Reads a BoundSheet from the <code>InputStream</code> The byte array
+ * must be twice the size of the String as it uses unicode.
+ *
+- * @param is InputStream containing the record data
++ * @param input InputStream containing the record data
+ */
+ public int read(InputStream input) throws IOException {
+
+--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java.orig 2014-02-25 08:29:14 UTC
++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java
+@@ -92,7 +92,7 @@ public abstract class CellValue implemen
+ /**
+ * Writes basic cell value attributes to the specified <code>Outputstream</code>
+ *
+- * @param os the <code>OutputStream</code> to write to
++ * @param output the <code>OutputStream</code> to write to
+ */
+ public void write(OutputStream output) throws IOException {
+
+@@ -102,9 +102,9 @@ public abstract class CellValue implemen
+ }
+
+ /**
+- * Writes a<code>LabelCell</code> to the specified <code>Outputstream</code>
++ * Read a <code>LabelCell</code> from the specified <code>InputStream</code>
+ *
+- * @param os the <code>OutputStream</code> to write to
++ * @param input the <code>InputStream</code> to read from
+ */
+ public int read(InputStream input) throws IOException {
+
+--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java.orig 2014-02-25 08:29:14 UTC
++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java
+@@ -50,8 +50,8 @@ public class ColInfo implements BIFFReco
+ *
+ * @param colFirst the first column this formatting applies to
+ * @param colLast last column this formatting applies to
+- * @param coldx column width
+- * @param grbit options flags
++ * @param colDX column width
++ * @param ixfe options flags
+ */
+ public ColInfo(int colFirst, int colLast, int colDX, int ixfe) {
+ this.colFirst = EndianConverter.writeShort((short)colFirst);
+@@ -135,7 +135,7 @@ public class ColInfo implements BIFFReco
+ /**
+ * Writes a ColInfo to the specified <code>Outputstream</code>
+ *
+- * @param os the <code>OutputStream</code> to write to
++ * @param output the <code>OutputStream</code> to write to
+ */
+ public void write(OutputStream output) throws IOException {
+
+--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java.orig 2014-02-25 08:29:14 UTC
++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java
+@@ -32,7 +32,7 @@ import org.openoffice.xmerge.util.Endian
+ import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants;
+
+ /**
+- * Represents a BIFF record defiuning the defualt column width
++ * Represents a BIFF record defining the default column width
+ */
+ public class DefColWidth implements BIFFRecord {
+
+@@ -40,18 +40,18 @@ public class DefColWidth implements BIFF
+ private byte[] coldx = new byte[2];
+ private byte[] ixfe = new byte[2];
+
+-/**
+- * Constructs a pocket Excel Document from the
+- * <code>InputStream</code> and assigns it the document name passed in
+- *
+- * @param is InputStream containing a Pocket Excel Data file.
+- */
+ public DefColWidth() {
+ grbit = new byte[] {0x00, 0x00};
+ coldx = new byte[] {0x00, 0x09};
+ ixfe = new byte[] {0x00, 0x00};
+ }
+
++ /**
++ * Constructs a pocket Excel Document from the
++ * <code>InputStream</code> and assigns it the document name passed in
++ *
++ * @param is InputStream containing a Pocket Excel Data file.
++ */
+ public DefColWidth(InputStream is) throws IOException {
+ read(is);
+ }
+--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java.orig 2014-02-25 08:29:13 UTC
++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java
+@@ -39,12 +39,6 @@ public class DefRowHeight implements BIF
+ private byte[] unknown1 = new byte[2];
+ private byte[] unknown2 = new byte[2];
+
+- /**
+- * Constructs a pocket Excel Document from the
+- * <code>InputStream</code> and assigns it the document name passed in
+- *
+- * @param is InputStream containing a Pocket Excel Data file.
+- */
+ public DefRowHeight() {
+ unknown1 = new byte[] {(byte)0x00, (byte)0x00};
+ unknown2 = new byte[] {(byte)0xFF, (byte)0x00};
+--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java.orig 2014-02-25 08:29:14 UTC
++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java
+@@ -50,11 +50,6 @@ public class DefinedName implements BIFF
+ private String definition = new String("");
+ private Workbook wb;
+
+- /**
+- * Constructs a Defined Name from the <code>InputStream</code>
+- *
+- * @param is InputStream containing the record data
+- */
+ public DefinedName(NameDefinition nd, Workbook wb) throws IOException {
+
+ fh.setWorkbook(wb);
+@@ -95,7 +90,7 @@ public class DefinedName implements BIFF
+ * Reads a Defined Name from the <code>InputStream</code> The byte array
+ * must be twice the size of the String as it uses unicode.
+ *
+- * @param is InputStream containing the record data
++ * @param input InputStream containing the record data
+ */
+ public int read(InputStream input) throws IOException {
+
+@@ -126,7 +121,7 @@ public class DefinedName implements BIFF
+ /**
+ * Write this particular <code>BIFFRecord</code> to the <code>OutputStream</code>
+ *
+- * @param ouput the <code>OutputStream</code>
++ * @param output the <code>OutputStream</code>
+ */
+ public void write(OutputStream output) throws IOException {
+
+--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java.orig 2014-02-25 08:29:14 UTC
++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java
+@@ -276,7 +276,7 @@ org.openoffice.xmerge.converter.xml.Offi
+ /**
+ * Compare two ExtendedFormat to see if the font index is the same
+ *
+- * @param the ExtendedFormat to be used in the comaprison
++ * @param rhs the ExtendedFormat to be used in the comaprison
+ * @return boolean if the two are the same otherwise false
+ */
+ public boolean compareTo(ExtendedFormat rhs) {
+@@ -352,7 +352,7 @@ org.openoffice.xmerge.converter.xml.Offi
+ }
+
+ /**
+- * Writes the ExtendedFormat to the <code>Outputstream<code>
++ * Writes the ExtendedFormat to the <code>Outputstream</code>
+ *
+ * @param output the <code>Outputstream</code>to write to
+ */
+--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java.orig 2014-02-25 08:29:14 UTC
++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java
+@@ -52,7 +52,7 @@ public class FloatNumber extends CellVal
+ * Constructs a <code>FloatNumber</code> using specified attributes
+ *
+ * @param row row number
+- * @param col column number
++ * @param column column number
+ * @param cellContents contents of the cell
+ * @param ixfe font index
+ */
+--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java.orig 2014-02-25 08:29:13 UTC
++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java
+@@ -56,13 +56,6 @@ public class FontDescription implements
+ public static final int UNDERLINE = 0x01;
+ public static final int ITALIC = 0x02;
+
+- /**
+- * Constructs a FontDescription from the bold italic and undelrine attributes
+- *
+- * @param italic Italic attribute
+- * @param bold Bold attribute
+- * @param underline Underline attribute
+- */
+ public FontDescription(Format fmt) throws IOException {
+
+ Debug.log(Debug.TRACE,"Building FontDescriptor based on Format : " + fmt);
+@@ -230,7 +223,7 @@ public class FontDescription implements
+ /**
+ * Constructs a Font Description from the <code>InputStream</code>
+ *
+- * @param is InputStream containing a <code>FontDescription</code>
++ * @param input InputStream containing a <code>FontDescription</code>
+ */
+ public int read(InputStream input) throws IOException {
+
+--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java.orig 2014-02-25 08:29:14 UTC
++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java
+@@ -51,10 +51,9 @@ public class Formula extends CellValue i
+ * Constructs a <code>Formula</code> using specified attributes
+ *
+ * @param row row number
+- * @param col column number
++ * @param column column number
+ * @param cellContents contents of the cell
+ * @param ixfe font index
+- * @param value the value of the cell
+ */
+ public Formula(int row, int column, String cellContents, int ixfe, Format fmt, Workbook wb)
+ throws Exception {
+@@ -112,7 +111,7 @@ public class Formula extends CellValue i
+ * Translates a <code>String</code> written in infix which represents a
+ * formula into a byte[] what can be written to pocket excel file.
+ *
+- * @param formula string
++ * @param inFormula formula string
+ */
+ public void setFormula(String inFormula) throws Exception {
+
+@@ -171,7 +170,7 @@ public class Formula extends CellValue i
+ /**
+ * Writes the Formula record to the <code>OutputStream</code>
+ *
+- * @param the <code>OutputStream</code> being written to
++ * @param output the <code>OutputStream</code> being written to
+ */
+ public void write(OutputStream output) throws IOException {
+
+--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java.orig 2014-02-25 08:29:14 UTC
++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
+@@ -44,7 +44,7 @@ public class LabelCell extends CellValue
+ * Constructs a <code>LabelCell</code> using specified attributes
+ *
+ * @param row row number
+- * @param col column number
++ * @param column column number
+ * @param cellContents contents of the cell
+ * @param ixfe font index
+ */
+@@ -69,7 +69,7 @@ public class LabelCell extends CellValue
+ /**
+ * Writes a <code>LabelCell</code> to the specified <code>Outputstream</code>
+ *
+- * @param os the <code>OutputStream</code> to write to
++ * @param output the <code>OutputStream</code> to write to
+ */
+ public void write(OutputStream output) throws IOException {
+
+@@ -126,7 +126,7 @@ public class LabelCell extends CellValue
+ /**
+ * Sets the <code>String</code> representing the cells contents
+ *
+- * @return the <code>String</code> representing the cells contents
++ * @param cellContents the <code>String</code> representing the cells contents
+ */
+ private void setLabel(String cellContents) throws IOException {
+ rgch = cellContents.getBytes("UTF-16LE");
+--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java.orig 2014-02-25 08:29:14 UTC
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list