#i20180#: OASIS MimeType; some Typos fixed; Chart XML formats removed; problem with string concatenation overflow on MSVC++ fixed

2 files changed, 41 insertions, 32 deletions

diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
index 450d2ddeab76..3fa10ccf8ab5 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: npshell.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2004-08-20 10:06:25 $
+ *  last change: $Author: mba $ $Date: 2004-09-02 14:01:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -215,13 +215,47 @@ int sendMsg( PLUGIN_MSG* pMsg, unsigned int len, int iEnsure)
     return len_w;
 }
 
+const char* pMimeTypes = "application/vnd.stardivision.calc:sdc:StarCalc 3.0 - 5.0;"
+"application/vnd.stardivision.chart:sds:StarChart 3.0 - 5.0;"
+"application/vnd.stardivision.draw:sda:StarDraw 3.0 - 5.0;"
+"application/vnd.stardivision.impress:sdd:StarImpress 3.0 - 5.0;"
+"application/vnd.stardivision.impress-packed:sdp:StarImpress-packed 3.0 - 5.0;"
+"application/vnd.stardivision.math:smf:StarMath 3.0 - 5.0;"
+"application/vnd.stardivision.writer:vor:StarWriter Template 3.0 - 5.0;"
+"application/vnd.stardivision.writer-global:sgl:StarWriter Global 3.0 - 5.0;"
+"application/vnd.staroffice.writer:sdw:StarWriter 3.0 - 5.0;"
+"application/vnd.sun.xml.calc:sxc:StarCalc;"
+"application/vnd.sun.xml.calc.template:stc:StarCalc Template;"
+"application/vnd.sun.xml.draw:sxd:StarDraw;"
+"application/vnd.sun.xml.draw.template:std:StarDraw Template;"
+"application/vnd.sun.xml.impress:sxi:StarImpress;"
+"application/vnd.sun.xml.impress.template:sti:StarImpress Template;"
+"application/vnd.sun.xml.math:sxm:StarMath;"
+"application/vnd.sun.xml.writer:sxw:StarWriter;"
+"application/vnd.sun.xml.writer.global:sxg:StarWriter Global;"
+"application/vnd.sun.xml.writer.template:stw:StarWriter Template;"
+"application/msword:doc:Microsoft Word Document;"
+"application/vnd.ms-excel:xls:Microsoft Excel Document;"
+"application/vnd.ms-powerpoint:ppt:Microsoft Powerpoint Document;"
+"application/x-vnd.oasis.openoffice.text:oot:Open Office Text;"
+"application/x-vnd.oasis.openoffice-template:ott:Open Office Text Template;"
+"application/x-vnd.oasis.openoffice.text-master:oom:Open Office Master Document;"
+"application/x-vnd.oasis.openoffice.text-web:oth:HTML Document Template;"
+"application/x-vnd.oasis.openoffice.spreadsheet:oos:Open Office Spreadsheet;"
+"application/x-vnd.oasis.openoffice.spreadsheet-template:ots:Open Office Spreadsheet Template;"
+"application/x-vnd.oasis.openoffice.drawing:ood:Open Office Drawing;"
+"application/x-vnd.oasis.openoffice.drawing-template:otd:Open Office Drawing Template;"
+"application/x-vnd.oasis.openoffice.presentation:oop:Open Office Presentation;"
+"application/x-vnd.oasis.openoffice.presentation-template:otp:Open Office Presentation Template;"
+"application/x-vnd.oasis.openoffice.formula:oof:Open Office Formula";
+
 extern "C"
 {
-char*
+const char*
 NPP_GetMIMEDescription(void)
 {
-    debug_fprintf(NSP_LOG_APPEND, "print by Netscape Plugin,  NPP_GetMIMEDescription:%s.\n", MIME_TYPES_HANDLED);
-    return(MIME_TYPES_HANDLED);
+    debug_fprintf(NSP_LOG_APPEND, "print by Netscape Plugin,  NPP_GetMIMEDescription:%s.\n", pMimeTypes);
+    return(pMimeTypes);
 }
 
 #ifdef UNIX
diff --git a/extensions/source/nsplugin/source/npshell.hxx b/extensions/source/nsplugin/source/npshell.hxx
index 86e144dae24f..eb9c6a92b6a2 100644
--- a/extensions/source/nsplugin/source/npshell.hxx
+++ b/extensions/source/nsplugin/source/npshell.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: npshell.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2004-08-20 10:06:36 $
+ *  last change: $Author: mba $ $Date: 2004-09-02 14:01:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,31 +59,6 @@
  *
  ************************************************************************/
 
-#define MIME_TYPES_HANDLED "application/vnd.stardivision.calc:sdc:StarCalc 3.0 - 5.0;\
-application/vnd.stardivision.chart:sds:StarChart 3.0 - 5.0;\
-application/vnd.stardivision.draw:sda:StarDraw 3.0 - 5.0;\
-application/vnd.stardivision.impress:sdd:StarImpress 3.0 - 5.0;\
-application/vnd.stardivision.impress-packed:sdp:StarImpress-packed 3.0 - 5.0;\
-application/vnd.stardivision.math:smf:StarMath 3.0 - 5.0;\
-application/vnd.stardivision.writer:vor:StarWriter Vorlage 3.0 - 5.0;\
-application/vnd.stardivision.writer-global:sgl:StarWriter Global 3.0 - 5.0;\
-application/vnd.staroffice.writer:sdw:StarWriter;\
-application/vnd.sun.xml.calc:sxc:StarCalc;\
-application/vnd.sun.xml.calc.template:stc:StarCalc Tempalte;\
-application/vnd.sun.xml.chart:sxs:StarChart;\
-application/vnd.sun.xml.chart.template:sts:StarChart Template;\
-application/vnd.sun.xml.draw:sxd:StarDraw;\
-application/vnd.sun.xml.draw.template:std:StarDraw Template;\
-application/vnd.sun.xml.impress:sxi:StarImpress;\
-application/vnd.sun.xml.impress.template:sti:StarImpress Template;\
-application/vnd.sun.xml.math:sxm:StarMath;\
-application/vnd.sun.xml.writer:sxw:StarWriter;\
-application/vnd.sun.xml.writer.global:sxg:StarWriter Global;\
-application/vnd.sun.xml.writer.template:stw:StarWriter Template;\
-application/msword:doc:Microsoft Word Document;\
-application/vnd.ms-excel:xls:Microsoft Excel Document;\
-application/vnd.ms-powerpoint:ppt:Microsoft Powerpoint Document"
-
 #define PLUGIN_NAME         "StarOffice Plugin"
 #define PLUGIN_DESCRIPTION  "The StarOffice plugin handles all staroffice documents"