Changeset 6508 for trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_compositionOdtTransf/getContent.xsl.xsl

Timestamp:

09/11/06 15:33:57 (6 years ago)

Author:

anp

Message:

meilleure gestion du style des pictureBlock : prise en compte du renommage des styles par openOffice

File:

• trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_compositionOdtTransf/getContent.xsl.xsl (modified) (4 diffs)

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_compositionOdtTransf/getContent.xsl.xsl

@@ -281 +281 @@
                 <xsl0:variable name="vStyleCode"><xsl0:call-template name="tGetBlockCode"/></xsl0:variable>
                 <xsl0:variable name="vStyle_title" select="resultatAgent('//agentTemplateScData', concat($vCodeTransformer, concat('/', $vStyleCode, '/title/getOdStyleName')))"/>
-                <xsl0:variable name="vStyle_table" select="resultatAgent('//agentTemplateScData', concat($vCodeTransformer, concat('/', $vStyleCode, '/table/getOdStyleName')))"/>
+                <xsl0:variable name="vDefaultStyle_table" select="resultatAgent('//agentTemplateScData', concat($vCodeTransformer, concat('/', $vStyleCode, '/table/getOdStyleName')))"/>
+                <xsl0:variable name="vTableDom" select="computeNodeAgent(concat(resultatAgent('//agentTemplateScData', concat($vCodeTransformer, '/', $vStyleCode, '/blocks.contentFile/table')), '/getContent'))"/>
                 <xsl0:variable name="vStyle_picture" select="resultatAgent('//agentTemplateScData', concat($vCodeTransformer, concat('/', $vStyleCode, '/picture/getOdStyleName')))"/>
                 <xsl0:variable name="vAgentContentFile_picture" select="resultatAgent('//agentTemplateScData', concat($vCodeTransformer, '/', $vStyleCode, '/blocks.contentFile/picture'))"/>
@@ -289 +290 @@
                 <xsl:choose>
                         <xsl:when test="string-length(normalize-space($vTitleContent))&gt;0 or string-length(normalize-space($vDataContent))&gt;0">
-                                <table:table table:name="{$vStyle_table}" table:style-name="{$vStyle_table}">
-                                        <table:table-column table:style-name="{concat($vStyle_table,'.A')}"/>
-                                        <table:table-column table:style-name="{concat($vStyle_table,'.B')}"/>
+                                <table:table table:name="Table" table:style-name="{si($vTableDom, $vTableDom/@table:style-name, concat($vDefaultStyle_table, ''))}">
+                                        <table:table-column table:style-name="{si($vTableDom, $vTableDom/table:table-column[1]/@table:style-name, concat($vDefaultStyle_table, '.A'))}"/>
+                                        <table:table-column table:style-name="{si($vTableDom, $vTableDom/table:table-column[2]/@table:style-name, concat($vDefaultStyle_table, '.B'))}"/>
                                         <xsl:if test="string-length(normalize-space($vTitleContent))&gt;0 or $vIsTitleMandatory='true'"><!-- si il y a un titre... -->
                                                 <table:table-row>
-                                                        <table:table-cell table:style-name="{concat($vStyle_table,'.A1')}" table:number-columns-spanned="2"><!-- office:value-type="string" -->
+                                                        <table:table-cell table:style-name="{si($vTableDom, $vTableDom/table:table-row[1]/table:table-cell[1]/@table:style-name, concat($vDefaultStyle_table, '.A1'))}" table:number-columns-spanned="2"><!-- office:value-type="string" -->
                                                                 <text:p text:style-name="{$vStyle_title}">
                                                                         <xsl:value-of select="$vTitleContent"/>
@@ -303 +304 @@
                                         </xsl:if>
                                         <table:table-row>
-                                                <table:table-cell table:style-name="{concat($vStyle_table,'.A1')}"><!-- office:value-type="string" -->
+                                                <table:table-cell table:style-name="{si($vTableDom, $vTableDom/table:table-row[2]/table:table-cell[1]/@table:style-name, concat($vDefaultStyle_table, '.A2'))}"><!-- office:value-type="string" -->
                                                         <text:p>
                                                                 <xsl0:if test="sm:picture/@sc:refUri">
@@ -332 +333 @@
                                                         </text:p>
                                                 </table:table-cell>
-                                                <table:table-cell table:style-name="{concat($vStyle_table,'.B2')}"><!-- office:value-type="string" -->
+                                                <table:table-cell table:style-name="{si($vTableDom, $vTableDom/table:table-row[2]/table:table-cell[2]/@table:style-name, concat($vDefaultStyle_table, '.B1'))}"><!-- office:value-type="string" -->
                                                         <xsl:value-of disable-output-escaping="yes" select="$vDataContent"/>
                                                 </table:table-cell>