Author: mseidel
Date: Thu Jun 13 22:13:00 2019
New Revision: 1861306
URL: http://svn.apache.org/viewvc?rev=1861306&view=rev
Log:
Merged r1861305 from trunk
Changed branding OpenOffice.org -> Apache OpenOffice, fixed typos
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 13 22:13:00 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,1859839,186
0288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,1859839,186
0288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305
Modified:
openoffice/branches/AOO42X/main/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl?rev=1861306&r1=1861305&r2=1861306&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl
(original)
+++
openoffice/branches/AOO42X/main/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl
Thu Jun 13 22:13:00 2019
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,21 +8,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
<!--
- For further documentation and updates visit
http://xml.openoffice.org/odf2xhtml
+ For further documentation and updates visit
https://xml.openoffice.org/odf2xhtml
-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
@@ -103,7 +103,7 @@
<!-- OPTIONAL: (MANDATORY: for session management by URL rewriting)
Useful for WebApplications: if a HTTP session is not cookie
based, URL rewriting is being used (the session is appended to the URL).
- This URL session is used for example when links to graphics
are created by XSLT. Otherwise the user havt to log again in for every graphic
he liks to see. -->
+ This URL session is used for example when links to graphics
are created by XSLT. Otherwise the user has to log in again for every graphic
he likes to see. -->
<xsl:param name="optionalURLSuffix" />
<!-- OPTIONAL: URL to office meta file (flat xml use the URL to the
input file) -->
@@ -113,12 +113,12 @@
<xsl:param name="stylesFileURL" />
<!-- OPTIONAL: DPI (dots per inch) the standard resolution of given
pictures (necessary for the conversion of 'cm' into 'pixel')-->
- <!-- Although many pictures have a 96 dpi resolution, a higher
resoltion give better results for common browsers -->
+ <!-- Although many pictures have a 96 dpi resolution, a higher
resolution gives better results for common browsers -->
<!-- Cp. measure_conversion.xsl:
<xsl:param name="dpi" select="111" /> -->
- <!-- OPTIONAL: in case of using a different processor than a JAVA XSLT,
you can unable the Java functionality
+ <!-- OPTIONAL: in case of using a different processor than a JAVA XSLT,
you can enable the Java functionality
(e.g. encoding chapter names for the content-table as href and
anchors ) -->
<xsl:param name="java" select="true()" />
<xsl:param name="javaEnabled" select="boolean($java)" />
@@ -150,7 +150,7 @@
<xsl:param name="globalData" />
<xsl:element name="html">
- <xsl:comment>This file was converted to xhtml by
OpenOffice.org - see http://xml.openoffice.org/odf2xhtml for more
info.</xsl:comment>
+ <xsl:comment>This file was converted to xhtml by Apache
OpenOffice - see https://xml.openoffice.org/odf2xhtml for more
info.</xsl:comment>
<xsl:call-template name='create-header'>
<xsl:with-param name="globalData"
select="$globalData" />
</xsl:call-template>
