summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2014-07-03 13:35:03 +0200
committerFridrich Strba <fridrich@documentfoundation.org>2014-07-03 16:55:28 +0000
commitcb2eb7194f4f2c0ab6c8e1ba0b360e021c71f1ed (patch)
treec857267361527216e88ed7fbff419631445e091f
parent574399df9c2ebf3c328a3b95455d3a9fac84771f (diff)
fdo#77057 quick fix: do not touch KindMap for alien file types
(cherry picked from commit 57bf88d21cacb025e7bea40da78616bb4d165215) Conflicts: scp2/inc/macros.inc Change-Id: Iffc24dc7ce12de07660eadcf8a525e77856593e1 Reviewed-on: https://gerrit.libreoffice.org/10051 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
-rwxr-xr-xscp2/inc/macros.inc4
1 files changed, 0 insertions, 4 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index d55c304a0393..cb3b69c10742 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -411,7 +411,6 @@ End
REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \
- REGISTRY_ENTRY_KINDMAP(name, modid, key) \
#define CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
CONDITIONAL_MODULE_ENTRY(name,modid) \
@@ -426,9 +425,6 @@ End
REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \
- REGISTRY_ENTRY_KINDMAP(name, modid, key) \
-
-// ---------------------------------------
#ifdef _MSC_VER