openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1546124 [6/33] - in /openoffice/branches/alg/aw080: ./ main/ main/accessibility/inc/accessibility/extended/ main/accessibility/inc/accessibility/helper/ main/accessibility/inc/accessibility/standard/ main/accessibility/source/extended/ mai...
Date Wed, 27 Nov 2013 17:25:54 GMT
Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp Wed Nov 27 17:25:40 2013
@@ -39,7 +39,7 @@
 </bookmark><comment>mw added 2 new index entries</comment><paragraph role="heading" id="par_idN1053D" xml-lang="en-US" level="1" l10n="NEW"><variable id="access"><link href="text/shared/explorer/database/dabawiz02access.xhp">Microsoft Access Connection</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN10541" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Specifies the settings for importing a database file in Microsoft Access or Access 2007 format.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id1142772" xml-lang="en-US" l10n="NEW">See also the English Wiki page <link href="http://wiki.services.openoffice.org/wiki/MSA-Base_Faq">http://wiki.services.openoffice.org/wiki/MSA-Base_Faq</link>.</paragraph>
+<paragraph role="paragraph" id="par_id1142772" xml-lang="en-US" l10n="NEW">See also the English Wiki page <link href="https://wiki.openoffice.org/wiki/MSA-Base_Faq">wiki.openoffice.org/wiki/MSA-Base_Faq</link>.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION" id="bm_id627155" localize="false"/><paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="2" l10n="NEW">Microsoft Access database file</paragraph>
 <paragraph role="paragraph" id="par_idN10548" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the path to the database file.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION" id="bm_id8335215" localize="false"/><paragraph role="heading" id="par_idN1054B" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/main.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/main.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/main.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/main.xhp Wed Nov 27 17:25:40 2013
@@ -102,7 +102,7 @@
 <embedvar href="text/shared/explorer/database/toolbars.xhp#toolbars"/>
 </paragraph>
 <embed href="text/shared/04/01020000.xhp#DB_keys"/>
-<paragraph role="paragraph" id="par_id6474806" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Database">Wiki page about Base</link></paragraph>
+<paragraph role="paragraph" id="par_id6474806" xml-lang="en-US" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/Database">Wiki page about Base</link></paragraph>
 </section>
 </body>
 </helpdocument>

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp Wed Nov 27 17:25:40 2013
@@ -56,7 +56,7 @@
       <embed href="text/shared/00/00000001.xhp#finish"/>
       <embed href="text/shared/00/00000001.xhp#abbrechen"/>
       <section id="relatedtopics">
-         <paragraph xml-lang="en-US" id="par_id0112200902353554" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Macros_in_Database_Documents">An in depth explanation by the developers (Wiki).</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id0112200902353554" role="paragraph" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/Macros_in_Database_Documents">An in depth explanation by the developers (Wiki).</link></paragraph>
       </section>
    </body>
 </helpdocument>
\ No newline at end of file

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/rep_main.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/rep_main.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/rep_main.xhp Wed Nov 27 17:25:40 2013
@@ -45,7 +45,7 @@
             <paragraph xml-lang="en-US" id="par_id5284279" role="paragraph" l10n="NEW">Choose Tools - Extension Manager to open the <link href="text/shared/01/packagemanager.xhp">Extension Manager</link>.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id4494766" role="paragraph" l10n="CHG">If you see the Report Builder in the Extension Manager list, then you do not need to install the extension. Else click the link "Get more extensions here". This opens your web browser at the address <link href="http://extensions.services.openoffice.org">http://extensions.services.openoffice.org</link> and shows a list of available extensions.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id4494766" role="paragraph" l10n="CHG">If you see the Report Builder in the Extension Manager list, then you do not need to install the extension. Else click the link "Get more extensions here". This opens your web browser at the address <link href="http://extensions.openoffice.org">http://extensions.openoffice.org</link> and shows a list of available extensions.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id7858516" role="paragraph" l10n="NEW">Find the Report Builder extension. Click at the icon or the "click here" text link. This opens the download page for the extension.</paragraph>

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp Wed Nov 27 17:25:40 2013
@@ -45,7 +45,7 @@
 <paragraph role="heading" id="hd_id2932828" xml-lang="en-US" level="2" l10n="NEW">To enter functions to the report</paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:NewFunction" id="bm_id974456" localize="false"/><paragraph role="paragraph" id="par_id5091708" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In the context menu of the Report Navigator, you see the same commands as in the Report Builder view, plus additional commands to create new functions or to delete them.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id9449446" xml-lang="en-US" l10n="NEW">Functions can be entered using a syntax as specified by the <link href="http://en.wikipedia.org/wiki/OpenFormula">OpenFormula</link> proposal.</paragraph>
-<paragraph role="paragraph" id="par_id4095583" xml-lang="en-US" l10n="NEW">See <link href="http://wiki.services.openoffice.org/wiki/Database">Wiki page about Base</link> for some more help regarding the functions in a report.</paragraph>
+<paragraph role="paragraph" id="par_id4095583" xml-lang="en-US" l10n="NEW">See <link href="https://wiki.openoffice.org/wiki/Database">Wiki page about Base</link> for some more help regarding the functions in a report.</paragraph>
 <paragraph role="heading" id="hd_id311593" xml-lang="en-US" level="3" l10n="NEW">To calculate a sum for each client<comment>copied from a mail by Ocke - did not test</comment></paragraph>
 <list type="ordered">
 <listitem>

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/assistive.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/assistive.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/assistive.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/assistive.xhp Wed Nov 27 17:25:40 2013
@@ -43,7 +43,7 @@
 <paragraph role="heading" id="hd_id3147399" xml-lang="en-US" level="1" l10n="U" oldref="22"><variable id="assistive"><link href="text/shared/guide/assistive.xhp" name="Assistive Tools in $[officename]">Assistive Tools in $[officename]</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="U" oldref="25">$[officename] supports some assistive technology tools like screen magnification software, screen readers, and on-screen keyboards. Most of these tools communicate with $[officename] by means of the Java(TM) Access Bridge software, that uses the Java Accessibility API, a part of the Java runtime environment.</paragraph>
-<paragraph role="tip" id="par_id8847010" xml-lang="en-US" l10n="NEW">A current list of supported assistive tools can be found on the Apache OpenOffice Wiki at <link href="http://wiki.services.openoffice.org/wiki/Accessibility">http://wiki.services.openoffice.org/wiki/Accessibility</link>.</paragraph>
+<paragraph role="tip" id="par_id8847010" xml-lang="en-US" l10n="NEW">A current list of supported assistive tools can be found on the <link href="https://wiki.openoffice.org/wiki/Accessibility">Apache OpenOffice Wiki</link>.</paragraph>
 <paragraph role="heading" id="hd_id3145345" xml-lang="en-US" level="2" l10n="U" oldref="12">Requirements to use assistive tools in $[officename]</paragraph>
 <list type="unordered">
 <listitem>

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/digital_signatures.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/digital_signatures.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/digital_signatures.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/digital_signatures.xhp Wed Nov 27 17:25:40 2013
@@ -102,7 +102,7 @@
       <paragraph xml-lang="en-US" id="par_id6075624" role="paragraph" l10n="NEW">On Windows operating systems, the Windows features of validating a signature are used. On Solaris and Linux systems, files that are supplied by Thunderbird, Mozilla or Firefox are used. You must ensure that the files that are in use within your system are really the original files that were supplied by the original developers. For malevolent intruders, there are numerous ways to replace original files with other files that they supply.</paragraph>
       <paragraph xml-lang="en-US" id="par_id6819971" role="warning" l10n="NEW">The messages about validation of a signature that you see in %PRODUCTNAME are the messages that the validation files return. The %PRODUCTNAME software has no way to ensure that the messages reflect the true status of any certificate. The %PRODUCTNAME software only displays the messages that other files that are not under control of %PRODUCTNAME report. There is no legal responsibility of %PRODUCTNAME that the displayed messages reflect the true status of a digital signature.</paragraph>
       <section id="relatedtopics">
-         <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
          <paragraph xml-lang="en-US" id="par_id486465" role="paragraph" l10n="NEW"><link href="text/shared/guide/digitalsign_send.xhp">Applying digital signatures</link></paragraph>
          <paragraph xml-lang="en-US" id="par_id3448591" role="paragraph" l10n="NEW"><link href="text/shared/guide/digitalsign_receive.xhp">Opening a document using WebDAV over HTTPS</link></paragraph>
       </section>

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp Wed Nov 27 17:25:40 2013
@@ -90,7 +90,7 @@
   <paragraph xml-lang="en-US" id="par_id3397320" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If you enable <emph>Remember password till end of session</emph>, your password will be remembered for subsequent WebDAV connections until you exit %PRODUCTNAME.</ahelp></paragraph>
   <section id="relatedtopics">
    
-   <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
+   <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
    <paragraph xml-lang="en-US" id="par_id2182378" role="paragraph" l10n="NEW"><link href="text/shared/guide/digital_signatures.xhp">About digital signatures</link></paragraph>
    
   </section>

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/digitalsign_send.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/digitalsign_send.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/digitalsign_send.xhp Wed Nov 27 17:25:40 2013
@@ -103,7 +103,7 @@
 <!-- removed HID 1311736326 -->
 <paragraph xml-lang="en-US" id="par_id7705618" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to cancel the connection.</ahelp></paragraph>
       <section id="relatedtopics">
-         <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
          <paragraph xml-lang="en-US" id="par_id5166173" role="paragraph" l10n="NEW"><link href="text/shared/guide/digital_signatures.xhp">About digital signatures</link></paragraph>
       </section>
    </body>

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/language_select.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/language_select.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/language_select.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/language_select.xhp Wed Nov 27 17:25:40 2013
@@ -157,7 +157,7 @@
       <paragraph xml-lang="en-US" id="hd_id9999694" role="heading" level="2" l10n="NEW">Adding More UI Languages</paragraph>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id2216559" role="paragraph" l10n="NEW">Open your Web browser and enter <link href="http://wiki.services.openoffice.org/wiki/Download_OpenOffice.org_LanguagePacks">http://wiki.services.openoffice.org/wiki/Download_OpenOffice.org_LanguagePacks</link></paragraph>
+            <paragraph xml-lang="en-US" id="par_id2216559" role="paragraph" l10n="NEW">Open your Web browser and enter <link href="https://wiki.openoffice.org/wiki/Download_OpenOffice.org_LanguagePacks">https://wiki.openoffice.org/wiki/Download_OpenOffice.org_LanguagePacks</link></paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id7869502" role="paragraph" l10n="CHG">Select and download the correct language pack for your version of %PRODUCTNAME software.</paragraph>

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp Wed Nov 27 17:25:40 2013
@@ -121,7 +121,7 @@
 <paragraph role="paragraph" id="par_id0811200801491972" xml-lang="en-US" l10n="NEW">In Excel, the formula =A1+A2 returns 2, but the formula =SUM(A1,A2) returns 0.<comment>in SUM(A1&lt;limiter&gt;A2), use the Excel limiter comma , in English and semicolon ; in German</comment></paragraph>
 </listitem>
 </list>
-<paragraph role="note" id="par_id3150439" xml-lang="en-US" l10n="CHG" oldref="30">For a detailed overview about converting documents to and from Microsoft Office format, see the <link href="http://wiki.services.openoffice.org/wiki/Documentation/OOoAuthors_User_Manual/Migration_Guide">Migration Guide</link>.</paragraph>
+<paragraph role="note" id="par_id3150439" xml-lang="en-US" l10n="CHG" oldref="30">For a detailed overview about converting documents to and from Microsoft Office format, see the <link href="https://wiki.openoffice.org/wiki/Documentation/OOoAuthors_User_Manual/Migration_Guide">Migration Guide</link>.</paragraph>
 <paragraph role="heading" id="par_idN10A9F" xml-lang="en-US" level="2" l10n="NEW">Opening Microsoft Office Documents That Are Protected With a Password</paragraph>
 <paragraph role="paragraph" id="par_id8699606" xml-lang="en-US" l10n="NEW">%PRODUCTNAME can open the following Microsoft Office document types that are protected by a password.</paragraph>
 <table id="tbl_id4497512">

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/start_parameters.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/start_parameters.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/start_parameters.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/start_parameters.xhp Wed Nov 27 17:25:40 2013
@@ -163,7 +163,7 @@
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablecontent" id="par_id3154756" xml-lang="en-US" l10n="U" oldref="16">Starts in invisible mode.</paragraph>
-<paragraph role="tablecontent" id="par_id3148914" xml-lang="en-US" l10n="U" oldref="17">Neither the start-up logo nor the initial program window will be visible. However, the $[officename] software can be controlled and documents and dialogs opened via the <link href="http://api.openoffice.org" name="API">API</link>. </paragraph>
+<paragraph role="tablecontent" id="par_id3148914" xml-lang="en-US" l10n="U" oldref="17">Neither the start-up logo nor the initial program window will be visible. However, the $[officename] software can be controlled and documents and dialogs opened via the <link href="https://api.openoffice.org" name="API">API</link>. </paragraph>
 <paragraph role="tablecontent" id="par_id3147341" xml-lang="en-US" l10n="U" oldref="18">When the $[officename] software has been started with this parameter, it can only be ended using the taskmanager (Windows) or the <emph>kill </emph>command (UNIX based systems).</paragraph>
 <paragraph role="tablecontent" id="par_id3150388" xml-lang="en-US" l10n="U" oldref="48">It cannot be used in conjunction with <emph>-quickstart</emph>.</paragraph>
 <paragraph role="tablecontent" id="par_id3145147" xml-lang="en-US" l10n="U" oldref="19">More information is found in the <emph>$[officename] Developer's Guide</emph>.</paragraph>
@@ -299,7 +299,7 @@
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablecontent" id="par_id3150530" xml-lang="en-US" l10n="U" oldref="57">Starts in "headless mode" which allows using the application without user interface.</paragraph>
-<paragraph role="tablecontent" id="par_id3156353" xml-lang="en-US" l10n="U" oldref="58">This special mode can be used when the application is controlled by external clients via the <link href="http://api.openoffice.org" name="API">API</link>.</paragraph>
+<paragraph role="tablecontent" id="par_id3156353" xml-lang="en-US" l10n="U" oldref="58">This special mode can be used when the application is controlled by external clients via the <link href="https://api.openoffice.org" name="API">API</link>.</paragraph>
 </tablecell>
 </tablerow>
 </table>

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/xsltfilter_create.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/xsltfilter_create.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/xsltfilter_create.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/guide/xsltfilter_create.xhp Wed Nov 27 17:25:40 2013
@@ -45,7 +45,7 @@
 </variable></paragraph>
   <paragraph xml-lang="en-US" id="par_idN1053D" role="heading" level="2" l10n="NEW">Creating an XML Filter for %PRODUCTNAME</paragraph>
   <paragraph xml-lang="en-US" id="par_idN109A9" role="paragraph" l10n="NEW">When you create an XML filter for %PRODUCTNAME, you need to design an <emph>XSLT stylesheet</emph> that can convert to and from the OpenDocument XML file format.</paragraph>
-  <paragraph xml-lang="en-US" id="par_idN109B0" role="tip" l10n="NEW">For more information about the OpenDocument XML format, go to <link href="http://xml.openoffice.org/">http://xml.openoffice.org/</link>.</paragraph>
+  <paragraph xml-lang="en-US" id="par_idN109B0" role="tip" l10n="NEW">For more information about the OpenDocument XML format, go to <link href="https://xml.openoffice.org/">https://xml.openoffice.org/</link>.</paragraph>
   <paragraph xml-lang="en-US" id="par_idN109C5" role="paragraph" l10n="NEW">If you want, you can include a <emph>template</emph> with your filter to apply %PRODUCTNAME styles to an XML document that you import.</paragraph>
   <paragraph xml-lang="en-US" id="par_idN109CC" role="paragraph" l10n="CHG">You can also include the <emph>Document Type Definition</emph> (DTD) for the external XML format so you can validate the XML format, for example, when you test the filter.</paragraph>
   <paragraph xml-lang="en-US" id="par_idN10531" role="heading" level="2" l10n="NEW">To Create an XML Filter</paragraph>

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/main0600.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/main0600.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/main0600.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/main0600.xhp Wed Nov 27 17:25:40 2013
@@ -45,7 +45,7 @@
 </variable></paragraph>
 <section id="basicalt">
 <paragraph role="warning" id="par_id3151111" xml-lang="en-US" l10n="U" oldref="12">$[officename] provides an Application Programming Interface (API) that enables you to control $[officename] components by using various programming languages. A $[officename] Software Development Kit is available for the programming interface.</paragraph>
-<paragraph role="warning" id="par_id3156346" xml-lang="en-US" l10n="CHG" oldref="15">For more information about $[officename] API reference, please visit http://api.openoffice.org/<comment>removed link; see i75345</comment></paragraph>
+<paragraph role="warning" id="par_id3156346" xml-lang="en-US" l10n="CHG" oldref="15">For more information about $[officename] API reference, please visit <link href="https://api.openoffice.org/">api.openoffice.org</link>.</paragraph>
 <paragraph role="warning" id="par_id3153825" xml-lang="en-US" l10n="U" oldref="13">Macros created with $[officename] Basic based on the old programming interface will no longer be supported by the current version.</paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="CHG" oldref="14">For more information on $[officename] Basic, select "$[officename] Basic" in the list box.</paragraph>

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/optionen/01010400.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/optionen/01010400.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/optionen/01010400.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/optionen/01010400.xhp Wed Nov 27 17:25:40 2013
@@ -146,8 +146,8 @@
 <paragraph role="paragraph" id="par_id3155098" xml-lang="en-US" l10n="CHG" oldref="18">Specifies that hyphenation will also be carried out in footnotes, headers and footers.</paragraph>
 </section>
 <section id="relatedtopics">
-<paragraph role="paragraph" id="par_id6434522" xml-lang="en-US" l10n="CHG" localize="false"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Adding_More_Languages">Wiki page: Adding more languages</link></paragraph>
-<paragraph role="paragraph" id="par_id3552964" xml-lang="en-US" l10n="CHG" localize="false"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Spellchecking_in_More_Languages">Wiki page: Multiple language spellchecking</link></paragraph>
+<paragraph role="paragraph" id="par_id6434522" xml-lang="en-US" l10n="CHG" localize="false"><link href="https://wiki.openoffice.org/wiki/Documentation/How_Tos/Adding_More_Languages">Wiki page: Adding more languages</link></paragraph>
+<paragraph role="paragraph" id="par_id3552964" xml-lang="en-US" l10n="CHG" localize="false"><link href="https://wiki.openoffice.org/wiki/Documentation/How_Tos/Spellchecking_in_More_Languages">Wiki page: Multiple language spellchecking</link></paragraph>
 </section>
 </body>
 </helpdocument>

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/optionen/improvement.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/optionen/improvement.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/optionen/improvement.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/shared/optionen/improvement.xhp Wed Nov 27 17:25:40 2013
@@ -46,7 +46,7 @@
       <section id="howtoget">
          <embed href="text/shared/00/00000406.xhp#improvement"/>
       </section>
-      <paragraph xml-lang="en-US" id="par_id0526200903594966" role="paragraph" l10n="NEW">The Improvement Program was initiated by the User Experience project to improve the usability of %PRODUCTNAME. The User Experience project can be found at the Apache OpenOffice website: <link href="http://ux.openoffice.org/">http://ux.openoffice.org/</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0526200903594966" role="paragraph" l10n="NEW">The Improvement Program was initiated by the User Experience project to improve the usability of %PRODUCTNAME. The User Experience project can be found at the Apache OpenOffice website: <link href="https://ux.openoffice.org/">ux.openoffice.org/</link>.</paragraph>
       <paragraph xml-lang="en-US" id="par_id0526200903594946" role="paragraph" l10n="NEW">The second time you start your new %PRODUCTNAME software, you see a window that gives information about the Improvement Program. </paragraph>
       <paragraph xml-lang="en-US" id="par_id0526200904094345" role="paragraph" l10n="NEW">At this time you can choose to accept or deny your participation.</paragraph>
       <list type="ordered">

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/numbering_lines.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/numbering_lines.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/numbering_lines.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/numbering_lines.xhp Wed Nov 27 17:25:40 2013
@@ -130,6 +130,6 @@
       <paragraph xml-lang="en-US" id="par_id3153934" role="paragraph" l10n="U" oldref="5"><link href="text/swriter/01/06180000.xhp" name="Tools - Line Numbering">Tools - Line Numbering</link></paragraph>
       <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
       <paragraph xml-lang="en-US" id="par_id3153960" role="paragraph" l10n="U" oldref="32"><link href="text/swriter/01/05030800.xhp" name="Format - Paragraph - Numbering">Format - Paragraph - Numbering</link></paragraph>
-      <paragraph xml-lang="en-US" id="par_id2212591" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Setting_up_a_Style_for_Numbering_Lines_in_Code_Listings">Wiki page about numbering paragraphs by styles</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id2212591" role="paragraph" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/Documentation/How_Tos/Setting_up_a_Style_for_Numbering_Lines_in_Code_Listings">Wiki page about numbering paragraphs by styles</link></paragraph>
    </body>
 </helpdocument>
\ No newline at end of file

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/numbering_paras.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/numbering_paras.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/numbering_paras.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/numbering_paras.xhp Wed Nov 27 17:25:40 2013
@@ -89,6 +89,6 @@
       <embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
       <embed href="text/swriter/guide/captions.xhp#captions"/>
       <embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
-      <paragraph xml-lang="en-US" id="par_id6943571" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Setting_up_a_Style_for_Numbering_Lines_in_Code_Listings">Wiki page about numbering paragraphs by styles</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id6943571" role="paragraph" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/Documentation/How_Tos/Setting_up_a_Style_for_Numbering_Lines_in_Code_Listings">Wiki page about numbering paragraphs by styles</link></paragraph>
    </body>
 </helpdocument>

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp Wed Nov 27 17:25:40 2013
@@ -40,7 +40,7 @@
                  oldref="37"><variable id="spellcheck_dialog"><link href="text/swriter/guide/spellcheck_dialog.xhp" name="Checking Spelling and Grammar">Checking Spelling and Grammar</link>
 </variable></paragraph>
       <paragraph xml-lang="en-US" id="par_id3149814" role="paragraph" l10n="CHG" oldref="9">You can manually check the spelling and grammar of a text selection or the entire document.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0525200902184476" role="note" l10n="NEW">To check the spelling and the grammar of a text, the appropriate dictionaries must be installed. For many languages three different dictionaries exist: a spellchecker, a hyphenation dictionary, and a thesaurus. Each dictionary covers one language only. Grammar checkers can be downloaded and installed as extensions. See the <link href="http://extensions.services.openoffice.org/dictionary">extensions web page</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0525200902184476" role="note" l10n="NEW">To check the spelling and the grammar of a text, the appropriate dictionaries must be installed. For many languages three different dictionaries exist: a spellchecker, a hyphenation dictionary, and a thesaurus. Each dictionary covers one language only. Grammar checkers can be downloaded and installed as extensions. See the <link href="http://extensions.openoffice.org/dictionary">extensions web page</link>.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149828" role="paragraph" l10n="U" oldref="10">The spellcheck starts at the current cursor position, or at the beginning of the text selection.</paragraph>
       <list type="ordered">
          <listitem>
@@ -66,8 +66,8 @@
          <paragraph xml-lang="en-US" id="par_id3147107" role="paragraph" l10n="U" oldref="49"><link href="text/shared/01/06010000.xhp" name="Spellcheck dialog">Spelling and Grammar dialog</link></paragraph>
          <embed href="text/swriter/guide/using_hyphen.xhp#using_hyphen"/>
          <embed href="text/swriter/guide/using_thesaurus.xhp#using_thesaurus"/>
-         <paragraph xml-lang="en-US" id="par_id9625843" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Adding_More_Languages">Wiki page: Adding more languages</link></paragraph>
-         <paragraph xml-lang="en-US" id="par_id1683706" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Spellchecking_in_More_Languages">Wiki page: Multiple language spellchecking</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id9625843" role="paragraph" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/Documentation/How_Tos/Adding_More_Languages">Wiki page: Adding more languages</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id1683706" role="paragraph" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/Documentation/How_Tos/Spellchecking_in_More_Languages">Wiki page: Multiple language spellchecking</link></paragraph>
       </section>
    </body>
 </helpdocument>
\ No newline at end of file

Modified: openoffice/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp (original)
+++ openoffice/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp Wed Nov 27 17:25:40 2013
@@ -66,7 +66,7 @@
 
 
       <paragraph xml-lang="en-US" id="par_id3156263" role="paragraph" l10n="U" oldref="19">Initially, the thesaurus uses the language of the selected word in the document, if a thesaurus library for that language is installed. The title bar of the Thesaurus dialog displays the language in use.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3145113" role="note" l10n="U" oldref="18">To look up the word in a different language, click the Language button, and select one of the installed thesaurus languages. A thesaurus library may not be available for all installed languages. You can install languages with a thesaurus library from the <link href="http://extensions.services.openoffice.org/">Extensions</link> web page.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145113" role="note" l10n="U" oldref="18">To look up the word in a different language, click the Language button, and select one of the installed thesaurus languages. A thesaurus library may not be available for all installed languages. You can install languages with a thesaurus library from the <link href="http://extensions.openoffice.org/">Extensions</link> web page.</paragraph>
 <paragraph xml-lang="en-US" id="par_id3196263" role="paragraph" l10n="U" oldref="19">If a thesaurus library is installed for the language of a word, the context menu of the word shows a Synonyms submenu. Select any of the terms from the submenu to replace the word.</paragraph>
       <embed href="text/shared/00/00000004.xhp#related"/>
       <embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>

Modified: openoffice/branches/alg/aw080/main/instsetoo_native/util/openoffice.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/instsetoo_native/util/openoffice.lst?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/instsetoo_native/util/openoffice.lst (original)
+++ openoffice/branches/alg/aw080/main/instsetoo_native/util/openoffice.lst Wed Nov 27 17:25:40 2013
@@ -27,9 +27,7 @@ Globals
             NATIVEPROGRESS false
             REGISTRYLAYERNAME Layers
             SERVICEPACK 1
-            UPDATE_DATABASE 1
             CREATE_MSP_INSTALLSET 0
-            UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
             PACKAGEMAP package_names.txt,package_names_ext.txt
             WINDOWSPATCHLEVEL 8
             OOOVENDOR Apache Software Foundation
@@ -241,48 +239,6 @@ Apache_OpenOffice_Dev
     }
 }
 
-URE
-{
-    Settings
-    {
-        downloadname URE_{productversion}_{os}_install_{languages}
-        variables
-        {
-            FULLPRODUCTNAME URE
-            PRODUCTNAME URE
-            PRODUCTVERSION 4.1.0
-            PACKAGEVERSION 4.1
-            PACKAGEREVISION 1
-            PRODUCTEXTENSION
-            LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION
-            LICENSENAME ALv2
-            SETSTATICPATH 1
-            NOVERSIONINDIRNAME 1
-            PCPFILENAME ure.pcp
-            POOLPRODUCT 0
-            GLOBALFILEGID gid_File_Dl_Cppu
-            DOWNLOADBANNER urebanner.bmp
-            DOWNLOADBITMAP urebitmap.bmp
-            DOWNLOADSETUPICO ooosetup.ico
-            DONTUSESTARTMENUFOLDER 1
-            RELATIVE_PATHES_IN_DDF 1
-            NOLANGUAGESELECTIONPRODUCT 1
-            AOODOWNLOADNAMEPREFIX Apache_OpenOffice-URE
-            STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
-            STARTCENTER_INFO_URL http://www.openoffice.org
-            STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
-            STARTCENTER_LAYOUT_STYLE 0
-            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,version.lst
-            PACKAGEMAP package_names_ext.txt
-            DICT_REPO_URL http://extensions.openoffice.org/dictionaries
-        }
-        active 1
-        compression 5
-        script ure
-        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/ure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/xml.{minor},{solarenvpath}/{os}/MS
-    }
-}
 
 Apache_OpenOffice_SDK
 {
@@ -309,7 +265,6 @@ Apache_OpenOffice_SDK
             NO_README_IN_ROOTDIR 1
             LICENSENAME ALv2
             IGNOREDIRECTORYLAYER 1
-            NOVERSIONINDIRNAME 0
             NOSPACEINDIRECTORYNAME 1
             NOLANGUAGESELECTIONPRODUCT 1
             CHANGETARGETDIR 1
@@ -364,7 +319,6 @@ Apache_OpenOffice_Dev_SDK
             NO_README_IN_ROOTDIR 1
             LICENSENAME ALv2
             IGNOREDIRECTORYLAYER 1
-            NOVERSIONINDIRNAME 0
             NOSPACEINDIRECTORYNAME 1
             NOLANGUAGESELECTIONPRODUCT 1
             CHANGETARGETDIR 1

Propchange: openoffice/branches/alg/aw080/main/libxmlsec/
------------------------------------------------------------------------------
  Merged /openoffice/trunk/main/libxmlsec:r1539577-1545632

Modified: openoffice/branches/alg/aw080/main/libxmlsec/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/libxmlsec/makefile.mk?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/libxmlsec/makefile.mk (original)
+++ openoffice/branches/alg/aw080/main/libxmlsec/makefile.mk Wed Nov 27 17:25:40 2013
@@ -31,9 +31,9 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 
 .INCLUDE :	settings.mk
 
-.IF "$(WITH_MOZILLA)" == "NO"
+.IF "$(ENABLE_NSS_MODULE)" == "NO"
 @all:
-	@echo "Mozilla disabled -> no nss -> no libxmlsec...."
+	@echo "No nss -> no libxmlsec...."
 .ENDIF
 
 # --- Files --------------------------------------------------------
@@ -95,9 +95,9 @@ xmlsec_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-mscrypto --disable-crypto-dl --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --enable-mscrypto --disable-crypto-dl --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
 
-.IF "$(SYSTEM_MOZILLA)" != "YES"
+.IF "$(SYSTEM_NSS)" != "YES"
 CONFIGURE_FLAGS+=--enable-pkgconfig=no
 .ENDIF
 BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
@@ -148,7 +148,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS)
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
 CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
-# system-mozilla needs pkgconfig to get the information about nss
+# system-nss needs pkgconfig to get the information about nss
 # FIXME: This also will enable pkg-config usage for libxml2. It *seems*
 # that the internal headers still are used when they are there but....
 # (and that pkg-config is allowed to fail...)
@@ -157,7 +157,7 @@ CONFIGURE_FLAGS=--with-pic --disable-sha
 # --with-nss or parse -pkg-config --libs / cflags mozilla-nss since
 # the lib may a) be in /usr/lib (Debian) and be not in $with_nss/include
 # $with_nss/lib.
-.IF "$(SYSTEM_MOZILLA)" != "YES"
+.IF "$(SYSTEM_NSS)" != "YES"
 CONFIGURE_FLAGS+=--enable-pkgconfig=no
 .ENDIF
 BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)

Modified: openoffice/branches/alg/aw080/main/nss/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/nss/makefile.mk?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/nss/makefile.mk (original)
+++ openoffice/branches/alg/aw080/main/nss/makefile.mk Wed Nov 27 17:25:40 2013
@@ -39,9 +39,9 @@ all:
 
 .ELSE
 
-TARFILE_NAME=nss-3.12.6-with-nspr-4.8.4
-TARFILE_MD5=b92261a5679276c400555004937af965
-TARFILE_ROOTDIR=nss-3.12.6
+TARFILE_NAME=nss-3.14.4-with-nspr-4.9.5
+TARFILE_MD5=067a04150b1d8b64f7da3019688a7547
+TARFILE_ROOTDIR=nss-3.14.4
 PATCH_FILES=nss.patch
 
 .IF "$(OS)"=="MACOSX"
@@ -88,8 +88,8 @@ BUILD_DIR=mozilla$/security$/nss
 BUILD_ACTION= $(GNUMAKE) nss_build_all
 #See #i105566# && moz#513024#
 .IF "$(OS)"=="LINUX"
-BUILD_ACTION+=FREEBL_NO_DEPEND=1
-PATCH_FILES+=nss_linux.patch nspr-4.8.4-clang.patch
+BUILD_ACTION+=FREEBL_NO_DEPEND=1 FREEBL_LOWHASH=1
+PATCH_FILES+=nss_linux.patch
 .ENDIF
 
 .ENDIF			# "$(GUI)"=="UNX"

Modified: openoffice/branches/alg/aw080/main/nss/nss.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/nss/nss.patch?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/nss/nss.patch (original)
+++ openoffice/branches/alg/aw080/main/nss/nss.patch Wed Nov 27 17:25:40 2013
@@ -1,12 +1,12 @@
---- misc/nss-3.12.6/mozilla/nsprpub/config/rules.mk	2009-12-09 22:24:37.000000000 +0100
-+++ misc/build/nss-3.12.6/mozilla/nsprpub/config/rules.mk	2010-06-11 16:35:54.946870871 +0200
-@@ -345,7 +345,12 @@
+--- 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 @@
  ifdef NS_USE_GCC
  	$(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
  else
 -	$(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
-+        #We remove stl from the paths to avoid that rc.exe finds the stlport of
-+        #OOo. stlport includes the system stl which will fail. By removing it,
++        #We remove stl from the paths to avoid that rc.exe finds the stl wrapper
++        #of AOO. stlport includes the system stl which will fail. By removing it,
 +        #rc will use the stl from the system if the path is in the INCLUDE
 +        #variable.
 +	INCLUDE="$(subst /stl,,$(INCLUDE))" $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
@@ -14,9 +14,9 @@
  endif # GCC
  	@echo $(RES) finished
  endif
---- misc/nss-3.12.6/mozilla/nsprpub/configure	2010-02-08 19:41:35.000000000 +0100
-+++ misc/build/nss-3.12.6/mozilla/nsprpub/configure	2010-06-11 16:35:54.960188991 +0200
-@@ -3900,7 +3900,7 @@
+--- 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 @@
      PR_MD_CSRCS=linux.c
      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
      DSO_CFLAGS=-fPIC
@@ -25,26 +25,27 @@
      _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.12.6/mozilla/security/coreconf/Darwin.mk	2010-02-04 19:59:10.000000000 +0100
-+++ misc/build/nss-3.12.6/mozilla/security/coreconf/Darwin.mk	2010-06-11 16:35:54.966185975 +0200
-@@ -39,8 +39,12 @@
+--- 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 @@
  
- DEFAULT_COMPILER = cc
+ include $(CORE_DEPTH)/coreconf/UNIX.mk
  
--CC		= cc
--CCC		= c++
+-DEFAULT_COMPILER = gcc
++DEFAULT_COMPILER = cc
++
 +# CC is taken from environment automatically.
 +#CC		= cc
-+# Use CCC from environment.
-+#CCC		= c++
 +CCC		= $(CXX)
-+
+ 
+-CC		= gcc
+-CCC		= g++
  RANLIB		= ranlib
  
  ifndef CPU_ARCH
---- misc/nss-3.12.6/mozilla/security/coreconf/Linux.mk	2010-01-15 23:19:00.000000000 +0100
-+++ misc/build/nss-3.12.6/mozilla/security/coreconf/Linux.mk	2010-06-11 16:35:54.981151732 +0200
-@@ -46,8 +46,11 @@
+--- 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
+@@ -16,8 +16,11 @@
  	IMPL_STRATEGY = _PTH
  endif
  
@@ -58,7 +59,7 @@
  RANLIB			= ranlib
  
  DEFAULT_COMPILER = gcc
-@@ -147,7 +150,7 @@
+@@ -143,7 +146,7 @@
  # incorrectly reports undefined references in the libraries we link with, so
  # we don't use -z defs there.
  ZDEFS_FLAG		= -Wl,-z,defs
@@ -66,10 +67,10 @@
 +DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) '-Wl,-rpath,$$ORIGIN'
  LDFLAGS			+= $(ARCHFLAG)
  
- # INCLUDES += -I/usr/include -Y/usr/include/linux
-@@ -158,8 +161,13 @@
- #
- CPU_TAG = _$(CPU_ARCH)
+ # On Maemo, we need to use the -rpath-link flag for even the standard system
+@@ -174,8 +177,13 @@
+ endif
+ endif
  
 +ifeq ($(SYSTEM_ZLIB),YES)  
 +# Currently (3.12.4) only the tools modutil and signtool are linked with libz
@@ -81,9 +82,9 @@
  
  # The -rpath '$$ORIGIN' linker option instructs this library to search for its
  # dependencies in the same directory where it resides.
---- misc/nss-3.12.6/mozilla/security/coreconf/SunOS5.mk	2009-06-11 02:55:32.000000000 +0200
-+++ misc/build/nss-3.12.6/mozilla/security/coreconf/SunOS5.mk	2010-06-11 16:35:54.985571182 +0200
-@@ -89,8 +89,12 @@
+--- 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
+@@ -48,8 +48,12 @@
  	    # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
  	endif
  else
@@ -98,9 +99,9 @@
  	ASFLAGS   += -Wa,-P
  	OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG)
  	ifndef BUILD_OPT
---- misc/nss-3.12.6/mozilla/security/coreconf/arch.mk	2009-06-05 04:14:49.000000000 +0200
-+++ misc/build/nss-3.12.6/mozilla/security/coreconf/arch.mk	2010-06-11 16:35:54.990913282 +0200
-@@ -324,7 +324,12 @@
+--- 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.
  #
  
@@ -114,9 +115,9 @@
  
  ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  ifndef BUILD_OPT
---- misc/nss-3.12.6/mozilla/security/coreconf/rules.mk	2009-12-08 02:33:36.000000000 +0100
-+++ misc/build/nss-3.12.6/mozilla/security/coreconf/rules.mk	2010-06-11 16:35:54.996448704 +0200
-@@ -355,7 +355,12 @@
+--- 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 @@
  ifdef NS_USE_GCC
  	$(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
  else
@@ -130,27 +131,22 @@
  endif
  	@echo $(RES) finished
  endif
---- misc/nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk	2010-02-04 19:59:10.000000000 +0100
-+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk	2010-06-11 16:35:55.004869805 +0200
-@@ -41,27 +41,28 @@
+--- 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 ($(BUILD_SUN_PKG), 1)
  ifeq ($(USE_64), 1)
 -EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
-+#In OOo we would probable put the executables next to libs
++#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
- else
--EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib'
-+EXTRA_SHARED_LIBS += -R '$$ORIGIN'
- endif
  endif
  
  ifeq ($(OS_ARCH), Linux)
- ifeq ($(BUILD_SUN_PKG), 1)
  ifeq ($(USE_64), 1)
 -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
 +EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN'
@@ -158,19 +154,11 @@
 -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
 +EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN'
  endif
- else
- ifeq ($(USE_64), 1)
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
-+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN'
- else
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
-+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN'
- endif
  endif
- endif
---- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile	2009-08-07 21:06:37.000000000 +0200
-+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile	2010-06-11 16:35:55.009851148 +0200
-@@ -78,10 +78,15 @@
+ 
+--- 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
  

Modified: openoffice/branches/alg/aw080/main/nss/nss.patch.mingw
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/nss/nss.patch.mingw?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/nss/nss.patch.mingw (original)
+++ openoffice/branches/alg/aw080/main/nss/nss.patch.mingw Wed Nov 27 17:25:40 2013
@@ -1,5 +1,5 @@
---- misc/nss-3.12.6/mozilla/nsprpub/config/autoconf.mk.in	2009-03-04 07:04:23.000000000 +0900
-+++ misc/build/nss-3.12.6/mozilla/nsprpub/config/autoconf.mk.in	2010-06-17 08:42:08.010625000 +0900
+--- misc/nss-3.13.6/mozilla/nsprpub/config/autoconf.mk.in	2009-03-04 07:04:23.000000000 +0900
++++ misc/build/nss-3.13.6/mozilla/nsprpub/config/autoconf.mk.in	2010-06-17 08:42:08.010625000 +0900
 @@ -22,6 +22,7 @@
  RELEASE_OBJDIR_NAME = @RELEASE_OBJDIR_NAME@
  OBJDIR_NAME	= @OBJDIR_NAME@
@@ -8,8 +8,8 @@
  OBJ_SUFFIX	= @OBJ_SUFFIX@
  LIB_SUFFIX	= @LIB_SUFFIX@
  DLL_SUFFIX	= @DLL_SUFFIX@
---- misc/nss-3.12.6/mozilla/nsprpub/config/rules.mk	2009-12-10 06:24:37.000000000 +0900
-+++ misc/build/nss-3.12.6/mozilla/nsprpub/config/rules.mk	2010-06-17 08:42:08.057500000 +0900
+--- misc/nss-3.13.6/mozilla/nsprpub/config/rules.mk	2009-12-10 06:24:37.000000000 +0900
++++ misc/build/nss-3.13.6/mozilla/nsprpub/config/rules.mk	2010-06-17 08:42:08.057500000 +0900
 @@ -113,9 +113,9 @@
  # other platforms do not.
  #
@@ -22,8 +22,8 @@
  SHARED_LIB_PDB	= $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb
  else
  LIBRARY		= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
---- misc/nss-3.12.6/mozilla/nsprpub/configure	2010-02-09 03:41:35.000000000 +0900
-+++ misc/build/nss-3.12.6/mozilla/nsprpub/configure	2010-06-17 08:42:10.000000000 +0900
+--- misc/nss-3.13.6/mozilla/nsprpub/configure	2010-02-09 03:41:35.000000000 +0900
++++ misc/build/nss-3.13.6/mozilla/nsprpub/configure	2010-06-17 08:42:10.000000000 +0900
 @@ -2770,6 +2770,7 @@
  LIB_SUFFIX=a
  DLL_SUFFIX=so
@@ -48,8 +48,8 @@
  s%@MKSHLIB@%$MKSHLIB%g
  s%@DSO_CFLAGS@%$DSO_CFLAGS%g
  s%@DSO_LDOPTS@%$DSO_LDOPTS%g
---- misc/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in	2009-12-19 18:06:07.000000000 +0900
-+++ misc/build/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in	2010-06-17 08:42:08.151250000 +0900
+--- misc/nss-3.13.6/mozilla/nsprpub/pr/src/Makefile.in	2009-12-19 18:06:07.000000000 +0900
++++ misc/build/nss-3.13.6/mozilla/nsprpub/pr/src/Makefile.in	2010-06-17 08:42:08.151250000 +0900
 @@ -195,7 +195,7 @@
  
  ifeq ($(OS_ARCH),WINNT)
@@ -59,8 +59,8 @@
  else
  OS_LIBS		= advapi32.lib wsock32.lib winmm.lib
  endif
---- misc/nss-3.12.6/mozilla/security/coreconf/WIN32.mk	2009-07-29 09:15:46.000000000 +0900
-+++ misc/build/nss-3.12.6/mozilla/security/coreconf/WIN32.mk	2010-06-17 08:42:08.198125000 +0900
+--- misc/nss-3.13.6/mozilla/security/coreconf/WIN32.mk	2009-07-29 09:15:46.000000000 +0900
++++ misc/build/nss-3.13.6/mozilla/security/coreconf/WIN32.mk	2010-06-17 08:42:08.198125000 +0900
 @@ -43,8 +43,8 @@
  DEFAULT_COMPILER = cl
  
@@ -72,8 +72,8 @@
  	LINK         = ld
  	AR           = ar
  	AR          += cr $@
---- misc/nss-3.12.6/mozilla/security/coreconf/WIN95.mk	2009-02-14 14:51:10.000000000 +0900
-+++ misc/build/nss-3.12.6/mozilla/security/coreconf/WIN95.mk	2010-06-17 08:42:08.245000000 +0900
+--- misc/nss-3.13.6/mozilla/security/coreconf/WIN95.mk	2009-02-14 14:51:10.000000000 +0900
++++ misc/build/nss-3.13.6/mozilla/security/coreconf/WIN95.mk	2010-06-17 08:42:08.245000000 +0900
 @@ -44,4 +44,8 @@
  DEFINES += -DWIN95
  
@@ -85,8 +85,8 @@
 +  NSPR31_LIB_PREFIX = $(NULL)
 +endif
 \ No newline at end of file
---- misc/nss-3.12.6/mozilla/security/coreconf/rules.mk	2009-12-08 10:33:36.000000000 +0900
-+++ misc/build/nss-3.12.6/mozilla/security/coreconf/rules.mk	2010-06-17 08:42:08.291875000 +0900
+--- misc/nss-3.13.6/mozilla/security/coreconf/rules.mk	2009-12-08 10:33:36.000000000 +0900
++++ misc/build/nss-3.13.6/mozilla/security/coreconf/rules.mk	2010-06-17 08:42:08.291875000 +0900
 @@ -281,8 +281,12 @@
  	fi
  endif	# MSVC with manifest tool
@@ -100,8 +100,8 @@
  
  get_objs:
  	@echo $(OBJS)
---- misc/nss-3.12.6/mozilla/security/nss/Makefile	2009-12-09 01:47:03.000000000 +0900
-+++ misc/build/nss-3.12.6/mozilla/security/nss/Makefile	2010-06-17 08:42:08.338750000 +0900
+--- misc/nss-3.13.6/mozilla/security/nss/Makefile	2009-12-09 01:47:03.000000000 +0900
++++ misc/build/nss-3.13.6/mozilla/security/nss/Makefile	2010-06-17 08:42:08.338750000 +0900
 @@ -108,7 +108,7 @@
  NSPR_CONFIGURE_OPTS += --enable-debug-rtl
  endif
@@ -111,8 +111,8 @@
  endif
  
  #
---- misc/nss-3.12.6/mozilla/security/nss/cmd/crmftest/Makefile	2005-11-14 09:17:21.000000000 +0900
-+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/crmftest/Makefile	2010-06-17 08:42:08.370000000 +0900
+--- misc/nss-3.13.6/mozilla/security/nss/cmd/crmftest/Makefile	2005-11-14 09:17:21.000000000 +0900
++++ misc/build/nss-3.13.6/mozilla/security/nss/cmd/crmftest/Makefile	2010-06-17 08:42:08.370000000 +0900
 @@ -90,7 +90,7 @@
  LDDIST = $(DIST)/lib
  
@@ -122,8 +122,8 @@
  endif
  
  include ../platrules.mk
---- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile	2009-08-08 04:06:37.000000000 +0900
-+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile	2010-06-17 08:42:10.000000000 +0900
+--- misc/nss-3.13.6/mozilla/security/nss/cmd/shlibsign/Makefile	2009-08-08 04:06:37.000000000 +0900
++++ misc/build/nss-3.13.6/mozilla/security/nss/cmd/shlibsign/Makefile	2010-06-17 08:42:10.000000000 +0900
 @@ -115,10 +115,16 @@
  	$(call core_abspath,$(OBJDIR)) $(OS_TARGET) \
  	$(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<)
@@ -141,27 +141,3 @@
  
  libs install :: $(CHECKLOC)
  
---- misc/nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk	2009-04-12 06:18:42.000000000 +0900
-+++ misc/build/nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk	2010-06-17 08:42:08.557500000 +0900
-@@ -84,10 +84,6 @@
- RES     = $(OBJDIR)/$(LIBRARY_NAME).res
- RESNAME = freebl.rc
- 
--ifndef WINCE
--OS_LIBS += shell32.lib
--endif
--
- ifdef NS_USE_GCC
- EXTRA_SHARED_LIBS += \
- 	-L$(DIST)/lib \
-@@ -97,6 +93,10 @@
- 	-lnspr4 \
- 	$(NULL)
- else # ! NS_USE_GCC
-+ifndef WINCE
-+OS_LIBS += shell32.lib
-+endif
-+
- EXTRA_SHARED_LIBS += \
- 	$(DIST)/lib/nssutil3.lib \
- 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.lib \

Modified: openoffice/branches/alg/aw080/main/nss/nss_linux.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/nss/nss_linux.patch?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/nss/nss_linux.patch (original)
+++ openoffice/branches/alg/aw080/main/nss/nss_linux.patch Wed Nov 27 17:25:40 2013
@@ -1,34 +1,11 @@
-diff -uNrp misc/nss-3.12.6/mozilla/security/coreconf/config.mk misc/build/nss-3.12.6/mozilla/security/coreconf/config.mk
---- misc/nss-3.12.6/mozilla/security/coreconf/config.mk	2009-08-25 19:35:11.000000000 -0300
-+++ misc/build/nss-3.12.6/mozilla/security/coreconf/config.mk	2011-12-14 14:07:30.979358265 -0300
-@@ -63,7 +63,7 @@ endif
- #######################################################################
+--- 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
  
- TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
--              AIX RISCOS WINNT WIN95 WINCE
-+              AIX RISCOS WINNT WIN95 WINCE Linux
- 
- ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
- include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
-diff -uNrp misc/nss-3.12.6/mozilla/security/coreconf/Linux.mk misc/build/nss-3.12.6/mozilla/security/coreconf/Linux.mk
---- misc/nss-3.12.6/mozilla/security/coreconf/Linux.mk	2011-12-14 14:06:50.112354384 -0300
-+++ misc/build/nss-3.12.6/mozilla/security/coreconf/Linux.mk	2011-12-14 14:07:30.978358265 -0300
-@@ -179,3 +179,18 @@ RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/pr
- endif
- endif
- 
-+OS_REL_CFLAGS   += -DLINUX2_1
-+MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
-+
-+ifdef MAPFILE
-+	MKSHLIB += -Wl,--version-script,$(MAPFILE)
-+endif
-+PROCESS_MAP_FILE = grep -v ';-' $< | \
-+        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-+
-+ifeq ($(OS_RELEASE),2.4)
-+# Softoken 3.13 uses NO_FORK_CHECK only.
-+# Softoken 3.12 uses NO_FORK_CHECK and NO_CHECK_FORK.
-+# Don't use NO_CHECK_FORK in new code.
-+DEFINES += -DNO_FORK_CHECK -DNO_CHECK_FORK
-+endif
+ ifdef USE_PTHREADS

Modified: openoffice/branches/alg/aw080/main/nss/nss_macosx.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/nss/nss_macosx.patch?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/nss/nss_macosx.patch (original)
+++ openoffice/branches/alg/aw080/main/nss/nss_macosx.patch Wed Nov 27 17:25:40 2013
@@ -1,6 +1,6 @@
---- misc/nss-3.12.6/mozilla/security/nss/Makefile	2008-12-03 00:24:39.000000000 +0100
-+++ misc/build/nss-3.12.6/mozilla/security/nss/Makefile	2009-11-27 13:36:22.662753328 +0100
-@@ -104,6 +104,9 @@
+--- 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
@@ -10,3 +10,18 @@
  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 @@
+ # 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.
+-DARWIN_VER_MAJOR := $(shell uname -r | cut -f1 -d.)
+-DARWIN_LT_9 := $(shell [ $(DARWIN_VER_MAJOR) -lt 9 ] && echo true)
+-ifeq ($(DARWIN_LT_9),true)
++OSX_TARGET_MINOR := $(shell echo $(MACOSX_DEPLOYMENT_TARGET) | cut -f2 -d.)
++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

Modified: openoffice/branches/alg/aw080/main/nss/readme.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/nss/readme.txt?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/nss/readme.txt (original)
+++ openoffice/branches/alg/aw080/main/nss/readme.txt Wed Nov 27 17:25:40 2013
@@ -1,13 +1,13 @@
 Relation between nss, moz, moz_prebuilt
 ---------------------------------------
-nss containes the security libraries which are also part of moz. However nss is
-meant to be more current, that is it to be updated more often. This should be
-easier than doing this with moz. 
+nss contains the security libraries which are also part of moz. However nss is
+meant to be more current, that is, it to be updated more often. This 
+should be easier than updating moz.
 
-If nss is build depends on an environment variable (ENABLE_NSS_MODULE=YES) which
-is per default set to YES. In this case nss is build before moz. The nss
+When nss is build, it depends on an environment variable (ENABLE_NSS_MODULE)
+which is by default set to YES. In this case nss is build before moz. The nss
 libraries/lib files/headers built in moz are then not delivered. Otherwise they
-would overwrite those from nss. That is, the nss libraries build in moz are
+would overwrite those from nss. The nss libraries build in moz are then
 removed from mozruntime.zip (build in moz/solver/bin), they are removed from the
 lib directory (for example moz/unxlngi6.pro/lib), and the nss and nspr headers
 are also removed (inc/nss and inc/nspr).  The nss libraries from the nss module
@@ -27,7 +27,7 @@ checksums for the cryptographic module a
 not be part of the OOo installation sets.
 
 Signing has been turned off because 
-- we change the rpath (install names)  after signing which breaks the signatures
+- we change the rpath (install names) after signing which breaks the signatures
 (Mac)
 - sqlite conflicts with the system sqlite when signing which breaks the build
 

Modified: openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile (original)
+++ openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile Wed Nov 27 17:25:40 2013
@@ -71,14 +71,14 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(
 	-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
 	$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
 	/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
-	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcrt.lib kernel32.lib
 	$(LINK_MANIFEST)
 else
 #$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
-	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
 ifeq "$(OS)" "MACOSX"
 	$(INSTALL_NAME_URELIBS)  $@
 endif

Modified: openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/Components/CppComponent/Makefile?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/Components/CppComponent/Makefile (original)
+++ openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/Components/CppComponent/Makefile Wed Nov 27 17:25:40 2013
@@ -104,14 +104,14 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(
 	-$(MKDIR) $(subst /,$(PS),$(SAMPLE_GEN_OUT))
 	$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
 	/MAP:$(SAMPLE_GEN_OUT)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
-	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcrt.lib kernel32.lib
 	$(LINK_MANIFEST)
 else
 #$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@))
 	$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
-	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
 ifeq "$(OS)" "MACOSX"
 	$(INSTALL_NAME_URELIBS)  $@
 endif
@@ -176,10 +176,10 @@ $(OUT_BIN)/_$(APP1_NAME)$(EXE_EXT) : $(S
 	-$(MKDIR) $(subst /,$(PS),$(SAMPLE_GEN_OUT))
 ifeq "$(OS)" "WIN"
 	$(LINK) $(EXE_LINK_FLAGS) /OUT:$@ /MAP:$(SAMPLE_GEN_OUT)/$(basename $(@F)).map \
-	  $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB)
+	  $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
 else
 	$(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \
-	  $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
+	  $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
 ifeq "$(OS)" "MACOSX"
 	$(INSTALL_NAME_URELIBS_BIN)  $@
 endif

Modified: openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile (original)
+++ openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile Wed Nov 27 17:25:40 2013
@@ -79,13 +79,13 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(
 	-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_MISC))
 	$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
 	/MAP:$(OUT_COMP_MISC)/$(COMP_NAME).map $(SLOFILES) \
-	 $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+	 $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcrt.lib kernel32.lib
 	$(LINK_MANIFEST)
 else
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))	 
 	$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
-	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
 ifeq "$(OS)" "MACOSX"
 	$(INSTALL_NAME_URELIBS)  $@
 endif

Modified: openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile (original)
+++ openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile Wed Nov 27 17:25:40 2013
@@ -52,7 +52,7 @@ $(OUT_SHL_SLO)/%.$(OBJ_EXT) : %.c
 $(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)$(SHL_NAME).$(SHAREDLIB_EXT) : $(SLOFILES) 
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	$(LINK) $(LIBRARY_LINK_FLAGS) $(LINK_LIBS) $(LINK_JAVA_LIBS) -o $@ $< \
-	-ljawt $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB)
+	-ljawt $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STDC++LIB)
 
 .PHONY: clean
 clean :

Modified: openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile (original)
+++ openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile Wed Nov 27 17:25:40 2013
@@ -73,13 +73,13 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(
 	-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
 	$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
 	/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
-	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcrt.lib kernel32.lib
 	$(LINK_MANIFEST)
 else
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
-	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
 ifeq "$(OS)" "MACOSX"
 	$(INSTALL_NAME_URELIBS)  $@
 endif

Modified: openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile (original)
+++ openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile Wed Nov 27 17:25:40 2013
@@ -70,13 +70,13 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(
 	-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
 	$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
 	/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
-	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcrt.lib kernel32.lib
 	$(LINK_MANIFEST)
 else
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
-	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
 ifeq "$(OS)" "MACOSX"
 	$(INSTALL_NAME_URELIBS)  $@
 endif

Modified: openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile (original)
+++ openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile Wed Nov 27 17:25:40 2013
@@ -62,10 +62,10 @@ $(OUT_BIN)/%$(EXE_EXT) : $(SAMPLE_OBJ_OU
 	-$(MKDIR) $(subst /,$(PS),$(SAMPLE_GEN_OUT))
 ifeq "$(OS)" "WIN"
 	$(LINK) $(EXE_LINK_FLAGS) /OUT:$@ /MAP:$(SAMPLE_GEN_OUT)/$(subst $(EXE_EXT),.map,$(@F)) \
-	  $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB)
+	  $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
 else
 	$(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \
-	  $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
+	  $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
 ifeq "$(OS)" "MACOSX"
 	$(INSTALL_NAME_URELIBS_BIN)  $@
 endif

Modified: openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile (original)
+++ openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile Wed Nov 27 17:25:40 2013
@@ -68,10 +68,10 @@ $(OUT_BIN)/$(COMPONENT_NAME)$(EXE_EXT) :
 	-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
 ifeq "$(OS)" "WIN"
 	$(LINK) $(EXE_LINK_FLAGS) /OUT:$@ /MAP:$(OUT_COMP_GEN)/$(subst $(EXE_EXT),.map,$(@F)) \
-	  $(OBJFILES) $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB)
+	  $(OBJFILES) $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
 else
 	$(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $(OBJFILES) \
-	  $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
+	  $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
 ifeq "$(OS)" "MACOSX"
 	$(INSTALL_NAME_URELIBS_BIN)  $@
 endif

Modified: openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile (original)
+++ openoffice/branches/alg/aw080/main/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile Wed Nov 27 17:25:40 2013
@@ -55,10 +55,10 @@ $(OUT_BIN)/_$(APP_NAME)$(EXE_EXT) : $(OU
 	-$(MKDIR) $(subst /,$(PS),$(OUT_APP_GEN))
 ifeq "$(OS)" "WIN"
 	$(LINK) $(EXE_LINK_FLAGS) /OUT:$@ /MAP:$(OUT_APP_GEN)/$(basename $(@F)).map \
-	  $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB)
+	  $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
 else
 	$(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \
-	  $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
+	  $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
 ifeq "$(OS)" "MACOSX"
 	$(INSTALL_NAME_URELIBS_BIN)  $@
 endif

Modified: openoffice/branches/alg/aw080/main/odk/pack/copying/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/odk/pack/copying/makefile.mk?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/odk/pack/copying/makefile.mk (original)
+++ openoffice/branches/alg/aw080/main/odk/pack/copying/makefile.mk Wed Nov 27 17:25:40 2013
@@ -82,13 +82,6 @@ LIBLIST = \
 	$(DESTDIRLIB)/irmcxt.lib \
 	$(DESTDIRLIB)/ipurpenvhelper3MSC.lib
 
-.IF "$(COMEX)"=="8"
-	LIBLIST += $(DESTDIRLIB)/stlport_vc7.lib
-.ELIF "$(COMEX)"=="10" || "$(COMEX)"=="11" || "$(COMEX)"=="12" 
-	LIBLIST += $(DESTDIRLIB)/stlport_vc71.lib
-.ELSE
-	LIBLIST += $(DESTDIRLIB)/stlport_vc6.lib
-.ENDIF
 .ENDIF
 
 .IF "$(OS)"=="LINUX"

Modified: openoffice/branches/alg/aw080/main/odk/util/odk_rules.pmk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/odk/util/odk_rules.pmk?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/odk/util/odk_rules.pmk (original)
+++ openoffice/branches/alg/aw080/main/odk/util/odk_rules.pmk Wed Nov 27 17:25:40 2013
@@ -84,11 +84,7 @@ $(DESTDIR)/cfgWin.js : $(PRJ)/cfgWin.js
 
 $(DESTDIRSETTINGS)/%.mk : $(PRJ)/settings/%.mk
 	@@-rm -f $@
-.IF "$(COMEX)"=="7"
-	$(MY_TEXTCOPY) $< | $(SED) -e 's/stlport_vc7/stlport_vc6/' $@
-.ELSE
 	$(MY_TEXTCOPY) $< $@
-.ENDIF
 
 $(DESTDIRXML)/module-description.dtd : $(XMLOUT)/module-description.dtd
 	@@-rm -f $@

Modified: openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/AccessibleEventId.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/AccessibleEventId.idl?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/AccessibleEventId.idl (original)
+++ openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/AccessibleEventId.idl Wed Nov 27 17:25:40 2013
@@ -376,6 +376,17 @@ published constants AccessibleEventId
         @since OOo 3.2
     */
     const short LISTBOX_ENTRY_COLLAPSED = 33;
+
+    //IAccessibility2 Implementation 2009-----
+    const short ACTIVE_DESCENDANT_CHANGED_NOFOCUS = 34;
+    const short SELECTION_CHANGED_ADD =35;
+    const short SELECTION_CHANGED_REMOVE =36;
+    const short SELECTION_CHANGED_WITHIN =37;
+    const short PAGE_CHANGED =38;
+    const short SECTION_CHANGED =39;
+    const short COLUMN_CHANGED =40;
+    //-----IAccessibility2 Implementation 2009
+
 };
 
 }; }; }; };

Modified: openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/AccessibleRelationType.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/AccessibleRelationType.idl?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/AccessibleRelationType.idl (original)
+++ openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/AccessibleRelationType.idl Wed Nov 27 17:25:40 2013
@@ -110,6 +110,14 @@ published constants AccessibleRelationTy
         @since OOo 3.0
     */
     const short NODE_CHILD_OF = 9;
+
+    /** Described-by relation type.
+    
+        <p>Indicates an object is described by the target object.</p>
+
+        @since OOo 3.5
+    */
+    const short DESCRIBED_BY = 10;
 };
 
 }; }; }; };

Modified: openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/AccessibleStateType.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/AccessibleStateType.idl?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/AccessibleStateType.idl (original)
+++ openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/AccessibleStateType.idl Wed Nov 27 17:25:40 2013
@@ -214,6 +214,27 @@ published constants AccessibleStateType
         partly in the visible area of its parent.</p>
     */
     const short VISIBLE = 30;
+    
+    // The following constants have been introduced with the IA2 CWS:
+
+	// MOVEABLE only exists in MSAA/IA2, but not in ATK/JAA/NSAccessibility.
+    /** Indicates the position of the object is not fixed.
+    */
+    const short MOVEABLE = 31;
+
+	// DEFAULT exists in MSAA/IA2, and now also in ATK and NSAccessibility.
+    /** Indicates the object is the default button in a window
+    */
+    const short DEFAULT = 32;
+
+	// OFFSCREEN only exists in MSAA/IA2, but not in ATK/JAA/NSAccessibility.
+    // MT: Shouldn't this be the same like !SHOWING in UAA/ATK?
+    const short OFFSCREEN = 33;
+
+	// COLLAPSED exists in MSAA/IA2, and now also in JAA, but not in ATK/NSAccessibility. In NSAccessibility, there is a notification for collapse.
+    // In opposite to MSAA, UAA has EXPANDABLE, so EXPANDABLE && !EXPANDED should be the same like COLLAPSED.
+    const short COLLAPSE = 34;
+
 };
 
 }; }; }; };

Modified: openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/XAccessibleTable.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/XAccessibleTable.idl?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/XAccessibleTable.idl (original)
+++ openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/XAccessibleTable.idl Wed Nov 27 17:25:40 2013
@@ -19,8 +19,6 @@
  * 
  *************************************************************/
 
-
-
 #ifndef __com_sun_star_accessibility_XAccessibleTable_idl__
 #define __com_sun_star_accessibility_XAccessibleTable_idl__
 

Modified: openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/XAccessibleValue.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/XAccessibleValue.idl?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/XAccessibleValue.idl (original)
+++ openoffice/branches/alg/aw080/main/offapi/com/sun/star/accessibility/XAccessibleValue.idl Wed Nov 27 17:25:40 2013
@@ -19,8 +19,6 @@
  * 
  *************************************************************/
 
-
-
 #ifndef __com_sun_star_accessibility_XAccessibleValue_idl__
 #define __com_sun_star_accessibility_XAccessibleValue_idl__
 



Mime
View raw message