diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 13:07:05 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 13:07:05 +0000 |
| commit | 72e1c957a425e780e963e79fd1d783d339079fef (patch) | |
| tree | 8665758ecf66e146b8b9f006b98dc47fc3f66fbd /extensions/source/activex/main | |
| parent | 05c3a8dd50431d3c94c0107fbda6dd41e6fc7a0b (diff) | |
INTEGRATION: CWS fwkfinal1 (1.10.10); FILE MERGED
2005/03/10 12:47:50 mav 1.10.10.2: #i43100# introduce missing mediatype
2005/03/10 12:34:40 mav 1.10.10.1: #i43100# let the activex control be registered only for own formats
Diffstat (limited to 'extensions/source/activex/main')
| -rw-r--r-- | extensions/source/activex/main/so_activex.cpp | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/extensions/source/activex/main/so_activex.cpp b/extensions/source/activex/main/so_activex.cpp index 6f526b48d..75cd03668 100644 --- a/extensions/source/activex/main/so_activex.cpp +++ b/extensions/source/activex/main/so_activex.cpp @@ -58,35 +58,35 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) // DllRegisterServer - Adds entries to the system registry // for now database component and chart are always installed -#define SUPPORTED_EXT_NUM 30 +#define SUPPORTED_EXT_NUM 31 const char* aFileExt[] = { ".vor", - ".sds", ".sda", ".sdd", ".sdc", ".sdw", ".smf", - ".stw", ".stc", ".sti", ".std", ".stm", + ".sds", ".sda", ".sdd", ".sdp", ".sdc", ".sdw", ".smf", + ".stw", ".stc", ".sti", ".std", ".sxw", ".sxc", ".sxi", ".sxd", ".sxg", ".sxm", ".ott", ".otg", ".otp", ".ots", ".otf", - ".odt", ".odm", ".odg", ".odp", ".ods", ".odf", ".odb"}; + ".odt", ".oth", ".odm", ".odg", ".odp", ".ods", ".odf", ".odb"}; const char* aMimeType[] = { "application/vnd.stardivision.writer", "application/vnd.stardivision.chart", "application/vnd.stardivision.draw", "application/vnd.stardivision.impress", + "application/vnd.stardivision.impress-packed", "application/vnd.stardivision.calc", "application/vnd.stardivision.writer", "application/vnd.stardivision.math", - "application/vnd.sun.xml.writer.template", - "application/vnd.sun.xml.calc.template", - "application/vnd.sun.xml.impress.template", - "application/vnd.sun.xml.draw.template", - "application/vnd.sun.xml.math.template", - - "application/vnd.sun.xml.writer", - "application/vnd.sun.xml.calc", - "application/vnd.sun.xml.impress", - "application/vnd.sun.xml.draw", - "application/vnd.sun.xml.writer.global", - "application/vnd.sun.xml.math", + MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII, + MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII, + MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE_ASCII, + MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE_ASCII, + + MIMETYPE_VND_SUN_XML_WRITER_ASCII, + MIMETYPE_VND_SUN_XML_CALC_ASCII, + MIMETYPE_VND_SUN_XML_IMPRESS_ASCII, + MIMETYPE_VND_SUN_XML_DRAW_ASCII, + MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII, + MIMETYPE_VND_SUN_XML_MATH_ASCII, MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII, MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII, @@ -95,6 +95,7 @@ const char* aMimeType[] = { MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII, MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII, + MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII, MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII, MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII, MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII, @@ -103,11 +104,11 @@ const char* aMimeType[] = { MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII }; const int nForModes[] = { 16, - 1, 2, 4, 8, 16, 32, - 16, 8, 4, 2, 32, + 1, 2, 4, 4, 8, 16, 32, + 16, 8, 4, 2, 16, 8, 4, 2, 16, 32, 16, 2, 4, 8, 32, - 16, 16, 2, 4, 8, 32, 1 }; + 16, 16, 16, 2, 4, 8, 32, 1 }; const char* aClassID = "{67F2A879-82D5-4A6D-8CC5-FFB3C114B69D}"; const char* aTypeLib = "{61FA3F13-8061-4796-B055-3697ED28CB38}"; |