[Libreoffice-commits] dev-tools.git: helpauthoring/filter

Jan Holesovsky kendy at collabora.com
Thu Nov 12 00:50:35 PST 2015


 helpauthoring/filter/soffice2xmlhelp.xsl |    2 --
 helpauthoring/filter/xmlhelp.dtd         |    7 +------
 helpauthoring/filter/xmlhelp2soffice.xsl |   11 -----------
 3 files changed, 1 insertion(+), 19 deletions(-)

New commits:
commit 4f65bb81fdc580ff303877d4c75ba767f790dc32
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Nov 12 09:46:14 2015 +0100

    Killed the 'lastedited' element, we have git.
    
    Change-Id: I32b24785759c84f963a7d078cdb1f9c2ba4c87e2

diff --git a/helpauthoring/filter/soffice2xmlhelp.xsl b/helpauthoring/filter/soffice2xmlhelp.xsl
index 3b533c6..058348b 100644
--- a/helpauthoring/filter/soffice2xmlhelp.xsl
+++ b/helpauthoring/filter/soffice2xmlhelp.xsl
@@ -81,8 +81,6 @@ META DATA
 <!-- REMOVED DUE TO PROBLEMS WITH CVS MERGE CONFLICTS
 <xsl:variable name="history_created" select="/office:document/office:meta/meta:user-defined[@meta:name='Created']"/>
 <xsl:variable name="history_created_date" select="/office:document/office:meta/meta:creation-date"/>
-<xsl:variable name="history_lastedited" select="/office:document/office:meta/meta:user-defined[@meta:name='Lastedited']"/>
-<xsl:variable name="history_lastedited_date" select="/office:document/office:meta/dc:date"/>
 //-->
 
 <!--
diff --git a/helpauthoring/filter/xmlhelp.dtd b/helpauthoring/filter/xmlhelp.dtd
index d4f123d..50ffe8e 100644
--- a/helpauthoring/filter/xmlhelp.dtd
+++ b/helpauthoring/filter/xmlhelp.dtd
@@ -97,7 +97,7 @@ Version 03-Feb-2006
   version CDATA #REQUIRED
 >
 
-<!ELEMENT history (created, lastedited)>
+<!ELEMENT history (created)>
 
 <!ELEMENT image (caption* | alt+)?>
 <!ATTLIST image
@@ -113,11 +113,6 @@ Version 03-Feb-2006
   type CDATA #REQUIRED
 >
 
-<!ELEMENT lastedited (#PCDATA)>
-<!ATTLIST lastedited
-  date CDATA #REQUIRED
->
-
 <!ELEMENT link (#PCDATA | embedvar | emph | item | variable | switchinline)*>
 <!ATTLIST link
   href CDATA #REQUIRED
diff --git a/helpauthoring/filter/xmlhelp2soffice.xsl b/helpauthoring/filter/xmlhelp2soffice.xsl
index fdb3f43..f835193 100644
--- a/helpauthoring/filter/xmlhelp2soffice.xsl
+++ b/helpauthoring/filter/xmlhelp2soffice.xsl
@@ -120,9 +120,6 @@ FILTER FOR OPENOFFICE.ORG 2+
                 </meta:creation-date>
                 <meta:creator>XHP Import Filter</meta:creator>
                 <dc:date>
-                <!-- REMOVED DUE TO PROBLEMS WITH CVS MERGE CONFLICTS
-                    <xsl:value-of select="/helpdocument/meta/history/lastedited/@date"/>
-                //-->
                 </dc:date>
 
                 <dc:language>
@@ -766,14 +763,6 @@ ITEM
 
 <!--
 ######################################################
-LASTEDITED,  SEE HEADER
-  + date CDATA #REQUIRED
-######################################################
--->
-    <xsl:template match="lastedited" />
-
-<!--
-######################################################
 LINK
   + href CDATA #REQUIRED
   + name CDATA #REQUIRED


More information about the Libreoffice-commits mailing list