[Erp5-report] r42451 kazuhiko - in /erp5/trunk/utils/cloudooo/cloudooo/handler/ooo: ./ tests/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Jan 19 12:54:57 2011
New Revision: 42451

URL: http://svn.erp5.org?rev=42451&view=rev
Log:
ignore filters that are marked as NotInFileDialog or NotInChooser flags.

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/mimemapper.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMimemapper.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/mimemapper.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/mimemapper.py?rev=42451&r1=42450&r2=42451&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/mimemapper.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/mimemapper.py [utf8] Wed Jan 19 12:54:57 2011
@@ -124,7 +124,7 @@ class MimeMapper(object):
       # UsesOptions (deprecated):0x80, Default:0x100,
       # NotInFileDialog:0x1000, NotInChooser:0x2000,
       # ThirdParty:0x80000, Preferred:0x10000000
-      if not flag & 2:
+      if not flag & 0x02 or flag & 0x1000 or flag & 0x2000:
         continue
       ui_name = value.get('UIName')
       filter_type = value.get('Type')

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMimemapper.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMimemapper.py?rev=42451&r1=42450&r2=42451&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMimemapper.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testMimemapper.py [utf8] Wed Jan 19 12:54:57 2011
@@ -53,7 +53,6 @@ text_expected_tuple = (
     )
 
 global_expected_tuple = (
-    ('html', 'HTML (Writer/Global)'),
     ('odm', 'ODF Master Document'),
     ('odt', 'ODF Text Document'),
     ('pdf', 'PDF - Portable Document Format'),
@@ -171,9 +170,7 @@ math_expected_tuple = (
     )
 
 chart_expected_tuple = (
-    ('odc', 'ODF Chart'),
     # ('odc', 'OpenOffice.org 1.0 Report Chart'),
-    ('sxs', 'OpenOffice.org 1.0 Chart'),
     )
 
 OPENOFFICE = True
@@ -229,7 +226,10 @@ class TestMimeMapper(CloudoooTestCase):
     type = document_type_dict.get("text")
     self.assertEquals(type, 'com.sun.star.text.TextDocument')
     type = document_type_dict.get("chart")
-    self.assertEquals(type, 'com.sun.star.chart2.ChartDocument')
+    # For now, chart document filters are maked as NotInFileDialog and
+    # NotInChooser.
+    # self.assertEquals(type, 'com.sun.star.chart2.ChartDocument')
+    self.assertEquals(type, None)
     type = document_type_dict.get("drawing")
     self.assertEquals(type, 'com.sun.star.drawing.DrawingDocument')
     type = document_type_dict.get("presentation")