Modified: openoffice/branches/gbuild-reintegration/main/framework/test/typecfg/xml2xcd.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/test/typecfg/xml2xcd.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/framework/test/typecfg/xml2xcd.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/framework/test/typecfg/xml2xcd.cxx Mon Aug 1 04:31:52 2016 @@ -80,7 +80,7 @@ using namespace ::framework ; all values are 0 3) decrease size of xml file - don't write full localized values - - use own formated string for all non localized values + - use own formatted string for all non localized values - separate "Installed" flag for filters 4) set right values for "Order" property of filters 5) support for ContentHandler @@ -638,7 +638,7 @@ void XCDGenerator::impl_generateTypeTemp m_aData.sBufferStandard.appendAscii( "\t\t\t<schema:value cfg:name=\"Data\" cfg:type=\"string\" cfg:writable=\"" ); m_aData.sBufferStandard.appendAscii( m_aData.bWriteable==sal_True ? "true\">\n" : "false\">\n" ); m_aData.sBufferStandard.appendAscii("\t\t\t\t<schema:documentation>\n" ); - m_aData.sBufferStandard.appendAscii( "\t\t\t\t\t<schema:description>Contains all data of a type as an own formated string.{Preferred, MediaType, ClipboardFormat, URLPattern, Extensions, DocumentIconID}</schema:description>\n" ); + m_aData.sBufferStandard.appendAscii( "\t\t\t\t\t<schema:description>Contains all data of a type as an own formatted string.{Preferred, MediaType, ClipboardFormat, URLPattern, Extensions, DocumentIconID}</schema:description>\n" ); m_aData.sBufferStandard.appendAscii( "\t\t\t\t</schema:documentation>\n" ); m_aData.sBufferStandard.appendAscii( "\t\t\t\t<default:data>false</default:data>\n" ); m_aData.sBufferStandard.appendAscii( "\t\t\t</schema:value>\n" );
Modified: openoffice/branches/gbuild-reintegration/main/graphite/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/graphite/makefile.mk?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/graphite/makefile.mk (original) +++ openoffice/branches/gbuild-reintegration/main/graphite/makefile.mk Mon Aug 1 04:31:52 2016 @@ -50,7 +50,7 @@ all: TARFILE_NAME=silgraphite-2.3.1 TARFILE_MD5=d35724900f6a4105550293686688bbb3 -PATCH_FILES=graphite-2.3.1.patch graphite-2.3.1_debug.patch graphite-2.3.1_stlportemu.patch +PATCH_FILES=graphite-2.3.1.patch graphite-2.3.1_debug.patch graphite-2.3.1_stlportemu.patch graphite-2.3.1-CVE-2016-1521.patch # convert line-endings to avoid problems when patching CONVERTFILES=\ Modified: openoffice/branches/gbuild-reintegration/main/helpcontent2/source/text/scalc/guide/multioperation.xhp URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/helpcontent2/source/text/scalc/guide/multioperation.xhp?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/helpcontent2/source/text/scalc/guide/multioperation.xhp (original) +++ openoffice/branches/gbuild-reintegration/main/helpcontent2/source/text/scalc/guide/multioperation.xhp Mon Aug 1 04:31:52 2016 @@ -88,7 +88,7 @@ <paragraph role="listitem" id="par_id3147474" xml-lang="en-US" l10n="U" oldref="53">Choose <emph>Data - Multiple Operations</emph>.</paragraph> </listitem> <listitem> -<paragraph role="listitem" id="par_id3154846" xml-lang="en-US" l10n="U" oldref="54">With the cursor in the <emph>Formulas</emph> field, select cells B5 thru C5.</paragraph> +<paragraph role="listitem" id="par_id3154846" xml-lang="en-US" l10n="U" oldref="54">With the cursor in the <emph>Formulas</emph> field, select cells B5 through C5.</paragraph> </listitem> <listitem> <paragraph role="listitem" id="par_id3153931" xml-lang="en-US" l10n="CHG" oldref="55">Set the cursor in the <emph>Column input cell</emph> field and click cell B4.</paragraph> @@ -102,7 +102,7 @@ <item type="productname">%PRODUCTNAME</item> allows you to carry out joint multiple operations for columns and rows in so-called cross-tables. The formula cell has to refer to both the data range arranged in rows and the one arranged in columns. Select the range defined by both data ranges and call the multiple operation dialog. Enter the reference to the formula in the <emph>Formulas</emph> field. The <emph>Row input cell</emph> and the <emph>Column input cell</emph> fields are used to enter the reference to the corresponding cells of the formula.</paragraph> <paragraph role="heading" id="hd_id3149949" xml-lang="en-US" level="3" l10n="U" oldref="57">Calculating with Two Variables</paragraph> <paragraph role="paragraph" id="par_id3154808" xml-lang="en-US" l10n="U" oldref="58">Consider columns A and B of the sample table above. You now want to vary not just the quantity produced annually, but also the selling price, and you are interested in the profit in each case.</paragraph> -<paragraph role="paragraph" id="par_id3149731" xml-lang="en-US" l10n="CHG" oldref="59">Expand the table shown above. D2 thru D11 contain the numbers 500, 1000 and so on, up to 5000. In E1 through H1 enter the numbers 8, 10, 15 and 20.</paragraph> +<paragraph role="paragraph" id="par_id3149731" xml-lang="en-US" l10n="CHG" oldref="59">Expand the table shown above. D2 through D11 contain the numbers 500, 1000 and so on, up to 5000. In E1 through H1 enter the numbers 8, 10, 15 and 20.</paragraph> <list type="ordered"> <listitem> <paragraph role="listitem" id="par_id3152810" xml-lang="en-US" l10n="U" oldref="95">Select the range D1:H11.</paragraph> Modified: openoffice/branches/gbuild-reintegration/main/i18npool/source/breakiterator/data/line.txt URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/i18npool/source/breakiterator/data/line.txt?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/i18npool/source/breakiterator/data/line.txt (original) +++ openoffice/branches/gbuild-reintegration/main/i18npool/source/breakiterator/data/line.txt Mon Aug 1 04:31:52 2016 @@ -419,7 +419,7 @@ $CM+; $AL_FOLLOW $CM+ / ( [$BK $CR $LF $NL $ZW {eof}] | $SP+ $CM+ $SP | - $SP+ $CM* ([^$OP $CM $SP] | [$AL {eof}])); # if LB 14 will match, need to surpress this break. + $SP+ $CM* ([^$OP $CM $SP] | [$AL {eof}])); # if LB 14 will match, need to suppress this break. # LB14 says OP SP* x . # becomes OP SP* x AL # becomes OP SP* x CM+ AL_FOLLOW Modified: openoffice/branches/gbuild-reintegration/main/i18npool/source/inputchecker/inputsequencechecker_hi.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/i18npool/source/inputchecker/inputsequencechecker_hi.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/i18npool/source/inputchecker/inputsequencechecker_hi.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/i18npool/source/inputchecker/inputsequencechecker_hi.cxx Mon Aug 1 04:31:52 2016 @@ -49,7 +49,7 @@ InputSequenceChecker_hi::~InputSequenceC */ #define __UP 1 // ChandraBindu & Anuswar #define __NP 2 // Visarg -#define __IV 3 // Independant Vowels +#define __IV 3 // Independent Vowels #define __CN 4 // Consonants except _CK & _RC #define __CK 5 // Consonants that can be followed by Nukta #define __RC 6 // Ra Modified: openoffice/branches/gbuild-reintegration/main/i18npool/source/isolang/langid.pl URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/i18npool/source/isolang/langid.pl?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/i18npool/source/isolang/langid.pl (original) +++ openoffice/branches/gbuild-reintegration/main/i18npool/source/isolang/langid.pl Mon Aug 1 04:31:52 2016 @@ -55,7 +55,7 @@ sub Usage() "A language-country pair will lookup a xx-YY mapping from isolang.cxx,\n", "for example: 'en-US' or 'de-' or '-CH',\n", "xx and YY can be given case insensitive, will be lowered-uppered internally,\n", - "and xx and YY themselfs may be regular expressions.\n", + "and xx and YY themselves may be regular expressions.\n", "Also here a list of matches will be processed.\n\n", "If option --single is given, only the first match will be processed.\n\n"; @@ -260,7 +260,7 @@ sub main() } } # If the string given is of the form xx-yy lookup a language,country pair - # to obtain the define identifier. xx and yy themselfs may be regexps. + # to obtain the define identifier. xx and yy themselves may be regexps. # xx- is a short form for 'xx-.*' and -yy a short form for '.*-yy' if ($grepdef =~ /^(.*)-$/) { $grepdef = $1 . "-.*"; } Modified: openoffice/branches/gbuild-reintegration/main/i18npool/source/localedata/data/locale.dtd URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/i18npool/source/localedata/data/locale.dtd?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/i18npool/source/localedata/data/locale.dtd (original) +++ openoffice/branches/gbuild-reintegration/main/i18npool/source/localedata/data/locale.dtd Mon Aug 1 04:31:52 2016 @@ -36,7 +36,7 @@ java -cp <your_path>/XMLValidator.jar org.unicode.cldr.util.XMLValidator your_data.xml - A second possiblity is: + A second possibility is: - temporarily (!) change the DOCTYPE of your file to read (all on one line) <!DOCTYPE Locale SYSTEM "http://hg.services.openoffice.org/DEV300/raw-file/tip/i18npool/source/localedata/data/locale.dtd";> @@ -143,7 +143,7 @@ <!-- The LC_FORMAT element contains number format codes and may actually appear - twice (with the second ocurrence named LC_FORMAT_1). One section is + twice (with the second occurrence named LC_FORMAT_1). One section is mandatory and MUST contain at least all required format codes formatindex="0" to formatindex="47", MUST NOT contain formatindex 48 and 49, and MAY contain other format codes. See below ATTLIST FormatElement @@ -258,7 +258,7 @@ Formatindex="44" uses no hour code but 100th seconds and the Time100SecSeparator. Formatindex="45" uses both [HH] hour code and 100th seconds to be able - to edit such time values without loosing information. + to edit such time values without losing information. Of usage="CURRENCY": formatindices 12, 13, 14, 15, 17 with [$xxx-yyy] notation must use the Modified: openoffice/branches/gbuild-reintegration/main/i18npool/source/localedata/localedata.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/i18npool/source/localedata/localedata.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/i18npool/source/localedata/localedata.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/i18npool/source/localedata/localedata.cxx Mon Aug 1 04:31:52 2016 @@ -484,7 +484,7 @@ Sequence< CalendarItem > &LocaleData::ge break; } } - // Refered locale does not found, return name for en_US locale. + // Referred locale does not found, return name for en_US locale. if (index == cals.getLength()) { cals = getAllCalendars( Locale(OUString::createFromAscii("en"), OUString::createFromAscii("US"), OUString())); Modified: openoffice/branches/gbuild-reintegration/main/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java (original) +++ openoffice/branches/gbuild-reintegration/main/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java Mon Aug 1 04:31:52 2016 @@ -76,7 +76,7 @@ public class ComponentBase extends WeakB bInDispose= true; } } - // The notification occures in an unsynchronized block in order to avoid + // The notification occurs in an unsynchronized block in order to avoid // deadlocks if one of the listeners calls back in a different thread on // a synchronized method which uses the same object. if (bDoDispose) Modified: openoffice/branches/gbuild-reintegration/main/jurt/com/sun/star/comp/servicemanager/ServiceManager.java URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/jurt/com/sun/star/comp/servicemanager/ServiceManager.java?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/jurt/com/sun/star/comp/servicemanager/ServiceManager.java (original) +++ openoffice/branches/gbuild-reintegration/main/jurt/com/sun/star/comp/servicemanager/ServiceManager.java Mon Aug 1 04:31:52 2016 @@ -884,7 +884,7 @@ class ServiceManagerFactory implements * because there is no the <code>ServiceManager</code> has no constructor with * arguments. * <p> - * @return null - allways throws an exception + * @return null - always throws an exception * @param aArguments arguments for new instance. * @see com.sun.star.lang.XSingleServiceFactory */ Modified: openoffice/branches/gbuild-reintegration/main/l10ntools/inc/treeconfig.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/l10ntools/inc/treeconfig.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/l10ntools/inc/treeconfig.hxx (original) +++ openoffice/branches/gbuild-reintegration/main/l10ntools/inc/treeconfig.hxx Mon Aug 1 04:31:52 2016 @@ -42,7 +42,7 @@ class Treeconfig // read the config file, returns true in case a config file had been found bool parseConfig(); // returns a string vector containing all active repositories, returns true in case we are deep inside - // of a source tree. This could affect the behavour of the tool + // of a source tree. This could affect the behaviour of the tool bool getActiveRepositories( vector<string>& active_repos); }; Modified: openoffice/branches/gbuild-reintegration/main/l10ntools/source/filter/utils/Cache.java URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/l10ntools/source/filter/utils/Cache.java?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/l10ntools/source/filter/utils/Cache.java (original) +++ openoffice/branches/gbuild-reintegration/main/l10ntools/source/filter/utils/Cache.java Mon Aug 1 04:31:52 2016 @@ -63,7 +63,7 @@ public class Cache public static final int FORMAT_UNSUPPORTED = -1; /** identify the configuration format of an office 6.0. - * The own formated data string is used. */ + * The own formatted data string is used. */ public static final int FORMAT_60 = 0; /** identify the configuration format of an office 6.y. @@ -310,7 +310,7 @@ public class Cache * - ... * * @return [java.lang.String] - * a formated string, which contains al statistic data. + * a formatted string, which contains al statistic data. */ public synchronized java.lang.String getStatistics() { @@ -1680,7 +1680,7 @@ public class Cache * means the format of the generated xml source. * * @return [java.lang.String] - * a xml formated string, which contains all properties + * a xml formatted string, which contains all properties * for this container item. */ public synchronized java.lang.String getItemAsXML(int eItemType , Modified: openoffice/branches/gbuild-reintegration/main/l10ntools/source/filter/utils/XMLHelper.java URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/l10ntools/source/filter/utils/XMLHelper.java?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/l10ntools/source/filter/utils/XMLHelper.java (original) +++ openoffice/branches/gbuild-reintegration/main/l10ntools/source/filter/utils/XMLHelper.java Mon Aug 1 04:31:52 2016 @@ -475,7 +475,7 @@ public class XMLHelper // step over all list items and add it to a string buffer // Every item will be separated by a default separator "\n" first. - // Because "\n" is not a valid separator at all and can`t occure inside + // Because "\n" is not a valid separator at all and can`t occur inside // our list items. During we step over all items, we check if our current separator // (we use a list of possible ones!) clash with an item. // If it clash - we step to the next possible separator. @@ -574,7 +574,7 @@ public class XMLHelper for (int t=0; t<nPrettyTabs; ++t) sXML.append("\t"); - // !Our localized values must be formated at a deeper coloum + // !Our localized values must be formatted at a deeper coloum // then its property name! ++nPrettyTabs; Modified: openoffice/branches/gbuild-reintegration/main/libxml2/libxml2-configure.patch URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/libxml2/libxml2-configure.patch?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/libxml2/libxml2-configure.patch (original) +++ openoffice/branches/gbuild-reintegration/main/libxml2/libxml2-configure.patch Mon Aug 1 04:31:52 2016 @@ -1,19 +1,7 @@ ---- misc/libxml2-2.7.8/ltmain.sh 2009-10-06 17:39:54.000000000 +0100 -+++ misc/build/libxml2-2.7.8/ltmain.sh 2009-12-17 11:43:56.000000000 +0000 -@@ -6599,8 +6599,8 @@ - ;; - - freebsd-elf) -- major=".$current" -- versuffix=".$current" -+ major=.`expr $current - $age` -+ versuffix=".$major.$age.$revision"; - ;; - - irix | nonstopux) ---- misc/libxml2-2.7.8/include/libxml/xmlversion.h 2009-12-17 11:45:19.000000000 +0000 -+++ misc/build/libxml2-2.7.8/include/libxml/xmlversion.h 2009-12-17 11:45:36.000000000 +0000 -@@ -264,7 +264,7 @@ +diff -ur misc/libxml2-2.9.3/include/libxml/xmlversion.h misc/build/libxml2-2.9.3/include/libxml/xmlversion.h +--- misc/libxml2-2.9.3/include/libxml/xmlversion.h 2015-11-20 01:49:39.000000000 -0800 ++++ misc/build/libxml2-2.9.3/include/libxml/xmlversion.h 2016-03-26 09:46:21.124032000 -0700 +@@ -273,7 +273,7 @@ * * Whether iconv support is available */ @@ -22,7 +10,7 @@ #define LIBXML_ICONV_ENABLED #endif -@@ -291,7 +291,7 @@ +@@ -300,7 +300,7 @@ * * Whether Debugging module is configured in */ @@ -31,26 +19,9 @@ #define LIBXML_DEBUG_ENABLED #endif -@@ -300,7 +300,7 @@ - * - * Whether the memory debugging is configured in - */ --#if 1 -+#if 0 - #define DEBUG_MEMORY_LOCATION - #endif - -@@ -309,7 +309,7 @@ - * - * Whether the runtime debugging is configured in - */ --#if 1 -+#if 0 - #define LIBXML_DEBUG_RUNTIME - #endif - ---- misc/libxml2-2.7.8/xml2-config.in 2009-12-17 11:45:20.000000000 +0000 -+++ misc/build/libxml2-2.7.8/xml2-config.in 2009-12-17 11:45:36.000000000 +0000 +diff -ur misc/libxml2-2.9.3/xml2-config.in misc/build/libxml2-2.9.3/xml2-config.in +--- misc/libxml2-2.9.3/xml2-config.in 2015-05-06 05:04:36.000000000 -0700 ++++ misc/build/libxml2-2.9.3/xml2-config.in 2016-03-26 10:00:17.756184000 -0700 @@ -1,9 +1,14 @@ #! /bin/sh @@ -75,12 +46,12 @@ --cflags) - echo @XML_INCLUDEDIR@ @XML_CFLAGS@ -+ echo -I${includedir} ++ echo -I${includedir} +# echo @XML_INCLUDEDIR@ @XML_CFLAGS@ ;; --libtool-libs) -@@ -82,19 +88,24 @@ +@@ -82,19 +88,26 @@ ;; --libs) @@ -88,31 +59,33 @@ - then - if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] - then -- echo @XML_LIBS@ +- echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@ - else -- echo @XML_LIBDIR@ @XML_LIBS@ +- echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ - fi - else -- echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@ +- echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ @WIN32_EXTRA_LIBADD@ - fi -+ echo -L${libdir} ${LIBXML2LIB} -lm ++ echo -L${libdir} ${LIBXML2LIB} -lm +# if [ "`uname`" = "Linux" ] +# then +# if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] +# then -+# echo @XML_LIBS@ ++# echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@ +# else -+# echo @XML_LIBDIR@ @XML_LIBS@ ++# echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ +# fi +# else -+# echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@ ++# echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ @WIN32_EXTRA_LIBADD@ +# fi ++ ;; + print) # ugly configure hack -+ exit 0 -+ ;; -+ ++ exit 0 ++ ;; ++ ++ *) usage exit 1 Modified: openoffice/branches/gbuild-reintegration/main/libxml2/libxml2-long-path.patch URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/libxml2/libxml2-long-path.patch?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/libxml2/libxml2-long-path.patch (original) +++ openoffice/branches/gbuild-reintegration/main/libxml2/libxml2-long-path.patch Mon Aug 1 04:31:52 2016 @@ -1,11 +1,10 @@ ---- misc/libxml2-2.7.8/uri.c 2009-10-02 17:28:55.000000000 +0200 -+++ misc/build/libxml2-2.7.8/uri.c 2011-02-24 13:47:19.349299000 +0100 -@@ -2479,7 +2479,16 @@ - if (path == NULL) - return(NULL); +--- misc/libxml2-2.9.3/uri.c 2015-11-02 23:28:09.000000000 -0800 ++++ misc/build/libxml2-2.9.3/uri.c 2016-03-26 10:19:45.838472000 -0700 +@@ -2412,6 +2412,15 @@ + return xmlStrdup((const xmlChar *) path); + #endif -- /* sanitize filename starting with // so it can be used as URI */ -+#if defined(_WIN32) ++#if defined(_WIN32) + //We must not change the backslashes to slashes if the the path starts with + // \\?\ + //Those paths can be up to 32k characters long. @@ -14,36 +13,6 @@ + return xmlStrdup((const xmlChar *) path); +#endif + -+ /* sanitize filename starting with // so it can be used as URI */ + /* sanitize filename starting with // so it can be used as URI */ if ((path[0] == '/') && (path[1] == '/') && (path[2] != '/')) path++; - ---- misc/libxml2-2.7.8/xmlIO.c 2009-09-24 17:32:00.000000000 +0200 -+++ misc/build/libxml2-2.7.8/xmlIO.c 2011-02-24 13:47:26.163762000 +0100 -@@ -772,6 +772,11 @@ - - #ifdef HAVE_STAT - #if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) -+ //On Windows stat and wstat do not work with long pathname, -+ //which start with '\\?\' -+ if ((xmlStrlen(path) > 3) && (path[0] == '\\') && (path[1] == '\\') && (path[2] == '?') && (path[3] == '\\') ) -+ return 1; -+ - if (xmlWrapStat(path, &stat_buffer) == -1) - return 0; - #else ---- misc/libxml2-2.7.8/win32/Makefile.msvc 2010-11-04 09:58:43.000000000 -0500 -+++ misc/build/libxml2-2.7.8/win32/Makefile.msvc 2012-12-21 01:07:45.000000000 -0500 -@@ -71,9 +71,9 @@ - !if "$(WITH_ICONV)" == "1" - LIBS = $(LIBS) iconv.lib - !endif --+!if "$(WITH_ICU)" == "1" --+LIBS = $(LIBS) icu.lib --+!endif -+!if "$(WITH_ICU)" == "1" -+LIBS = $(LIBS) icu.lib -+!endif - !if "$(WITH_ZLIB)" == "1" - LIBS = $(LIBS) zdll.lib - !endif Modified: openoffice/branches/gbuild-reintegration/main/libxml2/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/libxml2/makefile.mk?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/libxml2/makefile.mk (original) +++ openoffice/branches/gbuild-reintegration/main/libxml2/makefile.mk Mon Aug 1 04:31:52 2016 @@ -38,18 +38,15 @@ all: # --- Files -------------------------------------------------------- -LIBXML2VERSION=2.7.8 +LIBXML2VERSION=2.9.3 TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION) -TARFILE_MD5=8127a65e8c3b08856093099b52599c86 +TARFILE_MD5=daece17e045f1c107610e137ab50c179 + +PATCH_FILES=libxml2-configure.patch # libxml2-global-symbols: #i112480#: Solaris ld won't export non-listed symbols -PATCH_FILES=libxml2-configure.patch \ - libxml2-mingw.patch \ - libxml2-fixes.patch \ - libxml2-global-symbols.patch \ - libxml2-testapi.patch \ - libxml2-runtest.patch +# libxml2-global-symbols.patch .IF "$(OS)" == "WNT" PATCH_FILES+= libxml2-long-path.patch Modified: openoffice/branches/gbuild-reintegration/main/libxslt/libxslt-configure.patch URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/libxslt/libxslt-configure.patch?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/libxslt/libxslt-configure.patch (original) +++ openoffice/branches/gbuild-reintegration/main/libxslt/libxslt-configure.patch Mon Aug 1 04:31:52 2016 @@ -1,32 +1,37 @@ ---- misc/libxslt-1.1.26/ltmain.sh Wed Aug 29 14:28:46 2007 -+++ misc/build/libxslt-1.1.26/ltmain.sh Wed Jun 25 13:06:05 2008 -@@ -6195,9 +6195,9 @@ +diff -ur misc/libxslt-1.1.28/ltmain.sh misc/build/libxslt-1.1.28/ltmain.sh +--- misc/libxslt-1.1.28/ltmain.sh 2012-11-20 23:21:48.000000000 -0800 ++++ misc/build/libxslt-1.1.28/ltmain.sh 2016-03-27 11:14:40.564087000 -0700 +@@ -7331,13 +7331,13 @@ + # + case $version_type in + # correct linux to gnu/linux during the next big refactor +- darwin|linux|osf|windows|none) ++ darwin|freebsd-elf|linux|osf|windows|none) + func_arith $number_major + $number_minor + current=$func_arith_result + age="$number_minor" revision="$number_revision" ;; - freebsd-aout|freebsd-elf|sunos) -- current="$number_major" -- revision="$number_minor" -- age="0" -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" - ;; - irix|nonstopux) - func_arith $number_major + $number_minor -@@ -6271,8 +6271,8 @@ +- freebsd-aout|freebsd-elf|qnx|sunos) ++ freebsd-aout|qnx|sunos) + current="$number_major" + revision="$number_minor" + age="0" +@@ -7414,8 +7414,8 @@ ;; freebsd-elf) - major=".$current" - versuffix=".$current" -+ major=.`expr $current - $age` -+ versuffix="$major" ++ major=.$(($current - $age)) ++ versuffix="$major.$age.$revision" ;; irix | nonstopux) ---- misc/libxslt-1.1.26/xslt-config.in Wed Jan 17 14:18:26 2007 -+++ misc/build/libxslt-1.1.26/xslt-config.in Wed Jun 25 13:06:05 2008 -@@ -1,10 +1,16 @@ +diff -ur misc/libxslt-1.1.28/xslt-config.in misc/build/libxslt-1.1.28/xslt-config.in +--- misc/libxslt-1.1.28/xslt-config.in 2012-09-04 07:26:23.000000000 -0700 ++++ misc/build/libxslt-1.1.28/xslt-config.in 2016-03-26 10:54:11.377552000 -0700 +@@ -1,10 +1,15 @@ #! /bin/sh -prefix=@prefix@ @@ -36,7 +41,6 @@ +#exec_prefix_set=no +#includedir=@includedir@ +#libdir=@libdir@ -+ +prefix=${SOLARVERSION}/${INPATH} +exec_prefix=${SOLARVERSION}/${INPATH} exec_prefix_set=no @@ -47,19 +51,20 @@ usage() { -@@ -89,7 +95,8 @@ +@@ -89,7 +94,8 @@ shift done --the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@" -+#the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@" +-the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@" ++#the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@" +the_libs="-L${libdir} ${XSLTLIB} -lm" if test "$includedir" != "/usr/include"; then the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`" else ---- misc/libxslt-1.1.26/configure 2008-05-14 00:40:54.000000000 +0900 -+++ misc/build/libxslt-1.1.26/configure 2008-07-17 22:12:38.097000000 +0900 -@@ -7437,7 +7437,7 @@ +diff -ur misc/libxslt-1.1.28/configure misc/build/libxslt-1.1.28/configure +--- misc/libxslt-1.1.28/configure 2012-11-20 23:11:21.000000000 -0800 ++++ misc/build/libxslt-1.1.28/configure 2016-03-27 12:43:44.464670000 -0700 +@@ -6462,7 +6462,7 @@ cygwin*) # func_win32_libid is a shell function defined in ltmain.sh @@ -68,12 +73,21 @@ lt_cv_file_magic_cmd='func_win32_libid' ;; -@@ -7446,7 +7446,7 @@ - # func_win32_libid shell function, so use a weaker test based on 'objdump', +@@ -6472,7 +6472,7 @@ # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + # Keep this pattern in sync with the one in func_win32_libid. +@@ -11635,7 +11635,7 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no + ;; Modified: openoffice/branches/gbuild-reintegration/main/libxslt/libxslt-win_manifest.patch URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/libxslt/libxslt-win_manifest.patch?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/libxslt/libxslt-win_manifest.patch (original) +++ openoffice/branches/gbuild-reintegration/main/libxslt/libxslt-win_manifest.patch Mon Aug 1 04:31:52 2016 @@ -1,5 +1,6 @@ ---- misc/libxslt-1.1.26/win32/configure.js 2007-08-03 15:41:02.000000000 +0200 -+++ misc/build/libxslt-1.1.26/win32/configure.js 2009-05-07 13:09:42.294993200 +0200 +diff -ur misc/libxslt-1.1.28/win32/configure.js misc/build/libxslt-1.1.28/win32/configure.js +--- misc/libxslt-1.1.28/win32/configure.js 2012-09-04 07:26:23.000000000 -0700 ++++ misc/build/libxslt-1.1.28/win32/configure.js 2016-03-26 12:15:07.661269000 -0700 @@ -52,7 +52,7 @@ var dirSep = "\\"; var compiler = "msvc"; Modified: openoffice/branches/gbuild-reintegration/main/libxslt/libxsltversion.mk URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/libxslt/libxsltversion.mk?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/libxslt/libxsltversion.mk (original) +++ openoffice/branches/gbuild-reintegration/main/libxslt/libxsltversion.mk Mon Aug 1 04:31:52 2016 @@ -25,5 +25,5 @@ LIBXSLT_MAJOR=1 # minor LIBXSLT_MINOR=1 # micro -LIBXSLT_MICRO=26 +LIBXSLT_MICRO=28 Modified: openoffice/branches/gbuild-reintegration/main/libxslt/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/libxslt/makefile.mk?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/libxslt/makefile.mk (original) +++ openoffice/branches/gbuild-reintegration/main/libxslt/makefile.mk Mon Aug 1 04:31:52 2016 @@ -45,14 +45,13 @@ all: LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO) TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION) -TARFILE_MD5=e61d0364a30146aaa3001296f853b2b9 +TARFILE_MD5=9667bf6f9310b957254fdcf6596600b7 # libxslt-internal-symbols: #i112480#: Solaris ld requires symbols to be defined PATCH_FILES=libxslt-configure.patch \ - libxslt-bsd.patch \ libxslt-win_manifest.patch \ - libxslt-mingw.patch \ - libxslt-internal-symbols.patch + libxslt-CVE-2015-7995.patch + # This is only for UNX environment now @@ -110,7 +109,7 @@ CPPFLAGS+:=$(ARCH_FLAGS) -xc99=none .ENDIF # "$(COMNAME)"=="sunpro5" CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes +CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes ac_cv_func_clock_gettime=false BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) Modified: openoffice/branches/gbuild-reintegration/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx Mon Aug 1 04:31:52 2016 @@ -67,7 +67,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; using namespace linguistic; -// values asigned to capitalization types +// values assigned to capitalization types #define CAPTYPE_UNKNOWN 0 #define CAPTYPE_NOCAP 1 #define CAPTYPE_INITCAP 2 Modified: openoffice/branches/gbuild-reintegration/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx Mon Aug 1 04:31:52 2016 @@ -48,7 +48,7 @@ #include <set> #include <string.h> -// values asigned to capitalization types +// values assigned to capitalization types #define CAPTYPE_UNKNOWN 0 #define CAPTYPE_NOCAP 1 #define CAPTYPE_INITCAP 2 Modified: openoffice/branches/gbuild-reintegration/main/linguistic/source/lngopt.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/linguistic/source/lngopt.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/linguistic/source/lngopt.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/linguistic/source/lngopt.cxx Mon Aug 1 04:31:52 2016 @@ -58,7 +58,7 @@ using namespace com::sun::star::registry /////////////////////////////////////////////////////////////////////////// -// static member intialization +// static member initialization SvtLinguOptions * LinguOptions::pData = NULL; vos::ORefCount LinguOptions::aRefCount; Modified: openoffice/branches/gbuild-reintegration/main/linguistic/source/misc2.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/linguistic/source/misc2.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/linguistic/source/misc2.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/linguistic/source/misc2.cxx Mon Aug 1 04:31:52 2016 @@ -182,10 +182,10 @@ static uno::Sequence< rtl::OUString > Ge } if (bSuccess) { - // build resulting sequence by adding the pathes in the following order: + // build resulting sequence by adding the paths in the following order: // 1. writable path - // 2. all user pathes - // 3. all internal pathes + // 2. all user paths + // 3. all internal paths sal_Int32 nMaxEntries = aInternalPaths.getLength() + aUserPaths.getLength(); if (aWritablePath.getLength() > 0) ++nMaxEntries; Modified: openoffice/branches/gbuild-reintegration/main/nss/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/nss/makefile.mk?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/nss/makefile.mk (original) +++ openoffice/branches/gbuild-reintegration/main/nss/makefile.mk Mon Aug 1 04:31:52 2016 @@ -39,9 +39,9 @@ all: .ELSE -TARFILE_NAME=nss-3.14.4-with-nspr-4.9.5 -TARFILE_MD5=067a04150b1d8b64f7da3019688a7547 -TARFILE_ROOTDIR=nss-3.14.4 +TARFILE_NAME=nss-3.25-with-nspr-4.12 +TARFILE_MD5=4ec9a36c0f7c9360b149491c013b8d50 +TARFILE_ROOTDIR=nss-3.25 PATCH_FILES=nss.patch .IF "$(OS)"=="MACOSX" @@ -50,10 +50,6 @@ MACOS_SDK_DIR=$(SDK_PATH) PATCH_FILES+=nss_macosx.patch .ENDIF # "$(OS)"=="MACOSX" -.IF "$(OS)"=="FREEBSD" -PATCH_FILES+=nss_freebsd.patch -.ENDIF - .IF "$(debug)" != "" .ELSE BUILD_OPT=1 @@ -66,16 +62,20 @@ USE_64:=1 .EXPORT : USE_64 .ENDIF # "$(BUILD64)"=="1" -OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST) +OUT2LIB=dist$/out$/lib$/*$(DLLPOST) -BUILD_DIR=mozilla$/security$/nss +BUILD_DIR=nss BUILD_ACTION= $(GNUMAKE) nss_build_all #See #i105566# && moz#513024# .IF "$(OS)"=="LINUX" -BUILD_ACTION+=FREEBL_NO_DEPEND=1 FREEBL_LOWHASH=1 +BUILD_ACTION+=FREEBL_NO_DEPEND=1 FREEBL_LOWHASH=1 NSS_DISABLE_GTESTS=1 PATCH_FILES+=nss_linux.patch .ENDIF +.IF "$(OS)"=="FREEBSD" +BUILD_ACTION+=NSS_DISABLE_GTESTS=1 +.ENDIF + .IF "$(GUI)"=="WNT" @@ -99,20 +99,20 @@ nss_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF -BUILD_DIR=mozilla$/security$/nss -BUILD_ACTION=NS_USE_GCC=1 CC="$(nss_CC)" CXX="$(nss_CXX)" OS_LIBS="$(nss_LIBS)" OS_TARGET=WIN95 _WIN32_IE=0x500 PATH="$(PATH)" DEFINES=-D_WIN32_IE=0x500 $(GNUMAKE) nss_build_all +BUILD_DIR=nss +BUILD_ACTION= NSS_DISABLE_GTESTS=1 NS_USE_GCC=1 CC="$(nss_CC)" CXX="$(nss_CXX)" OS_LIBS="$(nss_LIBS)" OS_TARGET=WIN95 _WIN32_IE=0x500 PATH="$(PATH)" DEFINES=-D_WIN32_IE=0x500 $(GNUMAKE) nss_build_all OUT2LIB= \ - mozilla$/dist$/out$/lib$/libnspr4.a \ - mozilla$/dist$/out$/lib$/libnss3.a \ - mozilla$/dist$/out$/lib$/libnssdbm3.a \ - mozilla$/dist$/out$/lib$/libnssutil3.a \ - mozilla$/dist$/out$/lib$/libplc4.a \ - mozilla$/dist$/out$/lib$/libplds4.a \ - mozilla$/dist$/out$/lib$/libsmime3.a \ - mozilla$/dist$/out$/lib$/libsoftokn3.a \ - mozilla$/dist$/out$/lib$/libsqlite3.a \ - mozilla$/dist$/out$/lib$/libssl3.a + dist$/out$/lib$/libnspr4.a \ + dist$/out$/lib$/libnss3.a \ + dist$/out$/lib$/libnssdbm3.a \ + dist$/out$/lib$/libnssutil3.a \ + dist$/out$/lib$/libplc4.a \ + dist$/out$/lib$/libplds4.a \ + dist$/out$/lib$/libsmime3.a \ + dist$/out$/lib$/libsoftokn3.a \ + dist$/out$/lib$/libsqlite3.a \ + dist$/out$/lib$/libssl3.a .ELSE # "$(COM)"=="GCC" MOZ_MSVCVERSION= 9 @@ -130,30 +130,30 @@ OS_TARGET=WIN95 EXT_USE_STLPORT=TRUE #To build nss one has to call "make nss_build_all" in -#mozilla/security/nss -NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/mozilla/security/nss) +#nss +NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/nss) BUILD_ACTION= PATH="$(PATH):$(moz_build)/msys/bin:$(moz_build)/moztools/bin" && $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \ - -c "cd $(NSS_BUILD_DIR) && make nss_build_all" + -c "cd $(NSS_BUILD_DIR) && make nss_build_all NSS_DISABLE_GTESTS=1" OUT2LIB= \ - mozilla$/dist$/out$/lib$/nspr4.lib \ - mozilla$/dist$/out$/lib$/nss3.lib \ - mozilla$/dist$/out$/lib$/nssdbm3.lib \ - mozilla$/dist$/out$/lib$/nssutil3.lib \ - mozilla$/dist$/out$/lib$/plc4.lib \ - mozilla$/dist$/out$/lib$/plds4.lib \ - mozilla$/dist$/out$/lib$/smime3.lib \ - mozilla$/dist$/out$/lib$/softokn3.lib \ - mozilla$/dist$/out$/lib$/sqlite3.lib \ - mozilla$/dist$/out$/lib$/ssl3.lib + dist$/out$/lib$/nspr4.lib \ + dist$/out$/lib$/nss3.lib \ + dist$/out$/lib$/nssdbm3.lib \ + dist$/out$/lib$/nssutil3.lib \ + dist$/out$/lib$/plc4.lib \ + dist$/out$/lib$/plds4.lib \ + dist$/out$/lib$/smime3.lib \ + dist$/out$/lib$/softokn3.lib \ + dist$/out$/lib$/sqlite3.lib \ + dist$/out$/lib$/ssl3.lib .ENDIF # "$(COM)"=="GCC" -OUT2BIN=mozilla$/dist$/out$/lib$/*$(DLLPOST) +OUT2BIN=dist$/out$/lib$/*$(DLLPOST) .ENDIF # "$(GUI)"=="WNT" -OUTDIR2INC=mozilla$/dist$/public$/nss mozilla$/dist$/out$/include +OUTDIR2INC=dist$/public$/nss dist$/out$/include # --- Targets ------------------------------------------------------ Modified: openoffice/branches/gbuild-reintegration/main/nss/nss.patch URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/nss/nss.patch?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/nss/nss.patch (original) +++ openoffice/branches/gbuild-reintegration/main/nss/nss.patch Mon Aug 1 04:31:52 2016 @@ -1,6 +1,7 @@ ---- misc/nss-3.14.4/mozilla/nsprpub/config/rules.mk 2009-12-09 22:24:37.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/nsprpub/config/rules.mk 2010-06-11 16:35:54.946870871 +0200 -@@ -377,7 +377,12 @@ +diff -ur misc/nss-3.25/nspr/config/rules.mk misc/build/nss-3.25/nspr/config/rules.mk +--- misc/nss-3.25/nspr/config/rules.mk 2016-02-12 05:51:25.000000000 -0800 ++++ misc/build/nss-3.25/nspr/config/rules.mk 2016-07-14 23:47:54.492034000 -0700 +@@ -382,7 +382,12 @@ ifdef NS_USE_GCC $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $< else @@ -14,9 +15,10 @@ endif # GCC @echo $(RES) finished endif ---- misc/nss-3.14.4/mozilla/nsprpub/configure 2010-02-08 19:41:35.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/nsprpub/configure 2010-06-11 16:35:54.960188991 +0200 -@@ -4443,7 +4443,7 @@ +diff -ur misc/nss-3.25/nspr/configure misc/build/nss-3.25/nspr/configure +--- misc/nss-3.25/nspr/configure 2016-02-12 05:51:25.000000000 -0800 ++++ misc/build/nss-3.25/nspr/configure 2016-07-14 23:47:54.531323000 -0700 +@@ -6992,7 +6992,7 @@ PR_MD_CSRCS=linux.c MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' DSO_CFLAGS=-fPIC @@ -25,11 +27,86 @@ _OPTIMIZE_FLAGS=-O2 _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that # combo is not yet good at debugging inlined ---- misc/nss-3.14.4/mozilla/security/coreconf/Darwin.mk 2010-02-04 19:59:10.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/security/coreconf/Darwin.mk 2010-06-11 16:35:54.966185975 +0200 -@@ -5,10 +5,12 @@ +diff -ur misc/nss-3.25/nspr/pr/include/pratom.h misc/build/nss-3.25/nspr/pr/include/pratom.h +--- misc/nss-3.25/nspr/pr/include/pratom.h 2016-02-12 05:51:25.000000000 -0800 ++++ misc/build/nss-3.25/nspr/pr/include/pratom.h 2016-07-14 23:47:54.538325000 -0700 +@@ -81,7 +81,9 @@ + #if defined(_WIN32) && !defined(_WIN32_WCE) && \ + (!defined(_MSC_VER) || (_MSC_VER >= 1310)) + ++PR_END_EXTERN_C + #include <intrin.h> ++PR_BEGIN_EXTERN_C + + #ifdef _MSC_VER + #pragma intrinsic(_InterlockedIncrement) +diff -ur misc/nss-3.25/nss/Makefile misc/build/nss-3.25/nss/Makefile +--- misc/nss-3.25/nss/Makefile 2016-06-20 10:11:28.000000000 -0700 ++++ misc/build/nss-3.25/nss/Makefile 2016-07-14 23:47:54.544021000 -0700 +@@ -76,6 +76,9 @@ + ifeq ($(OS_TARGET),WIN95) + NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95 + endif ++ifdef MACOS_SDK_DIR ++NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR) ++endif + ifdef USE_DEBUG_RTL + NSPR_CONFIGURE_OPTS += --enable-debug-rtl + endif +diff -ur misc/nss-3.25/nss/cmd/platlibs.mk misc/build/nss-3.25/nss/cmd/platlibs.mk +--- misc/nss-3.25/nss/cmd/platlibs.mk 2016-06-20 10:11:28.000000000 -0700 ++++ misc/build/nss-3.25/nss/cmd/platlibs.mk 2016-07-14 23:47:54.549839000 -0700 +@@ -10,17 +10,18 @@ + + ifeq ($(OS_ARCH), SunOS) + ifeq ($(USE_64), 1) +-EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1/64:/usr/lib/mps/64' ++#In AOO we would probable put the executables next to libs ++EXTRA_SHARED_LIBS += -R '$$ORIGIN' + else +-EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps' ++EXTRA_SHARED_LIBS += -R '$$ORIGIN' + endif + endif + + ifeq ($(OS_ARCH), Linux) + ifeq ($(USE_64), 1) +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' ++EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN' + else +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' ++EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN' + endif + endif + +diff -ur misc/nss-3.25/nss/cmd/shlibsign/Makefile misc/build/nss-3.25/nss/cmd/shlibsign/Makefile +--- misc/nss-3.25/nss/cmd/shlibsign/Makefile 2016-06-20 10:11:28.000000000 -0700 ++++ misc/build/nss-3.25/nss/cmd/shlibsign/Makefile 2016-07-14 23:47:54.554784000 -0700 +@@ -49,10 +49,15 @@ + CHECKLIBS = + CHECKLOC = + else +-CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) +-CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) ++# Signing causes loading of some system library which in turn loads ++# libsqlite3. Then it loads libsqulite3 from nss, which does not have the proper ++# version. Therefore signing fails. ++# We cannot build with the system sqlite3, because it is too old (SDK ++# 10.4). Otherwise one could set NSS_USE_SYSTEM_SQLITE=1 and use the system lib. ++#CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) ++#CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) + ifndef NSS_DISABLE_DBM +-CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) ++#CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) + endif + CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk) +diff -ur misc/nss-3.25/nss/coreconf/Darwin.mk misc/build/nss-3.25/nss/coreconf/Darwin.mk +--- misc/nss-3.25/nss/coreconf/Darwin.mk 2016-06-20 10:11:28.000000000 -0700 ++++ misc/build/nss-3.25/nss/coreconf/Darwin.mk 2016-07-14 23:47:54.560325000 -0700 +@@ -6,10 +6,12 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk + include $(CORE_DEPTH)/coreconf/Werror.mk -DEFAULT_COMPILER = gcc +DEFAULT_COMPILER = cc @@ -43,8 +120,33 @@ RANLIB = ranlib ifndef CPU_ARCH ---- misc/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2010-01-15 23:19:00.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2010-06-11 16:35:54.981151732 +0200 +diff -ur misc/nss-3.25/nss/coreconf/FreeBSD.mk misc/build/nss-3.25/nss/coreconf/FreeBSD.mk +--- misc/nss-3.25/nss/coreconf/FreeBSD.mk 2016-06-20 10:11:28.000000000 -0700 ++++ misc/build/nss-3.25/nss/coreconf/FreeBSD.mk 2016-07-14 23:47:54.564724000 -0700 +@@ -5,9 +5,8 @@ + + include $(CORE_DEPTH)/coreconf/UNIX.mk + +-DEFAULT_COMPILER = gcc +-CC = gcc +-CCC = g++ ++DEFAULT_COMPILER = $(CC) ++CCC = $(CXX) + RANLIB = ranlib + + CPU_ARCH = $(OS_TEST) +@@ -21,7 +20,7 @@ + CPU_ARCH = x86_64 + endif + +-OS_CFLAGS = $(DSO_CFLAGS) -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK ++OS_CFLAGS = $(DSO_CFLAGS) -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_UNISTD_H -DHAVE_BSD_FLOCK + + DSO_CFLAGS = -fPIC + DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@) +diff -ur misc/nss-3.25/nss/coreconf/Linux.mk misc/build/nss-3.25/nss/coreconf/Linux.mk +--- misc/nss-3.25/nss/coreconf/Linux.mk 2016-06-20 10:11:28.000000000 -0700 ++++ misc/build/nss-3.25/nss/coreconf/Linux.mk 2016-07-14 23:47:54.569918000 -0700 @@ -16,8 +16,11 @@ IMPL_STRATEGY = _PTH endif @@ -59,16 +161,25 @@ RANLIB = ranlib DEFAULT_COMPILER = gcc -@@ -143,7 +146,7 @@ +@@ -139,7 +142,7 @@ + OS_PTHREAD = -lpthread + endif + +-OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -pipe -ffunction-sections -fdata-sections -DLINUX -Dlinux -DHAVE_STRERROR ++OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -pipe -ffunction-sections -fdata-sections -DLINUX -Dlinux -DHAVE_STRERROR -DHAVE_UNISTD_H + OS_LIBS = $(OS_PTHREAD) -ldl -lc + + ifdef USE_PTHREADS +@@ -149,7 +152,7 @@ + ARCH = linux + + DSO_CFLAGS = -fPIC +-DSO_LDOPTS = -shared $(ARCHFLAG) -Wl,--gc-sections ++DSO_LDOPTS = -shared $(ARCHFLAG) -Wl,--gc-sections '-Wl,-rpath,$$ORIGIN' + # The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8) # incorrectly reports undefined references in the libraries we link with, so # we don't use -z defs there. - ZDEFS_FLAG = -Wl,-z,defs --DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) -+DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) '-Wl,-rpath,$$ORIGIN' - LDFLAGS += $(ARCHFLAG) - - # On Maemo, we need to use the -rpath-link flag for even the standard system -@@ -174,8 +177,13 @@ +@@ -189,8 +192,13 @@ endif endif @@ -82,8 +193,9 @@ # The -rpath '$$ORIGIN' linker option instructs this library to search for its # dependencies in the same directory where it resides. ---- misc/nss-3.14.4/mozilla/security/coreconf/SunOS5.mk 2009-06-11 02:55:32.000000000 +0200 -+++ misc/build/nss-3.14.4/mozilla/security/coreconf/SunOS5.mk 2010-06-11 16:35:54.985571182 +0200 +diff -ur misc/nss-3.25/nss/coreconf/SunOS5.mk misc/build/nss-3.25/nss/coreconf/SunOS5.mk +--- misc/nss-3.25/nss/coreconf/SunOS5.mk 2016-06-20 10:11:28.000000000 -0700 ++++ misc/build/nss-3.25/nss/coreconf/SunOS5.mk 2016-07-14 23:47:54.575211000 -0700 @@ -48,8 +48,12 @@ # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer endif @@ -99,25 +211,27 @@ ASFLAGS += -Wa,-P OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG) ifndef BUILD_OPT ---- misc/nss-3.14.4/mozilla/security/coreconf/arch.mk 2009-06-05 04:14:49.000000000 +0200 -+++ misc/build/nss-3.14.4/mozilla/security/coreconf/arch.mk 2010-06-11 16:35:54.990913282 +0200 -@@ -302,7 +302,12 @@ - # IMPL_STRATEGY may be defined too. - # - +diff -ur misc/nss-3.25/nss/coreconf/arch.mk misc/build/nss-3.25/nss/coreconf/arch.mk +--- misc/nss-3.25/nss/coreconf/arch.mk 2016-06-20 10:11:28.000000000 -0700 ++++ misc/build/nss-3.25/nss/coreconf/arch.mk 2016-07-14 23:47:54.579901000 -0700 +@@ -294,7 +294,12 @@ + ifdef CROSS_COMPILE + OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ + else -OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ -+# OBJDIR_NAME is used to build the directory containing the built objects, for ++# OBJDIR_NAME is used to build the directory containing the built objects, for +# example mozilla/dist/Linux2.6_x86_glibc_PTH_DBG.OBJ +# We need to deliver the contents of that folder into the solver. To make that easier -+# in the makefile we rename this directory to "out". ++# in the makefile we rename this directory to "out". +#OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ +OBJDIR_NAME = out + endif + - ifeq (,$(filter-out WIN%,$(OS_TARGET))) - ifndef BUILD_OPT ---- misc/nss-3.14.4/mozilla/security/coreconf/rules.mk 2009-12-08 02:33:36.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/security/coreconf/rules.mk 2010-06-11 16:35:54.996448704 +0200 -@@ -318,7 +318,12 @@ +diff -ur misc/nss-3.25/nss/coreconf/rules.mk misc/build/nss-3.25/nss/coreconf/rules.mk +--- misc/nss-3.25/nss/coreconf/rules.mk 2016-06-20 10:11:28.000000000 -0700 ++++ misc/build/nss-3.25/nss/coreconf/rules.mk 2016-07-14 23:47:54.586736000 -0700 +@@ -322,7 +322,12 @@ ifdef NS_USE_GCC $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $< else @@ -131,49 +245,18 @@ endif @echo $(RES) finished endif ---- misc/nss-3.14.4/mozilla/security/nss/cmd/platlibs.mk 2010-02-04 19:59:10.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/security/nss/cmd/platlibs.mk 2010-06-11 16:35:55.004869805 +0200 -@@ -10,17 +10,18 @@ - - ifeq ($(OS_ARCH), SunOS) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1/64:/usr/lib/mps/64' -+#In AOO we would probable put the executables next to libs -+EXTRA_SHARED_LIBS += -R '$$ORIGIN' - else --EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps' -+EXTRA_SHARED_LIBS += -R '$$ORIGIN' - endif - endif - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' -+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' -+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN' - endif - endif - ---- misc/nss-3.14.4/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200 -+++ misc/build/nss-3.14.4/mozilla/security/nss/cmd/shlibsign/Makefile 2010-06-11 16:35:55.009851148 +0200 -@@ -46,10 +46,15 @@ - - # sign any and all shared libraries that contain the word freebl - --CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) --CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) -+# Signing causes loading of some system library which in turn loads -+# libsqlite3. Then it loads libsqulite3 from nss, which does not have the proper -+# version. Therefore signing fails. -+# We cannot build with the system sqlite3, because it is too old (SDK -+# 10.4). Otherwise one could set NSS_USE_SYSTEM_SQLITE=1 and use the system lib. -+#CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) -+#CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) - ifndef NSS_DISABLE_DBM --CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) -+#CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) - endif - CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk) - +diff -ur misc/nss-3.25/nss/lib/zlib/inflate.c misc/build/nss-3.25/nss/lib/zlib/inflate.c +--- misc/nss-3.25/nss/lib/zlib/inflate.c 2016-06-20 10:11:28.000000000 -0700 ++++ misc/build/nss-3.25/nss/lib/zlib/inflate.c 2016-07-14 23:47:54.598199000 -0700 +@@ -1472,9 +1472,9 @@ + { + struct inflate_state FAR *state; + +- if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16; ++ if (strm == Z_NULL || strm->state == Z_NULL) return ~0UL << 16; + state = (struct inflate_state FAR *)strm->state; +- return ((long)(state->back) << 16) + ++ return ((unsigned long)(state->back) << 16) + + (state->mode == COPY ? state->length : + (state->mode == MATCH ? state->was - state->length : 0)); + } Modified: openoffice/branches/gbuild-reintegration/main/nss/nss_freebsd.patch URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/nss/nss_freebsd.patch?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/nss/nss_freebsd.patch (original) +++ openoffice/branches/gbuild-reintegration/main/nss/nss_freebsd.patch Mon Aug 1 04:31:52 2016 @@ -1,5 +1,6 @@ ---- misc/nss-3.14.4/mozilla/security/coreconf/FreeBSD.mk 2012-05-03 09:42:51.000000000 +0000 -+++ misc/build/nss-3.14.4/mozilla/security/coreconf/FreeBSD.mk 2015-07-13 23:42:44.915864000 +0000 +diff -ur misc/nss-3.25/nss/coreconf/FreeBSD.mk misc/build/nss-3.25/nss/coreconf/FreeBSD.mk +--- misc/nss-3.25/nss/coreconf/FreeBSD.mk 2016-06-20 10:11:28.000000000 -0700 ++++ misc/build/nss-3.25/nss/coreconf/FreeBSD.mk 2016-07-14 23:50:31.177316000 -0700 @@ -5,9 +5,8 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk Modified: openoffice/branches/gbuild-reintegration/main/nss/nss_linux.patch URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/nss/nss_linux.patch?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/nss/nss_linux.patch (original) +++ openoffice/branches/gbuild-reintegration/main/nss/nss_linux.patch Mon Aug 1 04:31:52 2016 @@ -1,24 +1,14 @@ ---- misc/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2013-11-01 14:39:28.195966851 +0100 -+++ misc/build/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2013-11-01 14:39:10.246610849 +0100 -@@ -131,7 +131,7 @@ - # -ansi on platforms like Android where the system headers are C99 and do - # not build with -ansi. - STANDARDS_CFLAGS = -D_POSIX_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE --OS_CFLAGS = $(STANDARDS_CFLAGS) $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -DHAVE_STRERROR -+OS_CFLAGS = $(STANDARDS_CFLAGS) $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -DHAVE_STRERROR -DHAVE_UNISTD_H - OS_LIBS = $(OS_PTHREAD) -ldl -lc - - ifdef USE_PTHREADS ---- misc/nss-3.14.4/mozilla/security/nss/lib/freebl/Makefile 2013-01-31 02:08:59.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/security/nss/lib/freebl/Makefile 2014-01-10 13:57:48.000000000 +0100 -@@ -186,8 +186,8 @@ - DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN - # DEFINES += -DMPI_AMD64_ADD - # comment the next two lines to turn off intel HW accelleration -- DEFINES += -DUSE_HW_AES -- ASFILES += intel-aes.s intel-gcm.s -+# DEFINES += -DUSE_HW_AES -+# ASFILES += intel-aes.s intel-gcm.s - EXTRA_SRCS += intel-gcm-wrap.c - INTEL_GCM = 1 - MPI_SRCS += mpi_amd64.c mp_comba.c +diff -ur misc/nss-3.25/nss/lib/freebl/Makefile misc/build/nss-3.25/nss/lib/freebl/Makefile +--- misc/nss-3.25/nss/lib/freebl/Makefile 2016-06-20 10:11:28.000000000 -0700 ++++ misc/build/nss-3.25/nss/lib/freebl/Makefile 2016-07-14 23:52:19.135925000 -0700 +@@ -153,8 +153,8 @@ + # The Intel AES assembly code requires Visual C++ 2010. + # if $(_MSC_VER) >= 1600 (Visual C++ 2010) + ifeq ($(firstword $(sort $(_MSC_VER) 1600)),1600) +- DEFINES += -DUSE_HW_AES -DINTEL_GCM +- ASFILES += intel-aes-x86-masm.asm intel-gcm-x86-masm.asm ++ #DEFINES += -DUSE_HW_AES -DINTEL_GCM ++ #ASFILES += intel-aes-x86-masm.asm intel-gcm-x86-masm.asm + EXTRA_SRCS += intel-gcm-wrap.c + ifeq ($(CLANG_CL),1) + INTEL_GCM_CLANG_CL = 1 Modified: openoffice/branches/gbuild-reintegration/main/nss/nss_macosx.patch URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/nss/nss_macosx.patch?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/nss/nss_macosx.patch (original) +++ openoffice/branches/gbuild-reintegration/main/nss/nss_macosx.patch Mon Aug 1 04:31:52 2016 @@ -1,18 +1,7 @@ ---- misc/nss-3.14.4/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100 -@@ -73,6 +73,9 @@ - ifeq ($(OS_TARGET),WIN95) - NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95 - endif -+ifdef MACOS_SDK_DIR -+NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR) -+endif - ifdef USE_DEBUG_RTL - NSPR_CONFIGURE_OPTS += --enable-debug-rtl - endif ---- misc/nss-3.14.4/mozilla/security/nss/lib/sqlite/config.mk 2012-12-12 13:30:51.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/security/nss/lib/sqlite/config.mk 2013-10-31 15:45:49.000000000 +0100 -@@ -39,9 +39,9 @@ +diff -ur misc/nss-3.25/nss/lib/sqlite/config.mk misc/build/nss-3.25/nss/lib/sqlite/config.mk +--- misc/nss-3.25/nss/lib/sqlite/config.mk 2016-06-20 10:11:28.000000000 -0700 ++++ misc/build/nss-3.25/nss/lib/sqlite/config.mk 2016-07-14 23:54:14.437879000 -0700 +@@ -35,9 +35,9 @@ # OSAtomicCompareAndSwapPtrBarrier, which is only available on Mac OS X 10.5 # (Darwin 9.0) and later. Define SQLITE_WITHOUT_ZONEMALLOC to disable # that code for older versions of Mac OS X. See bug 820374. @@ -23,5 +12,5 @@ +OSX_MINOR_LT_5 := $(shell [ $(OSX_TARGET_MINOR) -lt 5 ] && echo true) +ifeq ($(OSX_MINOR_LT_5),true) OS_CFLAGS += -DSQLITE_WITHOUT_ZONEMALLOC - endif # Darwin endif + endif # Darwin Modified: openoffice/branches/gbuild-reintegration/main/nss/prj/d.lst URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/nss/prj/d.lst?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/nss/prj/d.lst (original) +++ openoffice/branches/gbuild-reintegration/main/nss/prj/d.lst Mon Aug 1 04:31:52 2016 @@ -6,7 +6,8 @@ mkdir: %_DEST%\inc%_EXT%\mozilla\nss ..\%__SRC%\inc\include\obsolete\protypes.h %_DEST%\inc%_EXT%\mozilla\nspr\obsolete\protypes.h ..\%__SRC%\inc\nss\*.h %_DEST%\inc%_EXT%\mozilla\nss -..\%__SRC%\lib\libfreebl3.* %_DEST%\lib%_EXT%\libfreebl.* +..\%__SRC%\lib\libfreebl3.* %_DEST%\lib%_EXT%\libfreebl3.* +..\%__SRC%\lib\libfreeblpriv3.* %_DEST%\lib%_EXT%\libfreeblpriv3.* ..\%__SRC%\lib\libfreebl_32fpu_3.* %_DEST%\lib%_EXT%\libfreebl_32fpu_3.* ..\%__SRC%\lib\libfreebl_32int64_3.* %_DEST%\lib%_EXT%\libfreebl_32int64_3.* ..\%__SRC%\lib\libfreebl_32int_3.* %_DEST%\lib%_EXT%\libfreebl_32int_3.* Modified: openoffice/branches/gbuild-reintegration/main/package/source/xstor/ohierarchyholder.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/package/source/xstor/ohierarchyholder.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/package/source/xstor/ohierarchyholder.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/package/source/xstor/ohierarchyholder.cxx Mon Aug 1 04:31:52 2016 @@ -162,7 +162,7 @@ uno::Reference< embed::XExtendedStorageS } } - // the subelement was opened successfuly, remember the storage to let it be locked + // the subelement was opened successfully, remember the storage to let it be locked m_xOwnStorage = xOwnStor; return xResult; Modified: openoffice/branches/gbuild-reintegration/main/package/source/xstor/owriteablestream.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/package/source/xstor/owriteablestream.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/package/source/xstor/owriteablestream.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/package/source/xstor/owriteablestream.cxx Mon Aug 1 04:31:52 2016 @@ -312,7 +312,7 @@ OWriteStream_Impl::OWriteStream_Impl( OS OSL_ENSURE( xPackage.is(), "No package component is provided!\n" ); OSL_ENSURE( m_xFactory.is(), "No package stream is provided!\n" ); OSL_ENSURE( pParent, "No parent storage is provided!\n" ); - OSL_ENSURE( m_nStorageType == embed::StorageFormats::OFOPXML || !m_xOrigRelInfoStream.is(), "The Relations info makes sence only for OFOPXML format!\n" ); + OSL_ENSURE( m_nStorageType == embed::StorageFormats::OFOPXML || !m_xOrigRelInfoStream.is(), "The Relations info makes sense only for OFOPXML format!\n" ); } //----------------------------------------------- @@ -444,7 +444,7 @@ sal_Bool OWriteStream_Impl::IsEncrypted( GetEncryptionKeyProperty_Impl( xPropSet ) >>= aKey; // If the properties must be investigated the stream is either - // was never changed or was changed, the parent was commited + // was never changed or was changed, the parent was committed // and the stream was closed. // That means that if it is intended to use common storage key // it is already has no encryption but is marked to be stored @@ -1634,7 +1634,7 @@ void OWriteStream_Impl::GetCopyOfLastCom if ( m_bHasCachedEncryptionData ) { - // TODO: introduce last commited cashed password information and use it here + // TODO: introduce last committed cashed password information and use it here // that means "use common pass" also should be remembered on flash uno::Sequence< beans::NamedValue > aKey = aEncryptionData.getAsConstNamedValueList(); @@ -1775,7 +1775,7 @@ void OWriteStream_Impl::CommitStreamRelI } } - // the original stream makes no sence after this step + // the original stream makes no sense after this step m_xOrigRelInfoStream = m_xNewRelInfoStream; m_aOrigRelInfo = m_aNewRelInfo; m_bOrigRelInfoBroken = sal_False; @@ -2443,7 +2443,7 @@ void OWriteStream::CloseOutput_Impl() if ( !m_bInitOnDemand ) { - // after the stream is disposed it can be commited + // after the stream is disposed it can be committed // so transport correct size property if ( !m_xSeekable.is() ) throw uno::RuntimeException(); @@ -3399,7 +3399,7 @@ void SAL_CALL OWriteStream::removeVetoab void OWriteStream::BroadcastTransaction( sal_Int8 nMessage ) /* 1 - preCommit - 2 - commited + 2 - committed 3 - preRevert 4 - reverted */ @@ -3471,7 +3471,7 @@ void SAL_CALL OWriteStream::commit() m_pImpl->Commit(); - // when the storage is commited the parent is modified + // when the storage is committed the parent is modified ModifyParentUnlockMutex_Impl( aGuard ); } catch( io::IOException& aIOException ) Modified: openoffice/branches/gbuild-reintegration/main/package/source/xstor/xfactory.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/package/source/xstor/xfactory.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/package/source/xstor/xfactory.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/package/source/xstor/xfactory.cxx Mon Aug 1 04:31:52 2016 @@ -132,7 +132,7 @@ uno::Reference< uno::XInterface > SAL_CA OSL_ENSURE( sal_False, "Wrong second argument!\n" ); throw lang::IllegalArgumentException(); // TODO: } - // it's allways possible to read written storage in this implementation + // it's always possible to read written storage in this implementation nStorageMode |= embed::ElementModes::READ; } Modified: openoffice/branches/gbuild-reintegration/main/package/source/xstor/xstorage.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/package/source/xstor/xstorage.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/package/source/xstor/xstorage.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/package/source/xstor/xstorage.cxx Mon Aug 1 04:31:52 2016 @@ -131,7 +131,7 @@ void OStorage_Impl::completeStorageStrea } else if ( nStorageType == embed::StorageFormats::OFOPXML ) { - // TODO/LATER: in future it might make sence to provide the stream if there is one + // TODO/LATER: in future it might make sense to provide the stream if there is one uno::Reference< embed::XRelationshipAccess > xRelAccess( xDest, uno::UNO_QUERY_THROW ); xRelAccess->clearRelationships(); xRelAccess->insertRelationships( aRelInfo, sal_False ); @@ -458,7 +458,7 @@ void OStorage_Impl::RemoveReadOnlyWrap( //----------------------------------------------- void OStorage_Impl::OpenOwnPackage() { - OSL_ENSURE( m_bIsRoot, "Opening of the package has no sence!\n" ); + OSL_ENSURE( m_bIsRoot, "Opening of the package has no sense!\n" ); ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -786,7 +786,7 @@ void OStorage_Impl::CopyToStorage( const xRels->insertRelationships( GetAllRelationshipsIfAny(), sal_False ); } - // if possible the destination storage should be commited after successful copying + // if possible the destination storage should be committed after successful copying uno::Reference< embed::XTransactedObject > xObjToCommit( xDest, uno::UNO_QUERY ); if ( xObjToCommit.is() ) xObjToCommit->commit(); @@ -1021,7 +1021,7 @@ void OStorage_Impl::CopyLastCommitTo( co { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); - OSL_ENSURE( m_xPackageFolder.is(), "A commited storage is incomplete!\n" ); + OSL_ENSURE( m_xPackageFolder.is(), "A committed storage is incomplete!\n" ); if ( !m_xPackageFolder.is() ) throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); @@ -1062,10 +1062,10 @@ void OStorage_Impl::Commit() // in case of a new empty storage it is possible that the contents are still not read // ( the storage of course has no contents, but the initialization is postponed till the first use, - // thus if a new storage was created and commited immediately it must be initialized here ) + // thus if a new storage was created and committed immediately it must be initialized here ) ReadContents(); - // if storage is commited it should have a valid Package representation + // if storage is committed it should have a valid Package representation OSL_ENSURE( m_xPackageFolder.is(), "The package representation should exist!\n" ); if ( !m_xPackageFolder.is() ) throw embed::InvalidStorageException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); @@ -1076,7 +1076,7 @@ void OStorage_Impl::Commit() uno::Reference< container::XNameContainer > xNewPackageFolder; // here the storage will switch to the temporary package folder - // if the storage was already commited and the parent was not commited after that + // if the storage was already committed and the parent was not committed after that // the switch should not be done since the package folder in use is a temporary one; // it can be detected by m_bCommited flag ( root storage doesn't need temporary representation ) if ( !m_bCommited && !m_bIsRoot ) @@ -1144,7 +1144,7 @@ void OStorage_Impl::Commit() if ( !(*pElementIter)->m_bIsInserted ) { // for now stream is opened in direct mode that means that in case - // storage is commited all the streams from it are commited in current state. + // storage is committed all the streams from it are committed in current state. // following two steps are separated to allow easily implement transacted mode // for streams if we need it in future. // Only hierarchical access uses transacted streams currently @@ -1153,7 +1153,7 @@ void OStorage_Impl::Commit() (*pElementIter)->m_pStream->Commit(); // if the storage was not open, there is no need to commit it ??? - // the storage should be checked that it is commited + // the storage should be checked that it is committed if ( (*pElementIter)->m_bIsStorage && (*pElementIter)->m_pStorage && (*pElementIter)->m_pStorage->m_bCommited ) { // it's temporary PackageFolder should be inserted instead of current one @@ -1479,7 +1479,7 @@ SotElement_Impl* OStorage_Impl::InsertRa // the mode is not needed for storage stream internal implementation SotElement_Impl* pNewElement = InsertElement( aName, sal_False ); pNewElement->m_pStream = new OWriteStream_Impl( this, xPackageSubStream, m_xPackage, m_xFactory, sal_True, m_nStorageType, sal_False ); - // the stream is inserted and must be treated as a commited one + // the stream is inserted and must be treated as a committed one pNewElement->m_pStream->SetToBeCommited(); m_aChildrenList.push_back( pNewElement ); @@ -2141,7 +2141,7 @@ void OStorage::BroadcastModifiedIfNecess void OStorage::BroadcastTransaction( sal_Int8 nMessage ) /* 1 - preCommit - 2 - commited + 2 - committed 3 - preRevert 4 - reverted */ @@ -2623,7 +2623,7 @@ uno::Reference< embed::XStorage > SAL_CA && !( nStorageMode & embed::ElementModes::WRITE ) ) throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); // TODO: access denied - // it's allways possible to read written storage in this implementation + // it's always possible to read written storage in this implementation nStorageMode |= embed::ElementModes::READ; uno::Reference< embed::XStorage > xResult; @@ -2937,7 +2937,7 @@ void SAL_CALL OStorage::copyStorageEleme && aStorName.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_rels" ) ) ) ) throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 1 ); // unacceptable storage name - // it's allways possible to read written storage in this implementation + // it's always possible to read written storage in this implementation sal_Int32 nStorageMode = embed::ElementModes::READ; try @@ -4127,7 +4127,7 @@ void SAL_CALL OStorage::commit() m_pImpl->Commit(); // the root storage initiates the storing to source - // when the storage is commited the parent is modified + // when the storage is committed the parent is modified if ( m_pImpl->m_pParent && m_pImpl->m_pParent->m_pAntiImpl ) xParentModif = (util::XModifiable*)m_pImpl->m_pParent->m_pAntiImpl; } Modified: openoffice/branches/gbuild-reintegration/main/package/source/zippackage/ZipPackage.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/package/source/zippackage/ZipPackage.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/package/source/zippackage/ZipPackage.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/package/source/zippackage/ZipPackage.cxx Mon Aug 1 04:31:52 2016 @@ -204,7 +204,7 @@ ZipPackage::~ZipPackage( void ) // it should disconnect all the children from itself during destruction automatically. // So there is no need in explicit m_pRootFolder->releaseUpwardRef() call here any more // since m_pRootFolder has no parent and cleaning of it's children will be done automatically - // during m_pRootFolder dieing by refcount. + // during m_pRootFolder dying by refcount. } //-------------------------------------------------------- @@ -408,7 +408,7 @@ void ZipPackage::parseManifest() if ( !bManifestParsed ) { - // the manifest.xml could not be successfuly parsed, this is an inconsistent package + // the manifest.xml could not be successfully parsed, this is an inconsistent package if ( aPackageMediatype.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "application/vnd." ) ) == 0 ) { // accept only types that look similar to own mediatypes @@ -1109,7 +1109,7 @@ void ZipPackage::WriteContentTypes( ZipO ( *aIter )[PKG_MNFST_MEDIATYPE].Value >>= aType; if ( aType.getLength() ) { - // only nonempty type makes sence here + // only nonempty type makes sense here nSeqLength++; ( *aIter )[PKG_MNFST_FULLPATH].Value >>= aPath; aOverridesSequence[nSeqLength-1].First = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) + aPath; Modified: openoffice/branches/gbuild-reintegration/main/psprint_config/configuration/ppds/HP__CLJ1.PS URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/psprint_config/configuration/ppds/HP__CLJ1.PS?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/psprint_config/configuration/ppds/HP__CLJ1.PS (original) +++ openoffice/branches/gbuild-reintegration/main/psprint_config/configuration/ppds/HP__CLJ1.PS Mon Aug 1 04:31:52 2016 @@ -464,7 +464,7 @@ restore *CloseUI: *OutputBin *% ============================= -*% Resolution and Apperance Control +*% Resolution and Appearance Control *% ============================= *DefaultResolution: 300dpi Modified: openoffice/branches/gbuild-reintegration/main/psprint_config/configuration/ppds/KD8650P1.PS URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/psprint_config/configuration/ppds/KD8650P1.PS?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/psprint_config/configuration/ppds/KD8650P1.PS (original) +++ openoffice/branches/gbuild-reintegration/main/psprint_config/configuration/ppds/KD8650P1.PS Mon Aug 1 04:31:52 2016 @@ -432,7 +432,7 @@ end *% *% o For CMY, the PPD allows invocation of the XtraLife laminate *% feature on all reflection media of a size that corresponds to an -*% availiable size of XtraLife ribbon. The PPD disallows the invocation +*% available size of XtraLife ribbon. The PPD disallows the invocation *% of XtraLife laminate through PPD constraints. *% *% o For black ribbon, the user has no control of the XtraLife lamination Modified: openoffice/branches/gbuild-reintegration/main/psprint_config/configuration/ppds/XRN17000.PS URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/psprint_config/configuration/ppds/XRN17000.PS?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/psprint_config/configuration/ppds/XRN17000.PS (original) +++ openoffice/branches/gbuild-reintegration/main/psprint_config/configuration/ppds/XRN17000.PS Mon Aug 1 04:31:52 2016 @@ -1069,7 +1069,7 @@ currentpagedevice /OutputType known >> currentpagedevice /OutputType get dup null eq {pop (Unknown)} { get } ifelse - } { (Unkown)} ifelse = flush + } { (Unknown)} ifelse = flush " *End *CloseUI: *OutputBin Modified: openoffice/branches/gbuild-reintegration/main/psprint_config/configuration/ppds/XRN24320.PS URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/psprint_config/configuration/ppds/XRN24320.PS?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/psprint_config/configuration/ppds/XRN24320.PS (original) +++ openoffice/branches/gbuild-reintegration/main/psprint_config/configuration/ppds/XRN24320.PS Mon Aug 1 04:31:52 2016 @@ -1551,7 +1551,7 @@ currentpagedevice /OutputType known >> currentpagedevice /OutputType get dup null eq {pop (Unknown)} { get } ifelse - } { (Unkown)} ifelse = flush + } { (Unknown)} ifelse = flush " *End *CloseUI: *OutputBin Modified: openoffice/branches/gbuild-reintegration/main/pyuno/inc/pyuno/pyuno.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/pyuno/inc/pyuno/pyuno.hxx?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/pyuno/inc/pyuno/pyuno.hxx (original) +++ openoffice/branches/gbuild-reintegration/main/pyuno/inc/pyuno/pyuno.hxx Mon Aug 1 04:31:52 2016 @@ -132,7 +132,7 @@ public: } /** clears the reference without decreasing the reference count - only seldomly needed ! */ + only seldom needed ! */ void scratch() { m = 0; Modified: openoffice/branches/gbuild-reintegration/main/pyuno/source/module/pyuno_runtime.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/pyuno/source/module/pyuno_runtime.cxx?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/pyuno/source/module/pyuno_runtime.cxx (original) +++ openoffice/branches/gbuild-reintegration/main/pyuno/source/module/pyuno_runtime.cxx Mon Aug 1 04:31:52 2016 @@ -538,7 +538,7 @@ PyRef Runtime::any2PyObject (const Any & if( ! ret.is() ) { OUStringBuffer buf; - buf.appendAscii( "Couldn't instantiate python representation of structered UNO type " ); + buf.appendAscii( "Couldn't instantiate python representation of structured UNO type " ); buf.append( a.getValueType().getTypeName() ); throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface > () ); } Modified: openoffice/branches/gbuild-reintegration/main/qadevOOo/runner/base/java_complex.java URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/qadevOOo/runner/base/java_complex.java?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/qadevOOo/runner/base/java_complex.java (original) +++ openoffice/branches/gbuild-reintegration/main/qadevOOo/runner/base/java_complex.java Mon Aug 1 04:31:52 2016 @@ -46,7 +46,7 @@ public class java_complex implements Tes * This function executes the complex tests given as parameter "-o" or "TestJob". It querys for the correspond class * and crates the JobDescription. * @param param - * @return true of all tests run successfuly, else false + * @return true of all tests run successfully, else false */ public boolean executeTest(TestParameters param) { @@ -73,7 +73,7 @@ public class java_complex implements Tes * This function run the given DescEntry[] as ComplexTest * @param param * @param entries - * @return true of all tests run successfuly, else false + * @return true of all tests run successfully, else false */ public boolean executeTest(TestParameters param, DescEntry[] entries) { Modified: openoffice/branches/gbuild-reintegration/main/qadevOOo/runner/convwatch/OfficePrint.java URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/qadevOOo/runner/convwatch/OfficePrint.java?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/qadevOOo/runner/convwatch/OfficePrint.java (original) +++ openoffice/branches/gbuild-reintegration/main/qadevOOo/runner/convwatch/OfficePrint.java Mon Aug 1 04:31:52 2016 @@ -238,7 +238,7 @@ public class OfficePrint { } catch ( com.sun.star.uno.Exception e ) { - // Some exception occures.FAILED + // Some exception occured.FAILED GlobalLogWriter.get().println("UNO Exception caught."); GlobalLogWriter.get().println("Message: " + e.getMessage()); e.printStackTrace(); @@ -559,7 +559,7 @@ public class OfficePrint { } catch ( com.sun.star.uno.Exception e ) { - // Some exception occures.FAILED + // Some exception occured.FAILED GlobalLogWriter.get().println("UNO Exception caught."); GlobalLogWriter.get().println("Message: " + e.getMessage()); @@ -712,7 +712,7 @@ public class OfficePrint { } catch ( com.sun.star.uno.Exception e ) { - // Some exception occures.FAILED + // Some exception occured.FAILED GlobalLogWriter.get().println("UNO Exception caught."); GlobalLogWriter.get().println("Message: " + e.getMessage()); Modified: openoffice/branches/gbuild-reintegration/main/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java (original) +++ openoffice/branches/gbuild-reintegration/main/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java Mon Aug 1 04:31:52 2016 @@ -285,7 +285,7 @@ public class OpenOfficePostscriptCreator } catch ( com.sun.star.uno.Exception e ) { - // Some exception occures.FAILED + // Some exception occured.FAILED GlobalLogWriter.println("UNO Exception caught."); GlobalLogWriter.println("Message: " + e.getMessage()); e.printStackTrace(); @@ -527,7 +527,7 @@ public class OpenOfficePostscriptCreator } catch ( com.sun.star.uno.Exception e ) { - // Some exception occures.FAILED + // Some exception occured.FAILED GlobalLogWriter.println("UNO Exception caught."); GlobalLogWriter.println("Message: " + e.getMessage()); @@ -685,7 +685,7 @@ public class OpenOfficePostscriptCreator } catch ( com.sun.star.uno.Exception e ) { - // Some exception occures.FAILED + // Some exception occured.FAILED GlobalLogWriter.println("UNO Exception caught."); GlobalLogWriter.println("Message: " + e.getMessage()); Modified: openoffice/branches/gbuild-reintegration/main/qadevOOo/runner/helper/ConfigHelper.java URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/qadevOOo/runner/helper/ConfigHelper.java?rev=1754701&r1=1754700&r2=1754701&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/qadevOOo/runner/helper/ConfigHelper.java (original) +++ openoffice/branches/gbuild-reintegration/main/qadevOOo/runner/helper/ConfigHelper.java Mon Aug 1 04:31:52 2016 @@ -346,7 +346,7 @@ public class ConfigHelper /** * Returns a <CODE>XNameContainer</CODE> of the <CODE>Set</CODE> * of the <CODE>Configuration</CODE> - * @param setName the name of the Set which sould be returned + * @param setName the name of the Set which should be returned * @throws com.sun.star.uno.Exception on any error * @return A XNameContainer of the Set */
