scp2/inc/macros.inc | 4 ----
1 file changed, 4 deletions(-)
New commits:
commit cb2eb7194f4f2c0ab6c8e1ba0b360e021c71f1ed
Author: Andras Timar <andras.ti...@collabora.com>
Date: Thu Jul 3 13:35:03 2014 +0200
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 <fridr...@documentfoundation.org>
Tested-by: Fridrich Strba <fridr...@documentfoundation.org>
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index d55c304..cb3b69c 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
