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

[Regina Henschel]

 helpauthoring/filter/xmlhelp2soffice.xsl |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 406a2a01987cd2425b67a0da98ba404c0631cf99
Author: Regina Henschel <rb.henschel at t-online.de>
Date:   Tue Sep 22 17:02:06 2015 +0200

    tdf#94167 Modifying fields turm them into Expression is faulty
    
    The root cause of the error is, that xmlhelp2soffice.xsl has produced a wrong
    nesting of office:text and text:variable-decls. That has caused, that the
    field edit dialog does not know the format of the field and therefore does
    not accept text format. The patch corrects the nesting.
    
    Change-Id: I90a1cfee41a503a4a75e7b71d7e4688ae58847d5
    Reviewed-on: https://gerrit.libreoffice.org/18766
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/helpauthoring/filter/xmlhelp2soffice.xsl b/helpauthoring/filter/xmlhelp2soffice.xsl
index 67a6357..3083b4d 100644
--- a/helpauthoring/filter/xmlhelp2soffice.xsl
+++ b/helpauthoring/filter/xmlhelp2soffice.xsl
@@ -195,11 +195,11 @@ FILTER FOR OPENOFFICE.ORG 2+
             </office:master-styles>
 
             <office:body>
-
+                <office:text>
                 <xsl:call-template name="createvariablesets"/>
                 <xsl:apply-templates select="helpdocument/body" />
 
-
+                </office:text>
             </office:body>
 
         </office:document>
@@ -273,9 +273,7 @@ BODY, SEE HEADER
 ######################################################
 -->
 <xsl:template match="body">
-    <office:text>
         <xsl:apply-templates />
-    </office:text>
 </xsl:template>
 
 <!--