You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2018/10/11 16:53:52 UTC
svn commit: r1843571 [1/3] - in /openoffice/branches/AOO416: ./
ext_libraries/serf/ main/ main/javaunohelper/com/sun/star/comp/helper/
main/javaunohelper/com/sun/star/lib/uno/helper/ main/redland/
main/redland/prj/ main/redland/raptor/ main/redland/ras...
Author: mseidel
Date: Thu Oct 11 16:53:51 2018
New Revision: 1843571
URL: http://svn.apache.org/viewvc?rev=1843571&view=rev
Log:
Rollback to Rev. 1843088 due to build errors.
Added:
openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.autotools
- copied unchanged from r1843088, openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.autotools
openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.dmake
- copied unchanged from r1843088, openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.dmake
openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.fixes
- copied unchanged from r1843088, openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.fixes
openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.ooo_build
- copied unchanged from r1843088, openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.ooo_build
openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.os2
- copied unchanged from r1843088, openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.os2
openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.win32
- copied unchanged from r1843088, openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.win32
openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.autotools
- copied unchanged from r1843088, openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.autotools
openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.dmake
- copied unchanged from r1843088, openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.dmake
openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.ooo_build
- copied unchanged from r1843088, openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.ooo_build
openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.os2
- copied unchanged from r1843088, openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.os2
openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.win32
- copied unchanged from r1843088, openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.win32
openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.autotools
- copied unchanged from r1843088, openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.autotools
openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.dmake
- copied unchanged from r1843088, openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.dmake
openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.ooo_build
- copied unchanged from r1843088, openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.ooo_build
openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.os2
- copied unchanged from r1843088, openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.os2
openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.win32
- copied unchanged from r1843088, openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.win32
Removed:
openoffice/branches/AOO416/main/redland/raptor/raptor2-2.0.15.patch.dmake
openoffice/branches/AOO416/main/redland/raptor/raptor2-2.0.15.patch.os2
openoffice/branches/AOO416/main/redland/raptor/raptor2-2.0.15.patch.win32
openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.33.patch.dmake
openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.33.patch.ooo_build
openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.33.patch.win32
openoffice/branches/AOO416/main/redland/redland/redland-1.0.17.patch.autotools
openoffice/branches/AOO416/main/redland/redland/redland-1.0.17.patch.dmake
openoffice/branches/AOO416/main/redland/redland/redland-1.0.17.patch.ooo_build
openoffice/branches/AOO416/main/redland/redland/redland-1.0.17.patch.os2
openoffice/branches/AOO416/main/redland/redland/redland-1.0.17.patch.win32
Modified:
openoffice/branches/AOO416/ (props changed)
openoffice/branches/AOO416/ext_libraries/serf/makefile.mk
openoffice/branches/AOO416/main/ (props changed)
openoffice/branches/AOO416/main/configure.in
openoffice/branches/AOO416/main/external_deps.lst
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/redland/ (props changed)
openoffice/branches/AOO416/main/redland/prj/d.lst
openoffice/branches/AOO416/main/redland/raptor/makefile.mk
openoffice/branches/AOO416/main/redland/rasqal/makefile.mk
openoffice/branches/AOO416/main/redland/redland/makefile.mk
openoffice/branches/AOO416/main/redland/redlandversion.mk
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/scp2/source/ooo/file_library_ooo.scp
openoffice/branches/AOO416/main/sw/ (props changed)
openoffice/branches/AOO416/main/sw/source/core/inc/cntfrm.hxx
openoffice/branches/AOO416/main/sw/source/core/layout/tabfrm.cxx
openoffice/branches/AOO416/main/vcl/source/gdi/ (props changed)
openoffice/branches/AOO416/main/vcl/source/gdi/sallayout.cxx
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 Thu Oct 11 16:53:51 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,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,1837212,1837765,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,1702894,1702898,1702986,1702988,1705542-1705543,1705551,1706649,1707397,1707659,1723875,1729921,1730154,174
8497,1754469,1755873,1756017,1758150,1760461,1761439,1761808,1763017,1763019,1765170,1766467,1766530,1766915,1772139,1780015,1784925,1784961,1785175,1791815,1793216,1797494,1800077,1800568,1802428,1803787,1803939,1804182,1805208,1806314,1811013,1811435,1811737,1813450,1814994,1815700,1825850,1839130,1839837,1840427
/openoffice/trunk/main:1705369
Modified: openoffice/branches/AOO416/ext_libraries/serf/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/ext_libraries/serf/makefile.mk?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/ext_libraries/serf/makefile.mk (original)
+++ openoffice/branches/AOO416/ext_libraries/serf/makefile.mk Thu Oct 11 16:53:51 2018
@@ -108,7 +108,7 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
# Serf names its library only with the major number.
# We are using minor and micro as well. Fix that here
# by creating a copy with the right name.
-SERF_ORIGINAL_LIB=.libs/libserf-$(SERF_MAJOR).0.dylib
+SERF_ORIGINAL_LIB=.libs/libserf-$(SERF_MAJOR).0.0.0.dylib
SERF_FIXED_LIB=.libs/libserf-$(LIBSERFVERSION).0.dylib
INSTALL_ACTION=if [ -f "$(SERF_ORIGINAL_LIB)" -a ! -f "$(SERF_FIXED_LIB)" ]; then cp $(SERF_ORIGINAL_LIB) $(SERF_FIXED_LIB); fi
.ENDIF
Propchange: openoffice/branches/AOO416/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 11 16:53:51 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,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,1837212,1837765,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,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,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/configure.in
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/configure.in?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/configure.in (original)
+++ openoffice/branches/AOO416/main/configure.in Thu Oct 11 16:53:51 2018
@@ -1146,7 +1146,7 @@ case "$build_os" in
CC="`xcrun -f clang` -arch x86_64"
fi
if test ! -n "$CXX"; then
- CXX="`xcCXX="`xcrun -f clang++` -arch x86_64"
+ CXX="`xcrun -f clang++` -arch x86_64 -std=c++11"
fi
;;
os2*)
@@ -3914,17 +3914,17 @@ dnl ====================================
dnl Checks for a MacOS platform SDK compatible with an OSX 10.7 deployment target
dnl ===================================================================
if test "$_os" = "Darwin"; then
- sdk_target=10.9
+ sdk_target=10.7
AC_MSG_CHECKING([checking SDK compatiblity with OSX $sdk_target])
sdk_minor=`echo $sdk_target | cut -d"." -f2`
- if test "$sdk_minor" -lt "9"; then
- AC_MSG_ERROR([SDK version < 10.9 is not longer supported])
+ if test "$sdk_minor" -lt "7"; then
+ AC_MSG_ERROR([SDK version < 10.7 is not longer supported])
else
MACOSX_DEPLOYMENT_TARGET=$sdk_target
- sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(9|10|11|12)" | sed -e "s/.*sdk //" | tail -n1`
+ sdk_found=`xcodebuild -showsdks | egrep "sdk macosx10.(7|8|9|10|11)" | sed -e "s/.*sdk //" | tail -n1`
if test -z "$sdk_found"; then
AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
else
Modified: openoffice/branches/AOO416/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/external_deps.lst?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/external_deps.lst (original)
+++ openoffice/branches/AOO416/main/external_deps.lst Thu Oct 11 16:53:51 2018
@@ -85,21 +85,21 @@ if (ENABLE_NSS_MODULE!=NO && SYSTEM_NSS!
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_REDLAND != YES)
- MD5 = a39f6c07ddb20d7dd2ff1f95fa21e2cd
- name = raptor2-2.0.15.tar.gz
- URL1 = http://download.librdf.org/source/raptor2-2.0.15.tar.gz
+ MD5 = 284e768eeda0e2898b0d5bf7e26a016e
+ name = raptor-1.4.18.tar.gz
+ URL1 = http://download.librdf.org/source/raptor-1.4.18.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_REDLAND != YES)
- MD5 = e5be03eda13ef68aabab6e42aa67715e
- name = redland-1.0.17.tar.gz
- URL1 = http://download.librdf.org/source/redland-1.0.17.tar.gz
+ MD5 = ca66e26082cab8bb817185a116db809b
+ name = redland-1.0.8.tar.gz
+ URL1 = http://download.librdf.org/source/redland-1.0.8.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_REDLAND != YES)
- MD5 = 1f5def51ca0026cd192958ef07228b52
- name = rasqal-0.9.33.tar.gz
- URL1 = http://download.librdf.org/source/rasqal-0.9.33.tar.gz
+ MD5 = fca8706f2c4619e2fa3f8f42f8fc1e9d
+ name = rasqal-0.9.16.tar.gz
+ URL1 = http://download.librdf.org/source/rasqal-0.9.16.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (GUI!=UNX || SYSTEM_ZLIB!=YES)
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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018
@@ -97,7 +97,6 @@ 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
@@ -149,8 +148,7 @@ 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"
- * @throws java.lang.Exception
+ * @see com.sun.star.lang.ServiceManager
*/
static public XMultiServiceFactory createSimpleServiceManager() throws Exception
{
@@ -159,12 +157,10 @@ public class Bootstrap {
}
- /**
- * Bootstraps the initial component context from a native UNO installation.
- * <p>
- * @return
- * @see defaultBootstrap_InitialComponentContext()
- */
+ /** Bootstraps the initial component context from a native UNO installation.
+
+ @see cppuhelper/defaultBootstrap_InitialComponentContext()
+ */
static public final XComponentContext defaultBootstrap_InitialComponentContext()
throws Exception
{
@@ -177,7 +173,7 @@ public class Bootstrap {
@param bootstrap_parameters
bootstrap parameters (maybe null)
- @see defaultBootstrap_InitialComponentContext()
+ @see cppuhelper/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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018
@@ -34,8 +34,7 @@ import com.sun.star.uno.UnoRuntime;
/** Factory helper class supporting com.sun.star.lang.XServiceInfo and
com.sun.star.lang.XSingleComponentFactory.
- Attention:
- <br>
+ @attention
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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018
@@ -467,8 +467,6 @@ 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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,7 +140,8 @@ 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 type The property's type (Property.Type).
+ * @param handle The property's handle (Property.Handle).
+ * @param Type The property's type (Property.Type).
* @param attributes The property's attributes (Property.Attributes).
* @param id Identifies the property's storage.
*/
@@ -562,11 +563,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.
@@ -592,10 +593,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>
@@ -792,7 +793,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 newVal the new value for the property.
+ * @param value 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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” in
+ rather useless, anyway (see “Using the Observer Pattern&rdquo: 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
Propchange: openoffice/branches/AOO416/main/redland/
('svn:mergeinfo' removed)
Modified: openoffice/branches/AOO416/main/redland/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/redland/prj/d.lst?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/redland/prj/d.lst (original)
+++ openoffice/branches/AOO416/main/redland/prj/d.lst Thu Oct 11 16:53:51 2018
@@ -1,13 +1,13 @@
mkdir: %_DEST%\inc%_EXT%\external
..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\*.h
-..\%__SRC%\lib\libraptor2.so.0 %_DEST%\lib%_EXT%\libraptor2.so.0
-symlink: %_DEST%\lib%_EXT%\libraptor2.so.0 %_DEST%\lib%_EXT%\libraptor2.so
-..\%__SRC%\lib\libraptor2.0.dylib %_DEST%\lib%_EXT%\libraptor2.0.dylib
-symlink: %_DEST%\lib%_EXT%\libraptor2.0.dylib %_DEST%\lib%_EXT%\libraptor2.dylib
-..\%__SRC%\lib\librasqal.so.3 %_DEST%\lib%_EXT%\librasqal.so.3
-symlink: %_DEST%\lib%_EXT%\librasqal.so.3 %_DEST%\lib%_EXT%\librasqal.so
-..\%__SRC%\lib\librasqal.3.dylib %_DEST%\lib%_EXT%\librasqal.3.dylib
-symlink: %_DEST%\lib%_EXT%\librasqal.3.dylib %_DEST%\lib%_EXT%\librasqal.dylib
+..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so.1
+symlink: %_DEST%\lib%_EXT%\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so
+..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.1.dylib
+symlink: %_DEST%\lib%_EXT%\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.dylib
+..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so.1
+symlink: %_DEST%\lib%_EXT%\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so
+..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.1.dylib
+symlink: %_DEST%\lib%_EXT%\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.dylib
..\%__SRC%\lib\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so.0
symlink: %_DEST%\lib%_EXT%\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so
..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.0.dylib
Modified: openoffice/branches/AOO416/main/redland/raptor/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/redland/raptor/makefile.mk?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/redland/raptor/makefile.mk (original)
+++ openoffice/branches/AOO416/main/redland/raptor/makefile.mk Thu Oct 11 16:53:51 2018
@@ -40,28 +40,28 @@ all:
.INCLUDE : ../redlandversion.mk
-RAPTORVERSION=2.0.15
+RAPTORVERSION=$(RAPTOR_MAJOR).4.18
-TARFILE_NAME=raptor2-$(RAPTORVERSION)
-TARFILE_MD5=a39f6c07ddb20d7dd2ff1f95fa21e2cd
+TARFILE_NAME=raptor-$(RAPTORVERSION)
+TARFILE_MD5=284e768eeda0e2898b0d5bf7e26a016e
ADDITIONAL_FILES=src/makefile.mk src/raptor_config.h
OOO_PATCH_FILES= \
+ $(TARFILE_NAME).patch.autotools \
+ $(TARFILE_NAME).patch.ooo_build \
$(TARFILE_NAME).patch.dmake \
+ $(TARFILE_NAME).patch.win32 \
+ $(TARFILE_NAME).patch.fixes
PATCH_FILES=$(OOO_PATCH_FILES)
.IF "$(OS)"=="OS2"
+BUILD_ACTION=dmake
+BUILD_DIR=$(CONFIGURE_DIR)/src
+ADDITIONAL_FILES+=src/windows.h
OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2
-CONFIGURE_DIR=
-CONFIGURE_ACTION=libtoolize && aclocal && autoconf && .$/configure
-# do not enable grddl parser (#i93768#)
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(PWD)/$(OUT) --includedir=(PWD)$/$(INCCOM) --libdir=$(PWD)$/$(LB)
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw
@@ -77,16 +77,12 @@ raptor_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
# do not enable grddl parser (#i93768#)
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" --prefix=$(PWD)/$(OUT) --includedir=(PWD)$/$(INCCOM) --libdir=$(PWD)$/$(LB) --CC="$(raptor_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(raptor_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
.ELSE
# there is no wntmsci build environment in the tarball; we use custom dmakefile
-OOO_PATCH_FILES+=$(TARFILE_NAME).patch.win32
-CONFIGURE_ACTION= ${PERL} -p -e '$$prefix="'$(PWD)/$(OUT)'"; $$libdir="'$(PWD)/$(LB)'"; $$incdir="'$(PWD)/$(INCCOM)'"; $$ldflags="-L$(SOLARLIBDIR) -lxml2 -lm";' -e 's/\@prefix\@/$$prefix/; s/\@exec_prefix\@/\$${prefix}/; s/\@libdir\@/$$libdir/; s/\@includedir\@/$$incdir/; s/\@PACKAGE\@/raptor2/; s/\@VERSION\@/2.0.15/; s/\@PKG_CONFIG_REQUIRES\@//; s/\@RAPTOR_LDFLAGS\@/$$ldflags/;' < raptor2.pc.in > raptor2.pc && \
- ${PERL} -p -e 's/\@RAPTOR_VERSION_DECIMAL\@/20015/;s/\@VERSION\@/2.0.15/;s/\@RAPTOR_VERSION_MAJOR\@/2/;s/\@RAPTOR_VERSION_MINOR\@/0/;s/\@RAPTOR_VERSION_RELEASE\@/15/' < src/raptor2.h.in > src/raptor2.h && \
- $(COPY) src/raptor_config.h.in src/raptor_config.h
BUILD_ACTION=dmake
BUILD_DIR=$(CONFIGURE_DIR)$/src
.ENDIF
@@ -128,11 +124,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake vari
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
# do not enable grddl parser (#i93768#)
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --with-www=xml --prefix=$(PDW)/$(OUT) --includedir=$(PWD)/$(INCCOM) --libdir=$(PWD)/$(LB)
-.IF "$(SYSTEM_LIBXML)" == "NO"
-CONFIGURE_FLAGS+=--with-xml2-config=${SOLARVERSION}/${INPATH}/bin/xml2-config \
- --with-xslt-config=${SOLARVERSION}/${INPATH}/bin/xslt-config
-.ENDIF
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
@@ -141,22 +133,24 @@ BUILD_DIR=$(CONFIGURE_DIR)
.ENDIF
-OUT2INC+=src/raptor.h src/raptor2.h src/raptor_config.h
+OUT2INC+=src/raptor.h
.IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/libraptor2.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor2.dylib
+OUT2LIB+=src$/.libs$/libraptor.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib
+OUT2BIN+=src/raptor-config
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
OUT2LIB+=src$/.libs$/*.a
OUT2BIN+=src$/.libs$/*.dll
+OUT2BIN+=src/raptor-config
.ELSE
# if we use dmake, this is done automagically
.ENDIF
.ELIF "$(GUI)"=="OS2"
-OUT2LIB+=src$/.libs$/*.a
-OUT2BIN+=src$/.libs$/*.dll
+# if we use dmake, this is done automagically
.ELSE
-OUT2LIB+=src$/.libs$/libraptor2.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor2.so
+OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so
+OUT2BIN+=src/raptor-config
.ENDIF
# --- Targets ------------------------------------------------------
Modified: openoffice/branches/AOO416/main/redland/rasqal/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/redland/rasqal/makefile.mk?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/redland/rasqal/makefile.mk (original)
+++ openoffice/branches/AOO416/main/redland/rasqal/makefile.mk Thu Oct 11 16:53:51 2018
@@ -40,27 +40,27 @@ all:
.INCLUDE : ../redlandversion.mk
-RASQALVERSION=0.9.33
+RASQALVERSION=0.9.16
TARFILE_NAME=rasqal-$(RASQALVERSION)
-TARFILE_MD5=1f5def51ca0026cd192958ef07228b52
+TARFILE_MD5=fca8706f2c4619e2fa3f8f42f8fc1e9d
-ADDITIONAL_FILES=src/makefile.mk
+ADDITIONAL_FILES=src/makefile.mk src/rasqal_config.h
OOO_PATCH_FILES= \
+ $(TARFILE_NAME).patch.autotools \
$(TARFILE_NAME).patch.ooo_build \
$(TARFILE_NAME).patch.dmake \
+ $(TARFILE_NAME).patch.win32
PATCH_FILES=$(OOO_PATCH_FILES)
.IF "$(OS)"=="OS2"
-CONFIGURE_DIR=
-CONFIGURE_ACTION=libtoolize && aclocal && autoconf && .$/configure RAPTOR2_CFLAGS=-I${PWD}$/..$/${INPATH}/inc RAPTOR2_LIBS='-L${PWD}$/..$/${INPATH}/lib -lraptor2 -lxml2 -lcurl' PKG_CONFIG_PATH='../raptor2-2.0.15;../rasqal-0.9.33'
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-regex-library=posix --with-decimal=none
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_ACTION=dmake
+BUILD_DIR=$(CONFIGURE_DIR)$/src
+ADDITIONAL_FILES+=src/windows.h
+OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
rasqal_CC=$(CC) -mthreads
@@ -80,12 +80,6 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
.ELSE
# there is no wntmsci build environment in the tarball; we use custom dmakefile
-OOO_PATCH_FILES+= $(TARFILE_NAME).patch.win32
-CONFIGURE_ACTION= ${PERL} -p -e '$$prefix="'$(PWD)/$(OUT)'"; $$libdir="'$(PWD)/$(LB)'"; $$incdir="'$(PWD)/$(INCCOM)'"; $$ldflags="-L$(SOLARLIBDIR) -lraptor2 -lm";' -e 's/\@prefix\@/$$prefix/; s/\@exec_prefix\@/\$${prefix}/; s/\@libdir\@/$$libdir/; s/\@includedir\@/$$incdir/; s/\@PACKAGE\@/rasqal/; s/\@VERSION\@/0.9.33/; s/\@PKG_CONFIG_REQUIRES\@/raptor2 >= 2.0.7/; s/\@RAPTOR_LDFLAGS\@/$$ldflags/;' < rasqal.pc.in > rasqal.pc && \
- ${PERL} -p -e 's/\@RASQAL_VERSION_DECIMAL\@/933/;s/\@VERSION\@/0.9.33/;s/\@RASQAL_VERSION_MAJOR\@/0/;s/\@RASQAL_VERSION_MINOR\@/9/;s/\@RASQAL_VERSION_RELEASE\@/33/;s/\@HAVE_SYS_TIME_H\@/0/;s/\@HAVE_TIME_H\@/1/;s/\@RAPTOR_VERSION_DEC\@/2.0.15/' < src/rasqal.h.in > src/rasqal.h && \
- $(COPY) src/rasqal_config.h.in src/rasqal_config.h && \
- $(COPY) src/snprintf.c src/rasqal_snprintf.c && \
- $(COPY) libsv/sv.c src/sv.c
BUILD_ACTION=dmake
BUILD_DIR=$(CONFIGURE_DIR)$/src
.ENDIF
@@ -124,11 +118,8 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake vari
.EXPORT: XSLTLIB
CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" RASQAL_CFLAGS=-I${PWD}$/..$/${INPATH}/inc RASQAL_LIBS="-L${PWD}/..$/${INPATH}/lib -lrasqual" RAPTOR2_CFLAGS=-I${PWD}$/..$/${INPATH}/inc RAPTOR2_LIBS="-L${PWD}/..$/${INPATH}/lib -lraptor2" PKG_CONFIG_PATH="../raptor2-2.0.15:../rasqal-0.9.33"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-regex-library=posix --with-decimal=none
-.IF "$(SYSTEM_LIBXML)" == "NO"
-CONFIGURE_FLAGS+=--with-xml2-config=${SOLARVERSION}/${INPATH}/bin/xml2-config
-.ENDIF
+CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
@@ -151,8 +142,7 @@ OUT2BIN+=src/rasqal-config
# if we use dmake, this is done automagically
.ENDIF
.ELIF "$(OS)"=="OS2"
-OUT2LIB+=src$/.libs$/*.a
-OUT2BIN+=src$/.libs$/*.dll
+# if we use dmake, this is done automagically
.ELSE
OUT2LIB+=src$/.libs$/librasqal.so.$(RASQAL_MAJOR) src$/.libs$/librasqal.so
OUT2BIN+=src/rasqal-config
Modified: openoffice/branches/AOO416/main/redland/redland/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/redland/redland/makefile.mk?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/redland/redland/makefile.mk (original)
+++ openoffice/branches/AOO416/main/redland/redland/makefile.mk Thu Oct 11 16:53:51 2018
@@ -40,29 +40,27 @@ all:
.INCLUDE : ../redlandversion.mk
-REDLANDVERSION=1.0.17
+REDLANDVERSION=1.0.8
TARFILE_NAME=redland-$(REDLANDVERSION)
-TARFILE_MD5=e5be03eda13ef68aabab6e42aa67715e
+TARFILE_MD5=ca66e26082cab8bb817185a116db809b
-ADDITIONAL_FILES=src/makefile.mk src/rdf_config.h
+ADDITIONAL_FILES=librdf/makefile.mk librdf/rdf_config.h
OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.autotools \
$(TARFILE_NAME).patch.dmake \
$(TARFILE_NAME).patch.ooo_build \
+ $(TARFILE_NAME).patch.win32
PATCH_FILES=$(OOO_PATCH_FILES) \
.IF "$(OS)"=="OS2"
+BUILD_ACTION=dmake
+BUILD_DIR=$(CONFIGURE_DIR)$/librdf
+ADDITIONAL_FILES+=librdf/windows.h
OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2
-CONFIGURE_DIR=
-CONFIGURE_ACTION=libtoolize --force && aclocal && autoconf && .$/configure RAPTOR2_CFLAGS=-I${PWD}$/..$/${INPATH}/inc RAPTOR2_LIBS='-L${PWD}/..$/${INPATH}/lib -lraptor2 -lxml2 -lcurl' PKG_CONFIG_PATH='../raptor2-2.0.15;../rasqal-0.9.33'
-CONFIGURE_FLAGS=--disable-dependency-tracking --disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore -without-iodbc --without-unixodbc --without-datadirect --without-virtuoso --with-regex-library=posix --with-decimal=none --with-www=xml --disable-ltdl-install --disable-modular --without-included-ltdl --disable-ltdl-convenience
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
redland_CC=$(CC) -mthreads
@@ -82,11 +80,8 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
.ELSE
# there is no wntmsci build environment in the tarball; we use custom dmakefile
-OOO_PATCH_FILES+= $(TARFILE_NAME).patch.win32
-CONFIGURE_ACTION= \
- $(COPY) src/rdf_config.h.in src/rdf_config.h
BUILD_ACTION=dmake
-BUILD_DIR=$(CONFIGURE_DIR)$/src
+BUILD_DIR=$(CONFIGURE_DIR)$/librdf
.ENDIF
.ELSE # "WNT"
@@ -127,9 +122,8 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake vari
.EXPORT: XSLTLIB
CONFIGURE_DIR=
-#CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" RAPTOR2_CFLAGS=-I${PWD}$/..$/${INPATH}/inc RAPTOR2_LIBS="-L${PWD}/..$/${INPATH}/lib -lraptor2" PKG_CONFIG_PATH="../raptor2-2.0.15:../rasqal-0.9.33"
-CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" PKG_CONFIG_PATH="../raptor2-2.0.15:../rasqal-0.9.33"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore -without-iodbc --without-unixodbc --without-datadirect --without-virtuoso --with-regex-library=posix --with-decimal=none --with-www=xml --disable-ltdl-install --disable-modular --without-included-ltdl --disable-ltdl-convenience
+CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
@@ -138,41 +132,21 @@ BUILD_DIR=$(CONFIGURE_DIR)
.ENDIF
-OUT2INC+=src$/librdf.h src$/redland.h \
- src$/rdf_concepts.h \
- src$/rdf_digest.h \
- src$/rdf_hash.h \
- src$/rdf_init.h \
- src$/rdf_iterator.h \
- src$/rdf_list.h \
- src$/rdf_log.h \
- src$/rdf_model.h \
- src$/rdf_node.h \
- src$/rdf_parser.h \
- src$/rdf_query.h \
- src$/rdf_raptor.h \
- src$/rdf_serializer.h \
- src$/rdf_statement.h \
- src$/rdf_storage.h \
- src$/rdf_storage_module.h \
- src$/rdf_stream.h \
- src$/rdf_uri.h \
- src$/rdf_utf8.h \
+OUT2INC+=librdf$/*.h
.IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/librdf.$(REDLAND_MAJOR).dylib
+OUT2LIB+=librdf$/.libs$/librdf.$(REDLAND_MAJOR).dylib
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
-OUT2LIB+=src$/.libs$/*.a
-OUT2BIN+=src$/.libs$/*.dll
+OUT2LIB+=librdf$/.libs$/*.a
+OUT2BIN+=librdf$/.libs$/*.dll
.ELSE
# if we use dmake, this is done automagically
.ENDIF
.ELIF "$(OS)"=="OS2"
-OUT2LIB+=src$/.libs$/*.a
-OUT2BIN+=src$/.libs$/*.dll
+# if we use dmake, this is done automagically
.ELSE
-OUT2LIB+=src$/.libs$/librdf.so.$(REDLAND_MAJOR)
+OUT2LIB+=librdf$/.libs$/librdf.so.$(REDLAND_MAJOR)
.ENDIF
# --- Targets ------------------------------------------------------
Modified: openoffice/branches/AOO416/main/redland/redlandversion.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/redland/redlandversion.mk?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/redland/redlandversion.mk (original)
+++ openoffice/branches/AOO416/main/redland/redlandversion.mk Thu Oct 11 16:53:51 2018
@@ -21,8 +21,8 @@
-RAPTOR_MAJOR=0
-RASQAL_MAJOR=3
+RAPTOR_MAJOR=1
+RASQAL_MAJOR=1
# redland has no stable abi
REDLAND_MAJOR=0
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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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>
+ * </ul></p>
*
* <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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018
@@ -52,7 +52,7 @@ public interface IMethodDescription exte
boolean isConst();
/**
- * Gives any array of <code>ITypeDescription</code> of
+ * Gives any array of <code>ITypeDescription> 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</code> of
+ * Gives any array of <code>ITypeDescription> 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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><code>"hyper"</code></td></tr>
+ * <tr><td>HYPER</td><td></td><code>"hyper"</code></tr>
* <tr>
- * <td>UNSIGNED HYPER</td><td><code>"unsigned hyper"</code></td>
+ * <td>UNSIGNED HYPER</td><td></td><code>"unsigned hyper"</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>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>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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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.)
+ * generate it on the fly.)</p>
*
* <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 <code>SHORT</code> and a sequence of <code>UNSIGNED SHORT</code> in
+ * of <codde>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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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 $
Modified: openoffice/branches/AOO416/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/scp2/source/ooo/file_library_ooo.scp?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/branches/AOO416/main/scp2/source/ooo/file_library_ooo.scp Thu Oct 11 16:53:51 2018
@@ -1839,9 +1839,9 @@ File gid_File_Lib_Raptor
Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
#ifdef MACOSX
- Name = STRING(CONCAT4(libraptor2,.,RAPTOR_MAJOR,UNXSUFFIX));
+ Name = STRING(CONCAT4(libraptor,.,RAPTOR_MAJOR,UNXSUFFIX));
#else
- Name = STRING(CONCAT4(libraptor2,UNXSUFFIX,.,RAPTOR_MAJOR));
+ Name = STRING(CONCAT4(libraptor,UNXSUFFIX,.,RAPTOR_MAJOR));
#endif
#elif defined(OS2)
Name = "raptor.dll";
Propchange: openoffice/branches/AOO416/main/sw/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 11 16:53:51 2018
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/sw:1417739-1541842
/openoffice/branches/ooxml-osba/main/sw:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/sw:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/sw:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1605355,1605689,1606055,1606061,1607111,1607649,1608348,1608733,1610411,1610671,1611549,1612539,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898,1702986,1702988,1705364,1705368,1707169,1837212
+/openoffice/trunk/main/sw:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1605355,1605689,1606055,1606061,1607111,1607649,1608348,1608733,1610411,1610671,1611549,1612539,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898,1702986,1702988,1705364,1705368,1707169
Modified: openoffice/branches/AOO416/main/sw/source/core/inc/cntfrm.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/sw/source/core/inc/cntfrm.hxx?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/sw/source/core/inc/cntfrm.hxx (original)
+++ openoffice/branches/AOO416/main/sw/source/core/inc/cntfrm.hxx Thu Oct 11 16:53:51 2018
@@ -103,7 +103,6 @@ public:
sal_Bool MoveFtnCntFwd( sal_Bool, SwFtnBossFrm* );//von MoveFwd gerufen bei Ftn-Inhalt
inline SwCntntFrm* GetNextCntntFrm() const;
- inline SwCntntFrm* GetNextCntntFrm( bool ) const;
inline SwCntntFrm* GetPrevCntntFrm() const;
static bool CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave, long nBottom, bool bSkipRowSpanCells );
void RegisterToNode( SwCntntNode& );
@@ -118,16 +117,6 @@ inline SwCntntFrm* SwCntntFrm::GetNextCn
return (SwCntntFrm*)ImplGetNextCntntFrm( true );
}
-inline SwCntntFrm* SwCntntFrm::GetNextCntntFrm( bool bPrune ) const
-{
- if ( bPrune && !GetPrev() )
- return NULL;
- else if ( bPrune || !(GetNext() && GetNext()->IsCntntFrm()))
- return (SwCntntFrm*)ImplGetNextCntntFrm( true );
- else
- return (SwCntntFrm*)GetNext();
-}
-
inline SwCntntFrm* SwCntntFrm::GetPrevCntntFrm() const
{
if ( GetPrev() && GetPrev()->IsCntntFrm() )
Modified: openoffice/branches/AOO416/main/sw/source/core/layout/tabfrm.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/sw/source/core/layout/tabfrm.cxx?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/sw/source/core/layout/tabfrm.cxx (original)
+++ openoffice/branches/AOO416/main/sw/source/core/layout/tabfrm.cxx Thu Oct 11 16:53:51 2018
@@ -1536,7 +1536,6 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm
// LONG_MAX == nBottom means we have to calculate all
bool bAll = LONG_MAX == nBottom;
bool bRet = sal_False;
- bool bPrune;
SwCntntFrm *pCnt = pLay->ContainsCntnt();
SWRECTFN( pLay )
@@ -1613,8 +1612,9 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm
pCnt->GetUpper()->Calc();
}
// <--
- bPrune = !bAll && ( (*fnRect->fnYDiff)((pCnt->Frm().*fnRect->fnGetTop)(), nBottom) > 0 );
- pCnt = pCnt->GetNextCntntFrm( bPrune );
+ if( ! bAll && (*fnRect->fnYDiff)((pCnt->Frm().*fnRect->fnGetTop)(), nBottom) > 0 )
+ break;
+ pCnt = pCnt->GetNextCntntFrm();
}
return bRet;
}
Propchange: openoffice/branches/AOO416/main/vcl/source/gdi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 11 16:53:51 2018
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/vcl/source/gdi:1417739-1541842
/openoffice/branches/ooxml-osba/main/vcl/source/gdi:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/vcl/source/gdi:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/vcl/source/gdi:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,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,1621121,1623847,1623849-1623850,1631975,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1700135,1702894,1702898,1702986,1702988,1705193,1837765
+/openoffice/trunk/main/vcl/source/gdi:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,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,1621121,1623847,1623849-1623850,1631975,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1700135,1702894,1702898,1702986,1702988,1705193
Modified: openoffice/branches/AOO416/main/vcl/source/gdi/sallayout.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/vcl/source/gdi/sallayout.cxx?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/vcl/source/gdi/sallayout.cxx (original)
+++ openoffice/branches/AOO416/main/vcl/source/gdi/sallayout.cxx Thu Oct 11 16:53:51 2018
@@ -1871,15 +1871,7 @@ void MultiSalLayout::AdjustLayout( ImplL
// get the next codepoint index that needs fallback
int nActiveCharPos = nCharPos[0];
// get the end index of the active run
- // nActiveCharPos can be less than mnMinCharPos if the ScriptItemize() call
- // in UniscribeLayout::LayoutText() finds a mult-character script item
- // that starts in the leading context and overlaps into the start of the
- // run. UniscribeLayout::LayoutText() drops the glyphs for the context
- // characters, but does not (yet?) adjust the starting character position
- // of the item. Since the text layout direction can't change in the
- // middle of the offending script item, we can safely use the direction at
- // the start of the run
- int nLastRunEndChar = (vRtl[nActiveCharPos >= mnMinCharPos ? (nActiveCharPos - mnMinCharPos) : 0])?
+ int nLastRunEndChar = (vRtl[nActiveCharPos - mnMinCharPos])?
rArgs.mnEndCharPos : rArgs.mnMinCharPos - 1;
int nRunVisibleEndChar = nCharPos[0];
// merge the fallback levels
Propchange: openoffice/branches/AOO416/main/xmerge/
('svn:mergeinfo' removed)
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=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/xmerge/source/activesync/XMergeFilter.cpp (original)
+++ openoffice/branches/AOO416/main/xmerge/source/activesync/XMergeFilter.cpp Thu Oct 11 16:53:51 2018
@@ -222,7 +222,7 @@ STDMETHODIMP CXMergeFilter::NextConvertF
/*
* First step: Locate Java and establish the classpath. If these can't
- * be done successfully, then avoid all further processing.
+ * be done succesfully, 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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}.
+ * PluginFactoryImpl}.</p>
*/
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=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/xmerge/source/bridge/java/XMergeBridge.java (original)
+++ openoffice/branches/AOO416/main/xmerge/source/bridge/java/XMergeBridge.java Thu Oct 11 16:53:51 2018
@@ -92,6 +92,7 @@ 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018
@@ -119,7 +119,7 @@ public final class SxcDocumentDeserializ
PalmDocument palmDoc = (PalmDocument) e.nextElement();
worksheetName[i] = palmDoc.getName();
- // Search for the "-", which separates workbook from worksheet
+ // Search for the "-", which seperates 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018
@@ -249,7 +249,7 @@ public class pdbcomparison
/**
* This method populates the pdb arrays with the names of the pdbs to
- * compare. This listFile lists a series of entries, wherein each
+ * compare. Ths 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018
@@ -152,7 +152,7 @@ export the document.</BLOCKQUOTE>
</P>
</UL>
<H2>5.0 Test Cases</H2>
-<BLOCKQUOTE>The test cases are divided into separate sections for
+<BLOCKQUOTE>The test cases are divided into seperate 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 isn't
+ <BLOCKQUOTE>This line is using First Line indent style. Now isnt
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 Function test B4:
+ <P>Logical Funtion 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 Function test : cells A1, A2:
+ <P>Logical Funtion 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, chosen
+ Numbers Tab -> & Numbers from the list box, choosen
-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 Function test : cells A1-A4:
+ <P>Logical Funtion 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018
@@ -44,6 +44,9 @@ 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);
@@ -58,10 +61,6 @@ public class BeginningOfFile implements
read(is);
}
- /**
- *
- * @param version Version Number
- */
private void setVersion(short version) {
this.version = EndianConverter.writeShort(version);
}
@@ -80,10 +79,6 @@ 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018
@@ -49,7 +49,8 @@ public class BlankCell extends CellValue
* Constructs a <code>BlankCell</code> using specified attributes
*
* @param row row number
- * @param column column number
+ * @param col column number
+ * @param cellContents contents of the cell
* @param ixfe font index
*/
public BlankCell(int row, int column, int ixfe) throws IOException {
@@ -82,7 +83,7 @@ public class BlankCell extends CellValue
/**
* Reads a BlankCell <code>InputStream</code>
*
- * @param input InputStream containing a BlankCell.
+ * @param is 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018
@@ -43,7 +43,7 @@ public class BoolErrCell extends CellVal
* Constructs a BoolErrCell from arguments
*
* @param row row number
- * @param column column number
+ * @param col 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 output the <code>OutputStream</code> to write to
+ * @param os 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 input InputStream containing a BoolErrCell
+ * @param is InputStream containing a BoolErrCell
*/
public int read(InputStream input) throws IOException {