Author: petko
Date: Mon Oct 8 06:19:32 2018
New Revision: 1843109
URL: http://svn.apache.org/viewvc?rev=1843109&view=rev
Log:
Issue 127876 - unbreak ODK build with Java 8
Modified:
openoffice/branches/AOO416/ (props changed)
openoffice/branches/AOO416/main/ (props changed)
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/IEnvironment.java
openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/IMethodDescription.java
openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/ITypeDescription.java
openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/Type.java
openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/Union.java
openoffice/branches/AOO416/main/xmerge/ (props changed)
openoffice/branches/AOO416/main/xmerge/source/activesync/XMergeFilter.cpp
openoffice/branches/AOO416/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java
openoffice/branches/AOO416/main/xmerge/source/bridge/java/XMergeBridge.java
openoffice/branches/AOO416/main/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java
openoffice/branches/AOO416/main/xmerge/source/palmtests/qa/comparator/pdbcomparison.java
openoffice/branches/AOO416/main/xmerge/source/palmtests/qa/test_spec/convertor_test_spec.html
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java
openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDescriptor.java
openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java
openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java
openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java
openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
openoffice/branches/AOO416/main/xmerge/workben/jstyle.pl
Propchange: openoffice/branches/AOO416/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 8 06:19:32 2018
@@ -2,5 +2,5 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1647713,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543,1705551,1706649,1707397,1707659,1723875,1729921,1730154,174
8497,1754469,1755873,1756017,1757789,1758150,1760461,1761439,1761808,1763017,1763019,1765170,1766467,1766530,1766915,1772139,1780015,1784925,1784961,1785175,1791815,1793216,1797494,1800077,1800568,1802428,1803787,1803939,1804182,1805089,1805208,1806314,1811013,1811435,1811737,1813450,1814994,1815700,1818098,1825850,1839130,1839837,1840427
+/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1647713,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1697228,1697237,1697247,1697306,1697312,1702894,1702898,1702986,1702988,1705542-1705543,1705551,1706649,170
7397,1707659,1723875,1729921,1730154,1748497,1754469,1755873,1756017,1757789,1758150,1760461,1761439,1761808,1763017,1763019,1765170,1766467,1766530,1766915,1772139,1780015,1784925,1784961,1785175,1791815,1793216,1797494,1800077,1800568,1802428,1803787,1803939,1804182,1805089,1805208,1806314,1811013,1811435,1811737,1813450,1814994,1815700,1818098,1825850,1839130,1839837,1840427
/openoffice/trunk/main:1705369
Propchange: openoffice/branches/AOO416/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 8 06:19:32 2018
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main:1417739-1541842
/openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1620195,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1643177,1650314,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,169780
7,1700078,1700126,1700135,1702107,1702894,1702898,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1706649,1707167,1707169-1707170,1707175,1707397,1707408,1707412,1707642,1707645,1707659,1707844,1708477,1708483,1709212,1709377,1709403,1723875,1729921,1730154,1748497,1754469,1755873,1756017,1757789,1758150,1760461,1761439,1761808,1763017,1763019,1765170,1766467,1766915,1772139,1780015,1784925,1784961,1785175,1791815,1793216,1797494,1800077,1800568,1802428,1803787,1803939,1804182,1805089,1805208,1806314,1811737,1813450,1815700,1818098,1825850,1839130,1839837,1840427
+/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1620195,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1643177,1650314,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,169722
8,1697237,1697247,1697306,1697312,1697807,1700078,1700126,1700135,1702107,1702894,1702898,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1706649,1707167,1707169-1707170,1707175,1707397,1707408,1707412,1707642,1707645,1707659,1707844,1708477,1708483,1709212,1709377,1709403,1723875,1729921,1730154,1748497,1754469,1755873,1756017,1757789,1758150,1760461,1761439,1761808,1763017,1763019,1765170,1766467,1766915,1772139,1780015,1784925,1784961,1785175,1791815,1793216,1797494,1800077,1800568,1802428,1803787,1803939,1804182,1805089,1805208,1806314,1811737,1813450,1815700,1818098,1825850,1839130,1839837,1840427
Modified:
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/javaunohelper/com/sun/star/comp/helper/Bootstrap.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
(original)
+++
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
Mon Oct 8 06:19:32 2018
@@ -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 )
Modified:
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
(original)
+++
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
Mon Oct 8 06:19:32 2018
@@ -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
Modified:
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
(original)
+++
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
Mon Oct 8 06:19:32 2018
@@ -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,
Modified:
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/Factory.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
(original)
+++
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
Mon Oct 8 06:19:32 2018
@@ -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
Modified:
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
(original)
+++
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
Mon Oct 8 06:19:32 2018
@@ -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)
{
Modified:
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
(original)
+++
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
Mon Oct 8 06:19:32 2018
@@ -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.
*/
Modified:
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
(original)
+++
openoffice/branches/AOO416/main/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
Mon Oct 8 06:19:32 2018
@@ -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
Modified:
openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/IEnvironment.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/IEnvironment.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/IEnvironment.java
(original)
+++ openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/IEnvironment.java
Mon Oct 8 06:19:32 2018
@@ -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
Modified:
openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/IMethodDescription.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/IMethodDescription.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/IMethodDescription.java
(original)
+++
openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/IMethodDescription.java
Mon Oct 8 06:19:32 2018
@@ -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
Modified:
openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/ITypeDescription.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/ITypeDescription.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/ITypeDescription.java
(original)
+++
openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/ITypeDescription.java
Mon Oct 8 06:19:32 2018
@@ -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
Modified: openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/Type.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/Type.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/Type.java
(original)
+++ openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/Type.java Mon Oct
8 06:19:32 2018
@@ -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>
Modified: openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/Union.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/Union.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/Union.java
(original)
+++ openoffice/branches/AOO416/main/ridljar/com/sun/star/uno/Union.java Mon Oct
8 06:19:32 2018
@@ -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 $
Propchange: openoffice/branches/AOO416/main/xmerge/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 8 06:19:32 2018
@@ -0,0 +1,5 @@
+/openoffice/branches/AOO400/main/xmerge:1503684
+/openoffice/branches/ia2/main/xmerge:1417739-1541842
+/openoffice/branches/ooxml-osba/main/xmerge:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
+/openoffice/branches/rejuvenate01/main/xmerge:1480411,1534063,1534098,1536312,1549902,1560617
+/openoffice/trunk/main/xmerge:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591062,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1620195,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1643177,1650314,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701
,1695962,1697228,1697237,1697247,1697306,1697807,1700078,1700126,1700135,1702107,1702894,1702898,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1706649,1707167,1707169-1707170,1707175,1707397,1707408,1707412,1707642,1707645,1707659,1707844,1708477,1708483,1709212,1709377,1709403,1723875,1729921,1730154,1748497,1754469,1755873,1756017,1758150,1760461,1761439,1761808,1763017,1763019,1765170,1766467,1766915,1772139,1780015,1784925,1784961,1785175,1791815,1793216,1797494,1800077,1800568,1802428,1803787,1803939,1804182,1805208,1806314,1811737,1813450,1815700,1825850,1839130,1839837,1840427
Modified:
openoffice/branches/AOO416/main/xmerge/source/activesync/XMergeFilter.cpp
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/activesync/XMergeFilter.cpp?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/xmerge/source/activesync/XMergeFilter.cpp
(original)
+++ openoffice/branches/AOO416/main/xmerge/source/activesync/XMergeFilter.cpp
Mon Oct 8 06:19:32 2018
@@ -222,7 +222,7 @@ STDMETHODIMP CXMergeFilter::NextConvertF
/*
* First step: Locate Java and establish the classpath. If these can't
- * be done succesfully, then avoid all further processing.
+ * be done successfully, then avoid all further processing.
*/
// Locate Java Home if it hasn't already been done.
Modified:
openoffice/branches/AOO416/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java
Mon Oct 8 06:19:32 2018
@@ -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 {
Modified:
openoffice/branches/AOO416/main/xmerge/source/bridge/java/XMergeBridge.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/bridge/java/XMergeBridge.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/xmerge/source/bridge/java/XMergeBridge.java
(original)
+++ openoffice/branches/AOO416/main/xmerge/source/bridge/java/XMergeBridge.java
Mon Oct 8 06:19:32 2018
@@ -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,
Modified:
openoffice/branches/AOO416/main/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java
Mon Oct 8 06:19:32 2018
@@ -119,7 +119,7 @@ public final class SxcDocumentDeserializ
PalmDocument palmDoc = (PalmDocument) e.nextElement();
worksheetName[i] = palmDoc.getName();
- // Search for the "-", which seperates workbook from worksheet
+ // Search for the "-", which separates workbook from worksheet
int start = worksheetName[i].indexOf("-");
if (start != -1) {
Modified:
openoffice/branches/AOO416/main/xmerge/source/palmtests/qa/comparator/pdbcomparison.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/palmtests/qa/comparator/pdbcomparison.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/palmtests/qa/comparator/pdbcomparison.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/palmtests/qa/comparator/pdbcomparison.java
Mon Oct 8 06:19:32 2018
@@ -249,7 +249,7 @@ public class pdbcomparison
/**
* This method populates the pdb arrays with the names of the pdbs to
- * compare. Ths listFile lists a series of entries, wherein each
+ * compare. This listFile lists a series of entries, wherein each
* line indicates the PDB names to be compared.
* <pdbname1>=<pdbname2>
*
Modified:
openoffice/branches/AOO416/main/xmerge/source/palmtests/qa/test_spec/convertor_test_spec.html
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/palmtests/qa/test_spec/convertor_test_spec.html?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/palmtests/qa/test_spec/convertor_test_spec.html
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/palmtests/qa/test_spec/convertor_test_spec.html
Mon Oct 8 06:19:32 2018
@@ -152,7 +152,7 @@ export the document.</BLOCKQUOTE>
</P>
</UL>
<H2>5.0 Test Cases</H2>
-<BLOCKQUOTE>The test cases are divided into seperate sections for
+<BLOCKQUOTE>The test cases are divided into separate sections for
each PDB format supported by XMerge, and further divided into
Convert and Merge tests within each format. The Convert tests
validate that XMerge can perform the round trip conversion from
@@ -389,7 +389,7 @@ than the Style-retaining functionality i
<P><B>Expected result:</B> <BR>The resultant document
should
contain:
</P>
- <BLOCKQUOTE>This line is using First Line indent style.
Now isnt
+ <BLOCKQUOTE>This line is using First Line indent style.
Now isn't
that Kool... Also Im running short of words to say
here, to wrap
this particular sentence.</BLOCKQUOTE>
</TD>
@@ -1431,7 +1431,7 @@ than the Style-retaining functionality i
c_alignment.pdb. <BR>Merge c_alignment.pdb to
c_alignment.sxc.
</P>
- <P>Logical Funtion test B4:
+ <P>Logical Function test B4:
</P>
<P>IF(Logical Test; Then Value;Else Value)
</P>
@@ -1481,7 +1481,7 @@ than the Style-retaining functionality i
TRUE in formula bar. <BR>Export the doc back to
c_boolean.pdb. <BR>Merge c_boolean.pdb to
c_boolean.sxc.
</P>
- <P>Logical Funtion test : cells A1, A2:
+ <P>Logical Function test : cells A1, A2:
</P>
<P>A1=TRUE
</P>
@@ -1567,7 +1567,7 @@ than the Style-retaining functionality i
c_cellfloatvalue.sxc.
</P>
<P>The original sheet has selected Format ->
Cells... ->
- Numbers Tab -> & Numbers from the list box,
choosen
+ Numbers Tab -> & Numbers from the list box,
chosen
-1234.12, tho set the Format Code to 0.00 preventing
the sheet
display rounding values to two decimal places. It also
has
fraction display enabled in certain cells.</P>
@@ -2265,7 +2265,7 @@ than the Style-retaining functionality i
c_multi_boolean.pdb. <BR>Merge
c_multi_boolean.pdb to
c_multi_boolean.sxc.
</P>
- <P>Logical Funtion test : cells A1-A4:
+ <P>Logical Function test : cells A1-A4:
</P>
<P>A1-A4 = FALSE
</P>
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java
Mon Oct 8 06:19:32 2018
@@ -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);
}
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java
Mon Oct 8 06:19:32 2018
@@ -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 {
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java
Mon Oct 8 06:19:32 2018
@@ -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 {
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java
Mon Oct 8 06:19:32 2018
@@ -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 {
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java
Mon Oct 8 06:19:32 2018
@@ -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 {
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java
Mon Oct 8 06:19:32 2018
@@ -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 {
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java
Mon Oct 8 06:19:32 2018
@@ -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);
}
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java
Mon Oct 8 06:19:32 2018
@@ -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};
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java
Mon Oct 8 06:19:32 2018
@@ -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 {
@@ -192,7 +187,7 @@ public class DefinedName implements BIFF
* @return the <code>String</code> containing the definition
*/
private String getDefinition() {
- // pexcel sometimes creates Name definition with no defintion,
bug??
+ // pexcel sometimes creates Name definition with no definition,
bug??
if(EndianConverter.readShort(cce)!=0) {
definition = fh.convertPXLToCalc(rgce);
definition = definition.substring(1); // remove the
'='
@@ -202,7 +197,7 @@ public class DefinedName implements BIFF
}
/**
- * Returns the defintion
+ * Returns the definition
*
* @return the <code>String</code> containing the definition
*/
@@ -211,7 +206,7 @@ public class DefinedName implements BIFF
return fh.isRangeType();
}
/**
- * Returns the defintion
+ * Returns the definition
*
* @return the <code>String</code> containing the definition
*/
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java
Mon Oct 8 06:19:32 2018
@@ -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
*/
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java
Mon Oct 8 06:19:32 2018
@@ -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
*/
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java
Mon Oct 8 06:19:32 2018
@@ -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 {
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java
Mon Oct 8 06:19:32 2018
@@ -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 {
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
Mon Oct 8 06:19:32 2018
@@ -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");
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
Mon Oct 8 06:19:32 2018
@@ -120,9 +120,11 @@ public class Pane implements BIFFRecord
}
/**
- * Get the hex code for this particular <code>BIFFRecord</code>
+ * Set the pane number of the active pane
+ * 0 - bottom right, 1 - top right
+ * 2 - bottom left, 3 - top left
*
- * @return the hex code for <code>Pane</code>
+ * @param paneNumber the pane number of the active pane
*/
public void setPaneNumber(int paneNumber) {
pnnAcct = (byte) paneNumber;
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java
Mon Oct 8 06:19:32 2018
@@ -101,7 +101,7 @@ public class Row implements BIFFRecord {
/**
* Reads a Row from an <code>InputStream</code>
*
- * @param is InputStream containing a Pane Record
+ * @param input InputStream containing a Pane Record
*/
public int read(InputStream input) throws IOException {
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
Mon Oct 8 06:19:32 2018
@@ -76,21 +76,11 @@ public class Selection implements BIFFRe
return PocketExcelConstants.CURRENT_SELECTION;
}
- /**
- * Get the hex code for this particular <code>BIFFRecord</code>
- *
- * @return the hex code for <code>Selection</code>
- */
public Point getActiveCell() {
Point p = new Point(colActive,
EndianConverter.readShort(rwActive));
return p;
}
- /**
- * Get the hex code for this particular <code>BIFFRecord</code>
- *
- * @return the hex code for <code>Selection</code>
- */
public void setActiveCell(Point p) {
colActive = (byte) p.getX();
@@ -100,7 +90,7 @@ public class Selection implements BIFFRe
/**
* Reads a Selection Record from the <code>InputStream</code>
*
- * @param is InputStream containing a Pocket Excel Data file.
+ * @param input InputStream containing a Pocket Excel Data file.
*/
public int read(InputStream input) throws IOException {
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java
Mon Oct 8 06:19:32 2018
@@ -43,9 +43,9 @@ public class StringValue implements BIFF
private byte[] rgch;
/**
- * Constructs a StringValue Record from an <code>InputStream</code>
+ * Constructs a StringValue Record from a <code>String</code>
*
- * @param is InputStream containing a StringValue Record
+ * @param str
*/
public StringValue(String str) throws IOException {
cch = EndianConverter.writeShort((short) str.length());
@@ -74,7 +74,7 @@ public class StringValue implements BIFF
/**
* Reads a StringVlaue Record from an <code>InputStream</code>
*
- * @param is InputStream containing a StringValue Record
+ * @param input InputStream containing a StringValue Record
*/
public int read(InputStream input) throws IOException {
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java
Mon Oct 8 06:19:32 2018
@@ -87,7 +87,7 @@ public class Window1 implements BIFFReco
/**
* Reads a Window1 Record from an <code>InputStream</code>
*
- * @param is InputStream containing a Window1 Record
+ * @param input InputStream containing a Window1 Record
*/
public int read(InputStream input) throws IOException {
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java
Mon Oct 8 06:19:32 2018
@@ -123,7 +123,7 @@ public class Window2 implements BIFFReco
/**
* Reads a Window2 Record from an <code>InputStream</code>
*
- * @param is InputStream containing a Window2 Record
+ * @param input InputStream containing a Window2 Record
*/
public int read(InputStream input) throws IOException {
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
Mon Oct 8 06:19:32 2018
@@ -208,7 +208,7 @@ OfficeConstants {
}
/**
- * Adds a font recrod to the workbook
+ * Adds a font record to the workbook
*
* @param f the font record to add
*/
@@ -236,7 +236,7 @@ OfficeConstants {
/**
* Adds a ExtendedFormat record to the workbook
*
- * @param f the font recrod to add
+ * @param fmt the font record to add
*/
public int addExtendedFormat(Format fmt) throws IOException {
@@ -358,7 +358,7 @@ OfficeConstants {
/**
* Adds a <code>Worksheet</code> to the workbook.
*
- * @return name the name of the <code>Worksheet</code> to be added
+ * @param name the name of the <code>Worksheet</code> to be added
*/
public void addWorksheet(String name) throws IOException {
@@ -372,7 +372,6 @@ OfficeConstants {
/**
* Adds a cell to the current worksheet.
*
- * @return the name of the <code>Worksheet</code> to be added
*/
public void addCell(int row,int col, Format fmt, String cellContents)
throws IOException {
@@ -466,12 +465,6 @@ OfficeConstants {
}
}
- /**
- * Will create a number of ColInfo recrods based on the column widths
- * based in.
- *
- * @param an integer list representing the column widths
- */
public void addNameDefinition(NameDefinition nameDefinition) throws
IOException {
DefinedName dn = new DefinedName(nameDefinition, this);
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
Mon Oct 8 06:19:32 2018
@@ -56,25 +56,18 @@ public class Worksheet {
private BeginningOfFile bof;
private Eof eof;
- /**
- * Writes the current workbook to the <code>Outputstream</code>
- *
- * @param os The destination outputstream
- */
public Worksheet(Workbook wb) {
this.wb = wb;
}
/**
* Default Contructor
- *
- * @param os The destination outputstream
*/
public Worksheet() {
}
/**
- * Writes the current workbook to the <code>Outputstream</code>
+ * Writes the current workbook to the <code>OutputStream</code>
*
* @param os The destination outputstream
*/
@@ -229,7 +222,7 @@ public class Worksheet {
* Adds a cell to this worksheet. Current valdid celltypes are
* <code>FloatNumber</code>, <code>LabelCell</code> or
<code>Formula</code>
*
- * @param f the font recrod to add
+ * @param br
*/
public void addCell(BIFFRecord br) {
cells.add(br);
@@ -239,7 +232,7 @@ public class Worksheet {
* Adds a number of ColInfo Records to the worksheet base on a list of
* clumnwidths passed in
*
- * @param list of column widths
+ * @param r list of column widths
*/
public void addRow(Row r) {
rows.add(r);
@@ -249,16 +242,12 @@ public class Worksheet {
* Adds a number of ColInfo Records to the worksheet base on a list of
* clumnwidths passed in
*
- * @param list of column widths
+ * @param c list of column widths
*/
public void addCol(ColInfo c) {
colInfo.add(c);
}
- /**
- * Returns an <code>Enumeration</code> to the ColInfo's for this
worksheet
- *
- * @return an <code>Enumeration</code> to the ColInfo's
- */
+
public void addSettings(SheetSettings s) {
sel.setActiveCell(s.getCursor());
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java
Mon Oct 8 06:19:32 2018
@@ -45,7 +45,7 @@ import org.openoffice.xmerge.util.Debug;
* else if token is close bracket
* pop from stack into result until close bracket
or function
* else
- * while stack.top.priority >= token.priority
+ * while stack.top.priority >= token.priority
* add stack.pop to result
* push token onto stack
* </pre>
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
Mon Oct 8 06:19:32 2018
@@ -33,7 +33,7 @@ import org.openoffice.xmerge.converter.x
/**
* This Helper class provides a simplified interface to conversion between
PocketXL formula representation
* and Calc formula representation.<p>
- * The class is used by {@link
org.openoffice.xmerge.converter.xml.sxc.pexcel.Records.Formula}
+ * The class is used by {@link
org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Formula}
*/
public class FormulaHelper {
Modified:
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java?rev=1843109&r1=1843108&r2=1843109&view=diff
==============================================================================
---
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java
(original)
+++
openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java
Mon Oct 8 06:19:32 2018
@@ -32,7 +32,7 @@ import org.openoffice.xmerge.util.Debug;
/**
* This is the Formula Parser based on an article written by Jack Crenshaw. It
is a
* top down parser with some basic error handling. It handles
- * +,-,*,/,>,<,>=,<=,=,<>, unary + and - as well as functions.
+ * +,-,*,/,>,<,>=,<=,=,<>, unary + and - as well as
functions.
* The BNF notation for this parser is
* <pre>
* <expression> ::= <unary op> <term>
[<addop>|<logop> <term>]
@@ -110,7 +110,7 @@ public class FormulaParser {
}
/**
- * Identify <, >, <=, >=, =, <> using the index to find the current
character(s)
+ * Identify <, >, <=, >=, =, <> using the index to
find the current character(s)
*
* @return A boolean returning the result of the comparison
*/
@@ -131,9 +131,9 @@ public class FormulaParser {
}
/**
- * Identify <, >, <=, >=, =, <>
+ * Identify <, >, <=, >=, =, <>
*
- * @param The <code>String</code> which is to be identified
+ * @param op The <code>String</code> which is to be identified
* @return A boolean returning the result of the comparison
*/
private boolean isLogicalOp(String op) {
@@ -397,7 +397,7 @@ public class FormulaParser {
* Will keep pulling valid logical operators from the formula and return
* the resultant <code>String</code>.
*
- * @return a <code>String<code> representing a logical operator
+ * @return a <code>String</code> representing a logical operator
*/
private String getLogicalOperator() throws FormulaParsingException {
String op = new String();
@@ -535,7 +535,7 @@ public class FormulaParser {
/**
* Pull a logical operator starting at the current index, add a token
for
- * that operator to the tokenVector and call <code>term<code> to parse
the
+ * that operator to the tokenVector and call <code>term</code> to parse
the
* right hand side of the operator
*/
private void logicalOp() throws FormulaParsingException {
