[Libreoffice-commits] core.git: 2 commits - officecfg/registry sw/qa writerfilter/source

Michael Stahl mstahl at redhat.com
Tue Feb 5 12:08:35 PST 2013


 officecfg/registry/data/org/openoffice/Office/UI.xcu            |  140 ----------
 officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu |   14 -
 sw/qa/extras/rtfimport/data/fdo58646line.rtf                    |    1 
 sw/qa/extras/rtfimport/rtfimport.cxx                            |    8 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx                  |    8 
 5 files changed, 29 insertions(+), 142 deletions(-)

New commits:
commit c4696e7c0456df8d9466acbae3ea1fa9dcfa73f0
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Feb 5 20:46:19 2013 +0100

    RTF import: fix import of \line symbol
    
    "Required line break" was eaten by the newly added code in text() to
    ignore \'0a.  (regression from f593a2e4179b05ae1019372cde612cb242d1d27f)
    
    Change-Id: Id32687c40a17ddb99196635cedfc850182705799

diff --git a/sw/qa/extras/rtfimport/data/fdo58646line.rtf b/sw/qa/extras/rtfimport/data/fdo58646line.rtf
new file mode 100644
index 0000000..63cf71d
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo58646line.rtf
@@ -0,0 +1 @@
+{\rtf1 foo\line bar}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index bf19018..a3a2f12 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -138,6 +138,7 @@ public:
     void testFdo58933();
     void testFdo44053();
     void testFdo48440();
+    void testFdo58646line();
     void testFdo58646();
     void testFdo59419();
     void testFdo58076_2();
@@ -250,6 +251,7 @@ void Test::run()
         {"fdo58933.rtf", &Test::testFdo58933},
         {"fdo44053.rtf", &Test::testFdo44053},
         {"fdo48440.rtf", &Test::testFdo48440},
+        {"fdo58646line.rtf", &Test::testFdo58646line},
         {"fdo58646.rtf", &Test::testFdo58646},
         {"fdo59419.rtf", &Test::testFdo59419},
         {"fdo58076-2.rtf", &Test::testFdo58076_2},
@@ -1076,6 +1078,12 @@ void Test::testFdo48440()
     CPPUNIT_ASSERT_EQUAL(2, getPages());
 }
 
+void Test::testFdo58646line()
+{
+    // \line symbol was ignored
+    getParagraph(1, "foo\nbar");
+}
+
 void Test::testFdo58646()
 {
     // Page break was ignored inside a continous section, on title page.
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 607d955..325ff4f 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1605,12 +1605,16 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
         checkUnicode();
     setNeedSect();
     RTFSkipDestination aSkip(*this);
-    sal_uInt8 cCh = 0;
 
+    if (RTF_LINE == nKeyword)
+    {   // very special handling since text() will eat lone '\n'
+        singleChar('\n');
+        return 0;
+    }
     // Trivial symbols
+    sal_uInt8 cCh = 0;
     switch (nKeyword)
     {
-        case RTF_LINE: cCh = '\n'; break;
         case RTF_TAB: cCh = '\t'; break;
         case RTF_BACKSLASH: cCh = '\\'; break;
         case RTF_LBRACE: cCh = '{'; break;
commit cf8f6fe1f9d65eedbc6f4d65ce0fa88831830966
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Feb 5 15:49:26 2013 +0100

    officecfg: remove references to binfilter formats
    
    Change-Id: Ia19087cdd27c54f8aa57253fbfeb19a13a7490b0

diff --git a/officecfg/registry/data/org/openoffice/Office/UI.xcu b/officecfg/registry/data/org/openoffice/Office/UI.xcu
index 22dace9..6d924b8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI.xcu
@@ -27,7 +27,7 @@
                         <value xml:lang="en-US">Text documents</value>
                     </prop>
                     <prop oor:name="Filters">
-                                                <value oor:separator=";">AportisDoc Palm DB;HTML (StarWriter);LotusWordPro;MS Word 2003 XML;MS Word 2007 XML;MS Word 2007 XML Template;MS Word 97;MS Word 97 Vorlage;MS_Works;Office Open XML Text;Office Open XML Text Template;OpenDocument Text Flat XML;PocketWord File;Rich Text Format;StarOffice XML (Writer);StarWriter 1.0;StarWriter 2.0;StarWriter 3.0;StarWriter 3.0 Vorlage/Template;StarWriter 4.0;StarWriter 4.0 Vorlage/Template;StarWriter 4.0/GlobalDocument;StarWriter 5.0;StarWriter 5.0 Vorlage/Template;StarWriter 5.0/GlobalDocument;StarWriter DOS;StarWriter/Web 4.0 Vorlage/Template;StarWriter/Web 5.0 Vorlage/Template;Text;WordPerfect;WordPerfect;writer_MIZI_Hwp_97;writer_StarOffice_XML_Writer_Template;writer8;writer8_template;writerglobal8;writerweb8_writer_template</value>
+                                                <value oor:separator=";">AportisDoc Palm DB;HTML (StarWriter);LotusWordPro;MS Word 2003 XML;MS Word 2007 XML;MS Word 2007 XML Template;MS Word 97;MS Word 97 Vorlage;MS_Works;Office Open XML Text;Office Open XML Text Template;OpenDocument Text Flat XML;PocketWord File;Rich Text Format;StarOffice XML (Writer);Text;WordPerfect;WordPerfect;writer_MIZI_Hwp_97;writer_StarOffice_XML_Writer_Template;writer8;writer8_template;writerglobal8;writerweb8_writer_template</value>
                     </prop>
                 </node>
                 <node oor:name="com.sun.star.sheet.SpreadsheetDocument" oor:op="replace">
@@ -36,7 +36,7 @@
                         <value xml:lang="en-US">Spreadsheets</value>
                     </prop>
                     <prop oor:name="Filters">
-                                                <value oor:separator=";">Calc MS Excel 2007 Binary;Calc MS Excel 2007 XML;Calc MS Excel 2007 XML Template;calc_StarOffice_XML_Calc_Template;calc8;calc8_template;chart8;DIF;Lotus;MiniCalc (Palm);MS Excel 2003 XML;MS Excel 97;MS Excel 97 Vorlage/Template;OpenDocument Spreadsheet Flat XML;Pocket Excel;Quattro Pro 6.0;StarCalc 1.0;StarCalc 3.0;StarCalc 3.0 Vorlage/Template;StarCalc 4.0;StarCalc 4.0 Vorlage/Template;StarCalc 5.0;StarCalc 5.0 Vorlage/Template;StarChart 3.0;StarChart 4.0;StarChart 5.0;StarOffice XML (Calc);StarOffice XML (Chart);Text - txt - csv (StarCalc)</value>
+                                                <value oor:separator=";">Calc MS Excel 2007 Binary;Calc MS Excel 2007 XML;Calc MS Excel 2007 XML Template;calc_StarOffice_XML_Calc_Template;calc8;calc8_template;chart8;DIF;Lotus;MiniCalc (Palm);MS Excel 2003 XML;MS Excel 97;MS Excel 97 Vorlage/Template;OpenDocument Spreadsheet Flat XML;Pocket Excel;Quattro Pro 6.0;StarOffice XML (Calc);StarOffice XML (Chart);Text - txt - csv (StarCalc)</value>
                     </prop>
                 </node>
                 <node oor:name="com.sun.star.presentation.PresentationDocument" oor:op="replace">
@@ -45,7 +45,7 @@
                         <value xml:lang="en-US">Presentations</value>
                     </prop>
                     <prop oor:name="Filters">
-                                                <value oor:separator=";">Impress MS PowerPoint 2007 XML;Impress MS PowerPoint 2007 XML AutoPlay;Impress MS PowerPoint 2007 XML Template;impress_StarOffice_XML_Draw;impress_StarOffice_XML_Impress_Template;impress8;impress8_template;MS PowerPoint 97;MS PowerPoint 97 AutoPlay;MS PowerPoint 97 Vorlage;OpenDocument Presentation Flat XML;StarImpress 4.0;StarImpress 4.0 Vorlage;StarImpress 5.0;StarImpress 5.0 (packed);StarImpress 5.0 Vorlage</value>
+                                                <value oor:separator=";">Impress MS PowerPoint 2007 XML;Impress MS PowerPoint 2007 XML AutoPlay;Impress MS PowerPoint 2007 XML Template;impress_StarOffice_XML_Draw;impress_StarOffice_XML_Impress_Template;impress8;impress8_template;MS PowerPoint 97;MS PowerPoint 97 AutoPlay;MS PowerPoint 97 Vorlage;OpenDocument Presentation Flat XML</value>
                     </prop>
                 </node>
                 <node oor:name="com.sun.star.drawing.DrawingDocument" oor:op="replace">
@@ -54,7 +54,7 @@
                         <value xml:lang="en-US">Drawings</value>
                     </prop>
                     <prop oor:name="Filters">
-                                                <value oor:separator=";">draw_StarOffice_XML_Draw_Template;SGV - StarDraw 2.0;StarDraw 3.0;StarDraw 3.0 Vorlage;StarDraw 5.0;StarDraw 5.0 Vorlage;StarOffice XML (Draw);draw8;draw8_template;Visio Document;SVG - Scalable Vector Graphics;Corel Draw Document;Publisher Document</value>
+                                                <value oor:separator=";">draw_StarOffice_XML_Draw_Template;StarOffice XML (Draw);draw8;draw8_template;Visio Document;SVG - Scalable Vector Graphics;Corel Draw Document;Publisher Document</value>
                     </prop>
                 </node>
                 <node oor:name="com.sun.star.text.WebDocument" oor:op="replace">
@@ -63,7 +63,7 @@
                         <value xml:lang="en-US">Web pages</value>
                     </prop>
                     <prop oor:name="Filters">
-                                                <value oor:separator=";">HTML;StarWriter/Web 4.0 Vorlage/Template;StarWriter/Web 5.0 Vorlage/Template;writer_web_StarOffice_XML_Writer_Web_Template;writerweb8_writer_template</value>
+                                                <value oor:separator=";">HTML;writer_web_StarOffice_XML_Writer_Web_Template;writerweb8_writer_template</value>
                     </prop>
                 </node>
                 <node oor:name="com.sun.star.text.GlobalDocument" oor:op="replace">
@@ -72,7 +72,7 @@
                         <value xml:lang="en-US">Master documents</value>
                     </prop>
                     <prop oor:name="Filters">
-                                                <value oor:separator=";">StarWriter 4.0 (StarWriter/GlobalDocument)/GlobalDocument;StarWriter 5.0 (StarWriter/GlobalDocument)/GlobalDocument;writer_globaldocument_StarOffice_XML_Writer_GlobalDocument;writerglobal8</value>
+                                                <value oor:separator=";">writer_globaldocument_StarOffice_XML_Writer_GlobalDocument;writerglobal8</value>
                     </prop>
                 </node>
                 <node oor:name="com.sun.star.formula.FormularProperties" oor:op="replace">
@@ -81,7 +81,7 @@
                         <value xml:lang="en-US">Formulas</value>
                     </prop>
                     <prop oor:name="Filters">
-                                                <value oor:separator=";">MathML XML (Math);MathType 3.x;StarMath 2.0;StarMath 3.0;StarMath 4.0;StarMath 5.0;StarOffice XML (Math);math8</value>
+                                                <value oor:separator=";">MathML XML (Math);MathType 3.x;StarOffice XML (Math);math8</value>
                     </prop>
                 </node>
                 <node oor:name="com.sun.star.sdb.OfficeDatabaseDocument" oor:op="replace">
@@ -107,24 +107,6 @@
                         <value oor:separator=";">MS Word 95;MS WinWord 6.0</value>
                     </prop>
                 </node>
-                <node oor:name="sw3to5" oor:op="replace">
-                    <prop oor:name="DisplayName">
-
-                        <value xml:lang="en-US">StarWriter 3.0 - 5.0</value>
-                    </prop>
-                    <prop oor:name="Filters">
-                        <value oor:separator=";">StarWriter 5.0;StarWriter 4.0;StarWriter 3.0</value>
-                    </prop>
-                </node>
-                <node oor:name="sw3to5templ" oor:op="replace">
-                    <prop oor:name="DisplayName">
-
-                        <value xml:lang="en-US">StarWriter 3.0 - 5.0 Templates</value>
-                    </prop>
-                    <prop oor:name="Filters">
-                        <value oor:separator=";">StarWriter 5.0 Vorlage/Template;StarWriter 4.0 Vorlage/Template;StarWriter 3.0 Vorlage/Template</value>
-                    </prop>
-                </node>
                 <node oor:name="excel456" oor:op="replace">
                     <prop oor:name="DisplayName">
 
@@ -143,96 +125,6 @@
                         <value oor:separator=";">MS Excel 95 Vorlage/Template;MS Excel 5.0/95 Vorlage/Template;MS Excel 4.0 Vorlage/Template</value>
                     </prop>
                 </node>
-                <node oor:name="sc345" oor:op="replace">
-                    <prop oor:name="DisplayName">
-
-                        <value xml:lang="en-US">StarCalc 3.0 - 5.0</value>
-                    </prop>
-                    <prop oor:name="Filters">
-                        <value oor:separator=";">StarCalc 3.0;StarCalc 4.0;StarCalc 5.0</value>
-                    </prop>
-                </node>
-                <node oor:name="sc345templ" oor:op="replace">
-                    <prop oor:name="DisplayName">
-
-                        <value xml:lang="en-US">StarCalc 3.0 - 5.0 Templates</value>
-                    </prop>
-                    <prop oor:name="Filters">
-                        <value oor:separator=";">StarCalc 3.0 Vorlage/Template;StarCalc 4.0 Vorlage/Template;StarCalc 5.0 Vorlage/Template</value>
-                    </prop>
-                </node>
-                <node oor:name="sd35_i" oor:op="replace">
-                    <prop oor:name="DisplayName">
-
-                        <value xml:lang="en-US">StarDraw 3.0 / 5.0 (StarImpress)</value>
-                    </prop>
-                    <prop oor:name="Filters">
-                        <value oor:separator=";">StarDraw 5.0 (StarImpress);StarDraw 3.0 (StarImpress)</value>
-                    </prop>
-                </node>
-                <node oor:name="sd35_itempl" oor:op="replace">
-                    <prop oor:name="DisplayName">
-
-                        <value xml:lang="en-US">StarDraw 3.0 / 5.0 Templates (StarImpress)</value>
-                    </prop>
-                    <prop oor:name="Filters">
-                        <value oor:separator=";">StarDraw 5.0 Vorlage (StarImpress);StarDraw 3.0 Vorlage (StarImpress)</value>
-                    </prop>
-                </node>
-                <node oor:name="si45" oor:op="replace">
-                    <prop oor:name="DisplayName">
-
-                        <value xml:lang="en-US">StarImpress 4.0 / 5.0</value>
-                    </prop>
-                    <prop oor:name="Filters">
-                        <value oor:separator=";">StarImpress 4.0;StarImpress 5.0;StarImpress 5.0 (packed)</value>
-                    </prop>
-                </node>
-                <node oor:name="si45templ" oor:op="replace">
-                    <prop oor:name="DisplayName">
-
-                        <value xml:lang="en-US">StarImpress 4.0 / 5.0 Templates</value>
-                    </prop>
-                    <prop oor:name="Filters">
-                        <value oor:separator=";">StarImpress 4.0 Vorlage;StarImpress 5.0 Vorlage</value>
-                    </prop>
-                </node>
-                <node oor:name="sd35" oor:op="replace">
-                    <prop oor:name="DisplayName">
-
-                        <value xml:lang="en-US">StarDraw 3.0 / 5.0</value>
-                    </prop>
-                    <prop oor:name="Filters">
-                        <value oor:separator=";">StarDraw 5.0;StarDraw 3.0</value>
-                    </prop>
-                </node>
-                <node oor:name="sd35templ" oor:op="replace">
-                    <prop oor:name="DisplayName">
-
-                        <value xml:lang="en-US">StarDraw 3.0 / 5.0 Templates</value>
-                    </prop>
-                    <prop oor:name="Filters">
-                        <value oor:separator=";">StarDraw 5.0 Vorlage;StarDraw 3.0 Vorlage</value>
-                    </prop>
-                </node>
-                <node oor:name="sww45templ" oor:op="replace">
-                    <prop oor:name="DisplayName">
-
-                        <value xml:lang="en-US">StarWriter/Web 4.0 / 5.0 Templates</value>
-                    </prop>
-                    <prop oor:name="Filters">
-                        <value oor:separator=";">StarWriter/Web 5.0 Vorlage/Template;StarWriter/Web 4.0 Vorlage/Template</value>
-                    </prop>
-                </node>
-                <node oor:name="sww345" oor:op="replace">
-                    <prop oor:name="DisplayName">
-
-                        <value xml:lang="en-US">StarWriter/Web 3.0 - 5.0</value>
-                    </prop>
-                    <prop oor:name="Filters">
-                        <value oor:separator=";">StarWriter 5.0 (StarWriter/Web);StarWriter 4.0 (StarWriter/Web);StarWriter 3.0 (StarWriter/Web)</value>
-                    </prop>
-                </node>
                 <node oor:name="swwtext" oor:op="replace">
                     <prop oor:name="DisplayName">
 
@@ -242,24 +134,6 @@
                         <value oor:separator=";">Text (StarWriter/Web);Text DOS (StarWriter/Web);Text Mac (StarWriter/Web);Text Unix (StarWriter/Web)</value>
                     </prop>
                 </node>
-                <node oor:name="sw45glob" oor:op="replace">
-                    <prop oor:name="DisplayName">
-
-                        <value xml:lang="en-US">StarWriter 4.0 / 5.0 Master Documents</value>
-                    </prop>
-                    <prop oor:name="Filters">
-                        <value oor:separator=";">StarWriter 5.0/GlobalDocument;StarWriter 4.0/GlobalDocument</value>
-                    </prop>
-                </node>
-                <node oor:name="sm2to5" oor:op="replace">
-                    <prop oor:name="DisplayName">
-
-                        <value xml:lang="en-US">StarMath 2.0 - 5.0</value>
-                    </prop>
-                    <prop oor:name="Filters">
-                        <value oor:separator=";">StarMath 5.0;StarMath 4.0;StarMath 3.0;StarMath 2.0</value>
-                    </prop>
-                </node>
                 <node oor:name="wpw67" oor:op="replace">
                     <prop oor:name="DisplayName">
 
diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu
index 87ccf56..930ed62 100644
--- a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu
+++ b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu
@@ -21,37 +21,37 @@
     <node oor:name="ModuleDependendFilterOrder">
         <node oor:name="com.sun.star.sheet.SpreadsheetDocument" oor:op="replace" install:module="calc">
             <prop oor:name="SortedFilterList">
-                <value oor:separator=";">calc8;calc8_template;StarOffice XML (Calc);calc_StarOffice_XML_Calc_Template;OpenDocument Spreadsheet Flat XML;UOF spreadsheet;Calc MS Excel 2007 XML;Calc MS Excel 2007 XML Template;Calc MS Excel 2007 Binary;MS Excel 2003 XML;MS Excel 97;MS Excel 97 Vorlage/Template;MS Excel 95;MS Excel 95 Vorlage/Template;MS Excel 5.0/95;MS Excel 5.0/95 Vorlage/Template;MS Excel 4.0;MS Excel 4.0 Vorlage/Template;StarCalc 5.0;StarCalc 5.0 Vorlage/Template;StarCalc 4.0;StarCalc 4.0 Vorlage/Template;StarCalc 3.0;StarCalc 3.0 Vorlage/Template;StarCalc 1.0;DIF;dBase;HTML (StarCalc);Lotus;Pocket Excel;Quattro Pro 6.0;Rich Text Format (StarCalc);SYLK;Text - txt - csv (StarCalc);calc_HTML_WebQuery;Calc Office Open XML;Calc Office Open XML Template</value>
+                <value oor:separator=";">calc8;calc8_template;StarOffice XML (Calc);calc_StarOffice_XML_Calc_Template;OpenDocument Spreadsheet Flat XML;UOF spreadsheet;Calc MS Excel 2007 XML;Calc MS Excel 2007 XML Template;Calc MS Excel 2007 Binary;MS Excel 2003 XML;MS Excel 97;MS Excel 97 Vorlage/Template;MS Excel 95;MS Excel 95 Vorlage/Template;MS Excel 5.0/95;MS Excel 5.0/95 Vorlage/Template;MS Excel 4.0;MS Excel 4.0 Vorlage/Template;;DIF;dBase;HTML (StarCalc);Lotus;Pocket Excel;Quattro Pro 6.0;Rich Text Format (StarCalc);SYLK;Text - txt - csv (StarCalc);calc_HTML_WebQuery;Calc Office Open XML;Calc Office Open XML Template</value>
             </prop>
         </node>
         <node oor:name="com.sun.star.drawing.DrawingDocument" oor:op="replace" install:module="draw" >
             <prop oor:name="SortedFilterList">
-                <value oor:separator=";">draw8;draw8_template;StarOffice XML (Draw);draw_StarOffice_XML_Draw_Template;OpenDocument Drawing Flat XML;draw_html_Export;draw_pdf_Export;draw_flash_Export;WordPerfect Graphics;DXF - AutoCAD Interchange;EMF - MS Windows Metafile;EPS - Encapsulated PostScript;MET - OS/2 Metafile;PCT - Mac Pict;SGF - StarOffice Writer SGF;SGV - StarDraw 2.0;StarDraw 5.0;StarDraw 5.0 Vorlage;StarDraw 3.0;StarDraw 3.0 Vorlage;SVM - StarView Metafile;WMF - MS Windows Metafile</value>
+                <value oor:separator=";">draw8;draw8_template;StarOffice XML (Draw);draw_StarOffice_XML_Draw_Template;OpenDocument Drawing Flat XML;draw_html_Export;draw_pdf_Export;draw_flash_Export;WordPerfect Graphics;DXF - AutoCAD Interchange;EMF - MS Windows Metafile;EPS - Encapsulated PostScript;MET - OS/2 Metafile;PCT - Mac Pict;SGF - StarOffice Writer SGF;SGV - StarDraw 2.0;SVM - StarView Metafile;WMF - MS Windows Metafile</value>
             </prop>
         </node>
         <node oor:name="com.sun.star.presentation.PresentationDocument" oor:op="replace" install:module="impress">
             <prop oor:name="SortedFilterList">
-                <value oor:separator=";">impress8;impress8_template;impress8_draw;StarOffice XML (Impress);impress_StarOffice_XML_Impress_Template;impress_StarOffice_XML_Draw;OpenDocument Presentation Flat XML;UOF presentation;Impress MS PowerPoint 2007 XML;Impress MS PowerPoint 2007 XML AutoPlay;Impress MS PowerPoint 2007 XML Template;MS PowerPoint 97;MS PowerPoint 97 AutoPlay;MS PowerPoint 97 Vorlage;StarDraw 5.0 (StarImpress);StarDraw 3.0 (StarImpress);StarImpress 5.0;StarImpress 5.0 Vorlage;StarImpress 5.0 (packed);StarImpress 4.0;StarImpress 4.0 Vorlage;CGM - Computer Graphics Metafile;Impress Office Open XML;Impress Office Open XML AutoPlay;Impress Office Open XML Template</value>
+                <value oor:separator=";">impress8;impress8_template;impress8_draw;StarOffice XML (Impress);impress_StarOffice_XML_Impress_Template;impress_StarOffice_XML_Draw;OpenDocument Presentation Flat XML;UOF presentation;Impress MS PowerPoint 2007 XML;Impress MS PowerPoint 2007 XML AutoPlay;Impress MS PowerPoint 2007 XML Template;MS PowerPoint 97;MS PowerPoint 97 AutoPlay;MS PowerPoint 97 Vorlage;CGM - Computer Graphics Metafile;Impress Office Open XML;Impress Office Open XML AutoPlay;Impress Office Open XML Template</value>
             </prop>
         </node>
         <node oor:name="com.sun.star.formula.FormulaProperties" oor:op="replace" install:module="math">
             <prop oor:name="SortedFilterList">
-                <value oor:separator=";">math8;StarOffice XML (Math);StarMath 5.0;StarMath 4.0;StarMath 3.0;StarMath 2.0;MathML XML (Math);MathType 3.x</value>
+                <value oor:separator=";">math8;StarOffice XML (Math);MathML XML (Math);MathType 3.x</value>
             </prop>
         </node>
         <node oor:name="com.sun.star.text.GlobalDocument" oor:op="replace" install:module="writer">
             <prop oor:name="SortedFilterList">
-                <value oor:separator=";">writerglobal8;writer_globaldocument_StarOffice_XML_Writer_GlobalDocument;StarWriter 5.0/GlobalDocument;StarWriter 4.0/GlobalDocument;writer_globaldocument_StarOffice_XML_Writer;StarWriter 5.0 (StarWriter/GlobalDocument);StarWriter 4.0 (StarWriter/GlobalDocument);StarWriter 3.0 (StarWriter/GlobalDocument);Text (encoded) (StarWriter/GlobalDocument)</value>
+                <value oor:separator=";">writerglobal8;writer_globaldocument_StarOffice_XML_Writer_GlobalDocument;writer_globaldocument_StarOffice_XML_Writer;Text (encoded) (StarWriter/GlobalDocument)</value>
             </prop>
         </node>
         <node oor:name="com.sun.star.text.TextDocument" oor:op="replace" install:module="writer">
             <prop oor:name="SortedFilterList">
-                <value oor:separator=";">writer8;writer8_template;StarOffice XML (Writer);writer_StarOffice_XML_Writer_Template;OpenDocument Text Flat XML;UOF text;MS Word 2007 XML;MS Word 2007 XML Template;MS Word 2003 XML;MS Word 97;MS Word 97 Vorlage;MS Word 95;MS Word 95 Vorlage;MS WinWord 6.0;MS WinWord 5;MS_Works;AportisDoc Palm DB;DocBook File;writer_MIZI_Hwp_97;HTML (StarWriter);LotusWordPro;PocketWord File;Rich Text Format;StarWriter 5.0;StarWriter 5.0 Vorlage/Template;StarWriter 4.0;StarWriter 4.0 Vorlage/Template;StarWriter 3.0;StarWriter 3.0 Vorlage/Template;T602Document;Text;Text (encoded);WordPerfect;Office Open XML Text;Office Open XML Text Template</value>
+                <value oor:separator=";">writer8;writer8_template;StarOffice XML (Writer);writer_StarOffice_XML_Writer_Template;OpenDocument Text Flat XML;UOF text;MS Word 2007 XML;MS Word 2007 XML Template;MS Word 2003 XML;MS Word 97;MS Word 97 Vorlage;MS Word 95;MS Word 95 Vorlage;MS WinWord 6.0;MS WinWord 5;MS_Works;AportisDoc Palm DB;DocBook File;writer_MIZI_Hwp_97;HTML (StarWriter);LotusWordPro;PocketWord File;Rich Text Format;T602Document;Text;Text (encoded);WordPerfect;Office Open XML Text;Office Open XML Text Template</value>
             </prop>
         </node>
         <node oor:name="com.sun.star.text.WebDocument" oor:op="replace" install:module="writer">
             <prop oor:name="SortedFilterList">
-                <value oor:separator=";">HTML;writerweb8_writer;writerweb8_writer_template;writer_web_StarOffice_XML_Writer_Web_Template;writer_web_StarOffice_XML_Writer;StarWriter/Web 5.0 Vorlage/Template;StarWriter/Web 4.0 Vorlage/Template;StarWriter 5.0 (StarWriter/Web);StarWriter 4.0 (StarWriter/Web);StarWriter 3.0 (StarWriter/Web);Text (StarWriter/Web);Text (encoded) (StarWriter/Web)</value>
+                <value oor:separator=";">HTML;writerweb8_writer;writerweb8_writer_template;writer_web_StarOffice_XML_Writer_Web_Template;writer_web_StarOffice_XML_Writer;Text (StarWriter/Web);Text (encoded) (StarWriter/Web)</value>
             </prop>
         </node>
     </node>


More information about the Libreoffice-commits mailing list