From debe141034ee32f138b5097e72842a1565254f49 Mon Sep 17 00:00:00 2001
From: Serge Noiraud <Serge.Noiraud@free.fr>
Date: Fri, 18 Dec 2009 22:49:17 +0000
Subject: [PATCH] ODFdoc : issue 3439 and 3440 (ODF validator).

svn: r13849
---
 src/plugins/docgen/ODFDoc.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/plugins/docgen/ODFDoc.py b/src/plugins/docgen/ODFDoc.py
index 9ee6de1de..fb153eef8 100644
--- a/src/plugins/docgen/ODFDoc.py
+++ b/src/plugins/docgen/ODFDoc.py
@@ -134,7 +134,7 @@ class ODFDoc(BaseDoc.BaseDoc, BaseDoc.TextDoc, BaseDoc.DrawDoc):
         self.cntnt.write('xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" ')
         self.cntnt.write('xmlns:dom="http://www.w3.org/2001/xml-events" ')
         self.cntnt.write('xmlns:xforms="http://www.w3.org/2002/xforms" ')
-        self.cntnt.write('office:class="text" office:version="1.0">\n')
+        self.cntnt.write('office:version="1.0">\n')
         self.cntnt.write('<office:scripts/>\n')
         self.cntnt.write('<office:font-face-decls>\n')
         self.cntnt.write('<style:font-face style:name="Courier" svg:font-family="Courier" ')
@@ -961,8 +961,6 @@ class ODFDoc(BaseDoc.BaseDoc, BaseDoc.TextDoc, BaseDoc.DrawDoc):
         self.meta.write('<dc:date>')
         self.meta.write(self.time)
         self.meta.write('</dc:date>\n')
-        self.meta.write('<dc:keyword>')
-        self.meta.write('</dc:keyword>\n')
         self.meta.write('<meta:print-date>0-00-00T00:00:00</meta:print-date>\n')
         self.meta.write('<dc:language>%s</dc:language>\n' % self.lang)
         self.meta.write('<meta:editing-cycles>1</meta:editing-cycles>\n')
@@ -1072,10 +1070,8 @@ class ODFDoc(BaseDoc.BaseDoc, BaseDoc.TextDoc, BaseDoc.DrawDoc):
         self.cntnt.write('svg:y="%.2fcm">' % float(y))
         self.cntnt.write('<draw:text-box> ' )
         self.cntnt.write('<text:p text:style-name="F%s">' % para_name)
-        self.cntnt.write('<text:span text:style-name="F%s"' % para_name)
-        self.cntnt.write(' fo:max-height="%.2f">' % font.get_size() )
         self.cntnt.write(escape(text, _esc_map))
-        self.cntnt.write('</text:span></text:p>')
+        self.cntnt.write('</text:p>')
         self.cntnt.write('</draw:text-box>\n')
         self.cntnt.write('</draw:frame>\n')