diff options
| author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-10-03 14:10:10 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-10-04 09:38:36 +0200 |
| commit | 5bd2890a56125d391b42f34d51e2e0c57b0a80b0 (patch) | |
| tree | 9546d891cc0d83f6a7e510dab6a950e10f790a6b /scp2/source | |
| parent | bee695a32d1bd6aad54372e3c6971b1067e35409 (diff) | |
Added --disable-cmis flag for use while the feature is too unstable
Diffstat (limited to 'scp2/source')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 037794040915..d5b62bc34fc3 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -186,8 +186,7 @@ End #endif -#ifndef WNT - +#if ENABLE_CMIS File gid_File_Lib_Cmis TXT_FILE_BODY; Styles = (PACKED); @@ -206,6 +205,7 @@ File gid_File_Lib_Cmis #endif #endif End +#endif #endif @@ -1356,7 +1356,7 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno) SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1) #endif -#ifndef WNT +#if ENABLE_CMIS SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpcmis, ucpcmis1.uno) #endif diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 0865fb8094c2..826b6b46c7cb 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -327,6 +327,9 @@ Module gid_Module_Root_Files_5 #if ! defined SYSTEM_LIBGSF gid_File_Lib_Libgsf, #endif +#if ENABLE_CMIS + gid_File_Lib_Cmis, +#endif gid_File_Lib_Dict_Ja, gid_File_Lib_Dict_Zh, gid_File_Lib_Collator_Data, @@ -340,7 +343,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Ldapbe2, gid_File_Lib_Comphelper2, gid_File_Lib_Cached1, - gid_File_Lib_Cmis, gid_File_Lib_Curl, gid_Unixlink_File_Lib_Curl, gid_File_Lib_Db, |