[Libreoffice-commits] core.git: extensions/source

[Libreoffice Gerrit user]

 extensions/source/activex/so_activex.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 25552011fc6b9f4d759d1a09051e2eeca1222063
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Tue Mar 12 18:37:30 2019 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Wed Mar 13 07:34:18 2019 +0100

    ActiveX: Use correct mimetypes
    
    As registered at IANA: https://www.iana.org/assignments/media-types/media-types.xhtml
    
    Change-Id: I6d66f2cd1f96e487562a1042583e08a5beefc262
    Reviewed-on: https://gerrit.libreoffice.org/69125
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/extensions/source/activex/so_activex.cxx b/extensions/source/activex/so_activex.cxx
index 672f70f84eb8..d3899a4aa205 100644
--- a/extensions/source/activex/so_activex.cxx
+++ b/extensions/source/activex/so_activex.cxx
@@ -578,11 +578,11 @@ STDAPI DllUnregisterServerNative( int nMode, BOOL bForAllUsers, BOOL bFor64Bit )
 const char* const aMSFileExt[] = { ".dot", ".doc", ".xlt", ".xls", ".pot", ".ppt", ".pps" };
 const char* const aMSMimeType[] = { "application/msword",
                           "application/msword",
-                          "application/msexcel",
-                          "application/msexcel",
-                          "application/mspowerpoint",
-                          "application/mspowerpoint",
-                          "application/mspowerpoint" };
+                          "application/vnd.ms-excel",
+                          "application/vnd.ms-excel",
+                          "application/vnd.ms-powerpoint",
+                          "application/vnd.ms-powerpoint",
+                          "application/vnd.ms-powerpoint" };
 const int nForMSModes[] = { 1, 1, 2, 2, 4, 4, 4 };
 
 EXTERN_C __declspec(dllexport) HRESULT STDAPICALLTYPE DllUnregisterServerDoc( int nMode, BOOL bForAllUsers, BOOL bFor64Bit );