Commit 60abec3d authored by Jérome Perrin's avatar Jérome Perrin

Numerous small fixes.

The notable change is that this style uses field.get_value('css_style') for OOo text style. Base_getODTStyleSheet now defines 'figure' style for this.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17209 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 115868e4
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
<string>Products.ERP5OOo.OOoTemplate</string> <tuple/>
<string>OOoTemplate</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -138,9 +135,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> ...@@ -138,9 +135,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n
xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n
xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n
tal:attributes=\'dummy\n tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n
python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n
tal:define="global frame_width python:25.8"\n
office:version=\'1.0\'>\n office:version=\'1.0\'>\n
<office:scripts/>\n <office:scripts/>\n
<office:font-face-decls>\n <office:font-face-decls>\n
...@@ -187,7 +182,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> ...@@ -187,7 +182,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
<style:table-column-properties style:rel-column-width=\'21842*\' style:column-width=\'9.783cm\'/>\n <style:table-column-properties style:rel-column-width=\'21842*\' style:column-width=\'9.783cm\'/>\n
</style:style>\n </style:style>\n
<style:style style:family=\'table-cell\' style:name=\'listbox-table.A1\'>\n <style:style style:family=\'table-cell\' style:name=\'listbox-table.A1\'>\n
<style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'none\' fo:border-top=\'0.002cm solid #000000\' fo:background-color=\'#b3b3b3\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'0.002cm solid #000000\' fo:border-top=\'0.002cm solid #000000\' fo:background-color=\'#e6e6e6\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n
<style:background-image/>\n <style:background-image/>\n
</style:table-cell-properties>\n </style:table-cell-properties>\n
</style:style>\n </style:style>\n
......
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
<string>Products.ERP5OOo.OOoTemplate</string> <tuple/>
<string>OOoTemplate</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -158,7 +155,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> ...@@ -158,7 +155,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
<style:table-column-properties style:rel-column-width=\'32768*\' style:column-width=\'14.676cm\'/>\n <style:table-column-properties style:rel-column-width=\'32768*\' style:column-width=\'14.676cm\'/>\n
</style:style>\n </style:style>\n
<style:style style:family=\'table-cell\' style:name=\'field-table.A1\'>\n <style:style style:family=\'table-cell\' style:name=\'field-table.A1\'>\n
<style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'none\' fo:border-top=\'0.002cm solid #000000\' fo:background-color=\'#e6e6e6\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'0.002cm solid #000000\' fo:border-top=\'0.002cm solid #000000\' fo:background-color=\'#e6e6e6\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n
<style:background-image/>\n <style:background-image/>\n
</style:table-cell-properties>\n </style:table-cell-properties>\n
</style:style>\n </style:style>\n
...@@ -186,7 +183,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> ...@@ -186,7 +183,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
<style:table-column-properties style:rel-column-width=\'21842*\' style:column-width=\'9.783cm\'/>\n <style:table-column-properties style:rel-column-width=\'21842*\' style:column-width=\'9.783cm\'/>\n
</style:style>\n </style:style>\n
<style:style style:family=\'table-cell\' style:name=\'listbox-table.A1\'>\n <style:style style:family=\'table-cell\' style:name=\'listbox-table.A1\'>\n
<style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'none\' fo:border-top=\'0.002cm solid #000000\' fo:background-color=\'#b3b3b3\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'0.002cm solid #000000\' fo:border-top=\'0.002cm solid #000000\' fo:background-color=\'#e6e6e6\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n
<style:background-image/>\n <style:background-image/>\n
</style:table-cell-properties>\n </style:table-cell-properties>\n
</style:style>\n </style:style>\n
......
10 11
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment