support MS Office and Flat ODF file types in Mozilla Plug-in

Change-Id: I9bb3b67551dc14fd74e02defa0404e1f83359f2b

2 files changed, 119 insertions, 17 deletions

diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
index 133e00b47939..01a9f625a96b 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -338,11 +338,25 @@ bool sendMsg( PLUGIN_MSG* pMsg, size_t len, int iEnsure)
 
 extern "C"
 {
-char* pMimeTypes = const_cast< char* >( "application/msword:doc:MS Word document;"
-"application/msword:dot:MS Word document template;"
-"application/vnd.ms-excel:xls:MS Excel spreadsheet;"
-"application/vnd.ms-excel:xlt:MS Excel spreadsheet template;"
-"application/vnd.ms-excel:xla:MS Excel spreadsheet;"
+char* pMimeTypes = const_cast< char* >( "application/msword:doc:MS Word 97-2003 document;"
+"application/msword:dot:MS Word 97-2003 document template;"
+"application/vnd.openxmlformats-officedocument.wordprocessingml.document:docx:MS Word document;"
+"application/vnd.ms-word.document.macroenabled.12:docm:MS Word document with macros;"
+"application/vnd.openxmlformats-officedocument.wordprocessingml.template:dotx:MS Word document template;"
+"application/vnd.ms-word.template.macroenabled.12:dotm:MS Word document template with macros;"
+"application/rtf:rtf:Rich Text Format;"
+"application/vnd.ms-excel:xls:MS Excel 97-2003 spreadsheet;"
+"application/vnd.ms-excel:xlt:MS Excel 97-2003 spreadsheet template;"
+"application/vnd.ms-excel:xla:MS Excel 97-2003 spreadsheet;"
+"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet:xlsx:MS Excel spreadsheet;"
+"application/vnd.ms-excel.sheet.macroenabled.12:xlsm:MS Excel spreadsheet with macros;"
+"application/vnd.openxmlformats-officedocument.spreadsheetml.template:xltx:MS Excel spreadsheet template;"
+"application/vnd.ms-excel.template.macroenabled.12:xltm:MS Excel spreadsheet template with macros;"
+"application/vnd.ms-powerpoint:ppt:MS PowerPoint 97-2003 presentation;"
+"application/vnd.openxmlformats-officedocument.presentationml.presentation:pptx:MS PowerPoint presentation;"
+"application/vnd.ms-powerpoint.presentation.macroenabled.12:pptm:MS PowerPoint presentation with macros;"
+"application/vnd.openxmlformats-officedocument.presentationml.template:potx:MS PowerPoint presentation template;"
+"application/vnd.ms-powerpoint.template.macroenabled.12:potm:MS PowerPoint presentation template with macros;"
 MIMETYPE_VND_SUN_XML_CALC_ASCII ":sxc:StarOffice 6.0/7 Spreadsheet;"
 MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII":stc:StarOffice 6.0/7 Spreadsheet Template;"
 MIMETYPE_VND_SUN_XML_DRAW_ASCII ":sxd:StarOffice 6.0/7 Drawing;"
@@ -354,14 +368,18 @@ MIMETYPE_VND_SUN_XML_WRITER_ASCII ":sxw:StarOffice 6.0/7 Text Document;"
 MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII ":sxg:StarOffice 6.0/7 Master Document;"
 MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII ":stw:StarOffice 6.0/7 Text Document Template;"
 MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII ":odt:OpenDocument Text;"
+MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII "-flat-xml:fodt:OpenDocument Text Flat XML;"
 MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII ":ott:OpenDocument Text Template;"
 MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII ":odm:OpenDocument Master Document;"
 MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII ":oth:HTML Document Template;"
 MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII ":ods:OpenDocument Spreadsheet;"
+MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII "-flat-xml:fods:OpenDocument Spreadsheet Flat XML;"
 MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII ":ots:OpenDocument Spreadsheet Template;"
 MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII ":odg:OpenDocument Drawing;"
+MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII "-flat-xml:fodg:OpenDocument Drawing Flat XML;"
 MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII ":otg:OpenDocument Drawing Template;"
 MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII ":odp:OpenDocument Presentation;"
+MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII "-flat-xml:fodp:OpenDocument Presentation Flat XML;"
 MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII ":otp:OpenDocument Presentation Template;"
 MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ":odf:OpenDocument Formula;" );
 
diff --git a/extensions/source/nsplugin/source/nsplugin_oo.rc b/extensions/source/nsplugin/source/nsplugin_oo.rc
index 6284abe12e48..dd00b9dad3b7 100644
--- a/extensions/source/nsplugin/source/nsplugin_oo.rc
+++ b/extensions/source/nsplugin/source/nsplugin_oo.rc
@@ -24,12 +24,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#define ADDITIONAL_VERINFO1     VALUE "FileExtents", "sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0"\
-    VALUE "FileOpenName", "StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0"
-#define ADDITIONAL_VERINFO2    VALUE "FileDescription", "LibreOffice Plug-in handles all its documents" VALUE "ProductName", "LibreOffice Plug-in"  VALUE "MIMEType",   "application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|"
-#define ADDITIONAL_VERINFO3     "application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0"
-#define ORG_NAME npsoplugin.dll
-#define INTERNAL_NAME npsoplugin
 
 #include <windows.h>
 #include "version.hrc"
@@ -55,15 +49,105 @@ VS_VERSION_INFO VERSIONINFO
             {
                 // International StringTable
                 VALUE "CompanyName",      PPS(RES_APP_VENDOR) "\0"
-                VALUE "ProductName",      "LibreOffice\0"
+                VALUE "ProductName",      "LibreOffice Plug-in\0"
                 VALUE "ProductVersion",   PPS(VER_LEVEL) "\0"
                 VALUE "FileVersion",      PPS(VER_LEVEL) "\0"
-                VALUE "OriginalFilename", PPS(ORG_NAME) "\0"
-                VALUE "InternalName",     PPS(INTERNAL_NAME) "\0"
+                VALUE "FileDescription",  "LibreOffice Plug-in handles all its documents\0"
+                VALUE "OriginalFilename", "npsoplugin.dll\0"
+                VALUE "InternalName",     "npsoplugin\0"
                 VALUE "LegalCopyright",   S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"
-                ADDITIONAL_VERINFO1
-                ADDITIONAL_VERINFO2
-                ADDITIONAL_VERINFO3
+                VALUE "FileExtents",      "sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|"
+                                          "odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf|"
+                                          "fodt|fods|fogd|fodp|"
+                                          "doc|dot|docx|docm|dotx|dotm|rtf|xls|xlt|xla|xlsx|xlsm|xltx|xltm|ppt|pptx|pptm|potx|potm\0"
+                VALUE "FileOpenName",     "StarOffice 6.0/7 Spreadsheet|"
+                                          "StarOffice 6.0/7 Spreadsheet Template|"
+                                          "StarOffice 6.0/7 Drawing|"
+                                          "StarOffice 6.0/7 Drawing Template|"
+                                          "StarOffice 6.0/7 Presentation|"
+                                          "StarOffice 6.0/7 Presentation Template|"
+                                          "StarOffice 6.0/7 Formula|"
+                                          "StarOffice 6.0/7 Text Document|"
+                                          "StarOffice 6.0/7 Master Document|"
+                                          "StarOffice 6.0/7 Text Document Template|"
+                                          "OpenDocument Text|"
+                                          "OpenDocument Text Template|"
+                                          "OpenDocument Master Document|"
+                                          "HTML Document Template|"
+                                          "OpenDocument Spreadsheet|"
+                                          "OpenDocument Spreadsheet Template|"
+                                          "OpenDocument Drawing|"
+                                          "OpenDocument Drawing Template|"
+                                          "OpenDocument Presentation|"
+                                          "OpenDocument Presentation Template|"
+                                          "OpenDocument Formula|"
+                                          "OpenDocument Text Flat XML|"
+                                          "OpenDocument Spreadsheet Flat XML|"
+                                          "OpenDocument Drawing Flat XML|"
+                                          "OpenDocument Presentation Flat XML|"
+                                          "MS Word 97-2003 document|"
+                                          "MS Word 97-2003 document template|"
+                                          "MS Word document|"
+                                          "MS Word document with macros|"
+                                          "MS Word document template|"
+                                          "MS Word document template with macros|"
+                                          "Rich Text Format|"
+                                          "MS Excel 97-2003 spreadsheet|"
+                                          "MS Excel 97-2003 spreadsheet template|"
+                                          "MS Excel 97-2003 spreadsheet|"
+                                          "MS Excel spreadsheet|"
+                                          "MS Excel spreadsheet with macros|"
+                                          "MS Excel spreadsheet template|"
+                                          "MS Excel spreadsheet template with macros|"
+                                          "MS PowerPoint 97-2003 presentation|"
+                                          "MS PowerPoint presentation|"
+                                          "MS PowerPoint presentation with macros|"
+                                          "MS PowerPoint presentation template|"
+                                          "MS PowerPoint presentation template with macros\0"
+                VALUE "MIMEType",         "application/vnd.sun.xml.calc|"
+                                          "application/vnd.sun.xml.calc.template|"
+                                          "application/vnd.sun.xml.draw|"
+                                          "application/vnd.sun.xml.draw.template|"
+                                          "application/vnd.sun.xml.impress|"
+                                          "application/vnd.sun.xml.impress.template|"
+                                          "application/vnd.sun.xml.math|"
+                                          "application/vnd.sun.xml.writer|"
+                                          "application/vnd.sun.xml.writer.global|"
+                                          "application/vnd.sun.xml.writer.template|"
+                                          "application/vnd.oasis.opendocument.text|"
+                                          "application/vnd.oasis.opendocument.text-template|"
+                                          "application/vnd.oasis.opendocument.text-master|"
+                                          "application/vnd.oasis.opendocument.text-web|"
+                                          "application/vnd.oasis.opendocument.spreadsheet|"
+                                          "application/vnd.oasis.opendocument.spreadsheet-template|"
+                                          "application/vnd.oasis.opendocument.graphics|"
+                                          "application/vnd.oasis.opendocument.graphics-template|"
+                                          "application/vnd.oasis.opendocument.presentation|"
+                                          "application/vnd.oasis.opendocument.presentation-template|"
+                                          "application/vnd.oasis.opendocument.formula|"
+                                          "application/vnd.oasis.opendocument.text-flat-xml|"
+                                          "application/vnd.oasis.opendocument.spreadsheet-flat-xml|"
+                                          "application/vnd.oasis.opendocument.graphics-flat-xml|"
+                                          "application/vnd.oasis.opendocument.presentation-flat-xml|"
+                                          "application/msword|"
+                                          "application/msword|"
+                                          "application/vnd.openxmlformats-officedocument.wordprocessingml.document|"
+                                          "application/vnd.ms-word.document.macroenabled.12|"
+                                          "application/vnd.openxmlformats-officedocument.wordprocessingml.template|"
+                                          "application/vnd.ms-word.template.macroenabled.12|"
+                                          "application/rtf|"
+                                          "application/vnd.ms-excel|"
+                                          "application/vnd.ms-excel|"
+                                          "application/vnd.ms-excel|"
+                                          "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet|"
+                                          "application/vnd.ms-excel.sheet.macroenabled.12|"
+                                          "application/vnd.openxmlformats-officedocument.spreadsheetml.template|"
+                                          "application/vnd.ms-excel.template.macroenabled.12|"
+                                          "application/vnd.ms-powerpoint|"
+                                          "application/vnd.openxmlformats-officedocument.presentationml.presentation|"
+                                          "application/vnd.ms-powerpoint.presentation.macroenabled.12|"
+                                          "application/vnd.openxmlformats-officedocument.presentationml.template|"
+                                          "application/vnd.ms-powerpoint.template.macroenabled.12\0"
             }
         }