[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - scp2/inc

Andras Timar andras.timar at collabora.com
Fri Jul 4 02:00:45 PDT 2014


 scp2/inc/macros.inc |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 84a834f865ee91876396daf7a516488fddab6dc2
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Jul 3 13:35:03 2014 +0200

    fdo#77057 quick fix: do not touch KindMap for alien file types
    
    Change-Id: Iffc24dc7ce12de07660eadcf8a525e77856593e1
    (cherry picked from commit 57bf88d21cacb025e7bea40da78616bb4d165215)
    Reviewed-on: https://gerrit.libreoffice.org/10055
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index bed8deb..12545aa 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -434,7 +434,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) \
@@ -449,9 +448,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
 


More information about the Libreoffice-commits mailing list