Changeset 1671

Timestamp:

03/01/10 11:36:53 (5 months ago)

Author:

anp

Message:

genOd : review des ressources

Location:

trunk/model/sources

Files:

• academic/gen/_od/transf/binaries/gif@logoPdg.transf (modified) (1 diff)
• academic/gen/_od/transf/binaries/gif@txtRes.transf (modified) (1 diff)
• academic/gen/_od/transf/binaries/jpeg@logoPdg.transf (modified) (1 diff)
• academic/gen/_od/transf/binaries/jpeg@txtRes.transf (modified) (1 diff)
• academic/gen/_od/transf/binaries/png@label.transf (modified) (1 diff)
• academic/gen/_od/transf/binaries/png@logoPdg.transf (modified) (1 diff)
• academic/gen/_od/transf/binaries/png@txtRes.transf (modified) (1 diff)
• academic/gen/quadra/paper/paper.skin.odt (modified) (previous)
• binaries/avi/avi_od.transf (modified) (1 diff)
• binaries/doc/doc_od.transf (modified) (1 diff)
• binaries/flash/flash_od.transf (modified) (1 diff)
• binaries/flv/flv_od.transf (modified) (1 diff)
• binaries/gif/gif_od.transf (modified) (1 diff)
• binaries/gif/gif_od@inline.transf (modified) (1 diff)
• binaries/jpg/jpeg_od.transf (modified) (1 diff)
• binaries/jpg/jpeg_od@inline.transf (modified) (1 diff)
• binaries/mov/mov_od.transf (modified) (1 diff)
• binaries/mp3/mp3_od.transf (modified) (1 diff)
• binaries/mp4/mp4_od.transf (modified) (1 diff)
• binaries/mpg/mpg_od.transf (modified) (1 diff)
• binaries/odg/odg_od.transf (modified) (1 diff)
• binaries/odp/odp_od.transf (modified) (1 diff)
• binaries/ods/ods_od.transf (modified) (1 diff)
• binaries/odt/odt_od.transf (modified) (1 diff)
• binaries/pdf/pdf_od.transf (modified) (1 diff)
• binaries/png/png_od.transf (modified) (1 diff)
• binaries/png/png_od@inline.transf (modified) (1 diff)
• binaries/ppt/ppt_od.transf (modified) (1 diff)
• binaries/rm/rm_od.transf (modified) (1 diff)
• binaries/wmv/wmv_od.transf (modified) (1 diff)
• binaries/xls/xls_od.transf (modified) (1 diff)
• binaries/zip/zip_od.transf (modified) (1 diff)
• math/latex/mathTexInlineProxy_od.odwidget (modified) (1 diff)
• math/latex/native/_res/od/odWidget.doss/getContentInline.xsl (modified) (1 diff)
• math/latex/native/getPng.odwidget (modified) (1 diff)
• math/latex/native/mathTexInline_od.odwidget (modified) (1 diff)

trunk/model/sources/academic/gen/_od/transf/binaries/gif@logoPdg.transf

@@ -4 +4 @@
         <sm:axis code="logoPdg"/>
         <sm:content>
-                <sm:WImage style="viewPicture">
+                <sm:WImage globalStyle="viewPicture">
                         <sm:binaryUrl>
                                 <sm:imageTransform>

trunk/model/sources/academic/gen/_od/transf/binaries/gif@txtRes.transf

@@ -4 +4 @@
         <sm:axis code="txtRes"/>
         <sm:content>
-                <sm:WImage style="viewPicture">
+                <sm:WImage globalStyle="viewPicture">
                         <sm:binaryUrl>
                                 <sm:imageTransform>

trunk/model/sources/academic/gen/_od/transf/binaries/jpeg@logoPdg.transf

@@ -4 +4 @@
         <sm:axis code="logoPdg"/>
         <sm:content>
-                <sm:WImage style="viewPicture">
+                <sm:WImage globalStyle="viewPicture">
                         <sm:binaryUrl>
                                 <sm:imageTransform>

trunk/model/sources/academic/gen/_od/transf/binaries/jpeg@txtRes.transf

@@ -4 +4 @@
         <sm:axis code="txtRes"/>
         <sm:content>
-                <sm:WImage style="viewPicture">
+                <sm:WImage globalStyle="viewPicture">
                         <sm:binaryUrl>
                                 <sm:imageTransform>

trunk/model/sources/academic/gen/_od/transf/binaries/png@label.transf

@@ -4 +4 @@
         <sm:axis code="label"/>
         <sm:content>
-                <sm:WImage style="viewPicture">
+                <sm:WImage globalStyle="viewPicture">
                         <sm:binaryUrl>
                                 <sm:imageTransform>

trunk/model/sources/academic/gen/_od/transf/binaries/png@logoPdg.transf

@@ -4 +4 @@
         <sm:axis code="logoPdg"/>
         <sm:content>
-                <sm:WImage style="viewPicture">
+                <sm:WImage globalStyle="viewPicture">
                         <sm:binaryUrl>
                                 <sm:imageTransform>

trunk/model/sources/academic/gen/_od/transf/binaries/png@txtRes.transf

@@ -4 +4 @@
         <sm:axis code="txtRes"/>
         <sm:content>
-                <sm:WImage style="viewPicture">
+                <sm:WImage globalStyle="viewPicture">
                         <sm:binaryUrl>
                                 <sm:imageTransform>

trunk/model/sources/binaries/avi/avi_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/avi/avi.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>

trunk/model/sources/binaries/doc/doc_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/doc/doc.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>

trunk/model/sources/binaries/flash/flash_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/flash/flash.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>

trunk/model/sources/binaries/flv/flv_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/flv/flv.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>
-                <sm:WParagraph style="linkRef">
-                        <sm:binaryFileName/>
-                </sm:WParagraph>
+                <sm:Widget sc:refUri="/academic/gen/_od/widgets/flvOpen.odwidget">
+                        <sm:odContentZone key="zData">
+                                <sm:binaryFileName/>
+                        </sm:odContentZone>
+                </sm:Widget>
         </sm:content>
 </sm:binaryOdTransf>

trunk/model/sources/binaries/gif/gif_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/gif/gif.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>
-                <sm:WImage style="viewPicture">
+                <sm:WImage globalStyle="viewPicture">
                         <sm:binaryUrl>
                                 <sm:imageTransform>

trunk/model/sources/binaries/gif/gif_od@inline.transf

@@ -4 +4 @@
         <sm:axis code="inline"/>
         <sm:content>
-                <sm:WImage style="viewPicture">
+                <sm:WImage globalStyle="viewPictureInline">
                         <sm:binaryUrl>
                                 <sm:imageTransform>

trunk/model/sources/binaries/jpg/jpeg_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/jpg/jpeg.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>
-                <sm:WImage style="viewPicture">
+                <sm:WImage globalStyle="viewPicture">
                         <sm:binaryUrl>
                                 <sm:imageTransform>

trunk/model/sources/binaries/jpg/jpeg_od@inline.transf

@@ -4 +4 @@
         <sm:axis code="inline"/>
         <sm:content>
-                <sm:WImage style="viewPicture">
+                <sm:WImage globalStyle="viewPictureInline">
                         <sm:binaryUrl>
                                 <sm:imageTransform>

trunk/model/sources/binaries/mov/mov_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/mov/mov.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>

trunk/model/sources/binaries/mp3/mp3_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/mp3/mp3.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>

trunk/model/sources/binaries/mp4/mp4_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/mp4/mp4.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>

trunk/model/sources/binaries/mpg/mpg_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/mpg/mpg.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>

trunk/model/sources/binaries/odg/odg_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/odg/odg.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>

trunk/model/sources/binaries/odp/odp_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/odp/odp.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>

trunk/model/sources/binaries/ods/ods_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/ods/ods.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>

trunk/model/sources/binaries/odt/odt_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/odt/odt.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>

trunk/model/sources/binaries/pdf/pdf_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/pdf/pdf.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>

trunk/model/sources/binaries/png/png_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/png/png.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>
-                <sm:WImage style="viewPicture">
+                <sm:WImage globalStyle="viewPicture">
                         <sm:binaryUrl>
                                 <sm:imageTransform>

trunk/model/sources/binaries/png/png_od@inline.transf

@@ -4 +4 @@
         <sm:axis code="inline"/>
         <sm:content>
-                <sm:WImage style="viewPicture">
+                <sm:WImage globalStyle="viewPictureInline">
                         <sm:binaryUrl>
                                 <sm:imageTransform>

trunk/model/sources/binaries/ppt/ppt_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/ppt/ppt.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>

trunk/model/sources/binaries/rm/rm_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/rm/rm.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>

trunk/model/sources/binaries/wmv/wmv_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/wmv/wmv.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>

trunk/model/sources/binaries/xls/xls_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/xls/xls.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>

trunk/model/sources/binaries/zip/zip_od.transf

@@ -3 +3 @@
         <sm:model sc:refUri="/binaries/zip/zip.model"/>
         <sm:fullTitleText>
-                <sm:dynamicString>
-                        <!--TODO : utiliser les éléments standards en 3.7-->
-                        <sm:freeSelect xpath="returnFirst(resultatAgent('//metaAgt', 'fullTitleText'), substring-before(java:hGetName(srcFileAgent()), '.'))"/>
-                </sm:dynamicString>
+                <sm:returnFirst>
+                        <sm:callBinaryMeta/>
+                        <sm:binaryFileName format="trimExtension"/>
+                </sm:returnFirst>
         </sm:fullTitleText>
         <sm:content>

trunk/model/sources/math/latex/mathTexInlineProxy_od.odwidget

@@ -16 +16 @@
                         <sm:Widget sc:refUri="/math/latex/native/mathTexInline_od.odwidget"/>
                 </sm:subWidget></sm:widgetBsFragment>
-        <sm:declareStyle>
-                <sm:WObject globalStyle="resLatexInline"/>
-        </sm:declareStyle>
 </sm:freeOdWidget>

trunk/model/sources/math/latex/native/_res/od/odWidget.doss/getContentInline.xsl

@@ -69 +69 @@
                     svg:height="{normalize-space($vHeight)}cm"
                     svg:width="{normalize-space($vWidth)}cm" svg:y="-{normalize-space(resultatAgent('viewResource/Dep'))}cm" svg:x="0" draw:z-index="1"
-                    text:anchor-type="as-char" draw:name="{local-name()}" draw:style-name="resLatexInline">
+                    text:anchor-type="as-char" draw:name="{local-name()}" draw:style-name="viewPictureInline">
                     <xsl:element name="draw:image">
                         <xsl:attribute name="xlink:href">

trunk/model/sources/math/latex/native/getPng.odwidget

@@ -48 +48 @@
     <style:graphic-properties style:vertical-pos="middle" style:vertical-rel="text"  style:horizontal-pos="center" style:horizontal-rel="page" style:mirror="none"/>
 &lt;/style:style&gt;</sm:contentFile.automaticStyles>-->
-        <!--champ ci dessus en erreur depuis SC 3.7-->
-        <sm:declareStyle>
-                <sm:WObject globalStyle="resLatexInline"/>
-        </sm:declareStyle>
 </sm:freeOdWidget>

trunk/model/sources/math/latex/native/mathTexInline_od.odwidget

@@ -56 +56 @@
     <style:graphic-properties style:vertical-pos="middle" style:vertical-rel="text"  style:horizontal-pos="center" style:horizontal-rel="page" style:mirror="none"/>
 &lt;/style:style&gt;</sm:contentFile.automaticStyles>-->
-        <!--champ ci dessus en erreur depuis SC 3.7-->
-        <sm:declareStyle>
-                <sm:WObject globalStyle="resLatexInline"/>
-        </sm:declareStyle>
 </sm:freeOdWidget>