diff options
| author | Peter Foley <pefoley2@verizon.net> | 2011-12-24 09:44:24 -0500 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2011-12-24 09:44:24 -0500 |
| commit | fd6649175956c9d322fe02fd413fe6970aa6819e (patch) | |
| tree | ce2691616f82ef55d3b8f3e45812777477e8668f /scp2/source/ooo | |
| parent | 79b252a56db8f1c2159d3269de415ffe2f2d9bb1 (diff) | |
| parent | a8feb5b1df99c12a5cb644097f935e9ccf512ed5 (diff) | |
Merge remote-tracking branch 'origin/master' into feature/gbuild_extensions
Conflicts:
Module_tail_build.mk
Repository.mk
extensions/util/makefile.pmk
postprocess/prj/build.lst
svx/AllLangResTarget_svx.mk
Diffstat (limited to 'scp2/source/ooo')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 9 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/ure.scp | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index cf94b1892f2f..eecc16df0c07 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1479,15 +1479,6 @@ STD_LIB_FILE( gid_File_Lib_Updchkui , updatecheckui ) SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno ) -#ifdef WNT -File gid_File_Lib_Onlinecheck - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - Name = "onlinecheck.dll"; -End -#endif - #ifndef SYSTEM_OPENSSL File gid_File_Lib_Openssl LIB_FILE_BODY; diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index da5775bed73d..8a3889f06479 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -482,7 +482,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Svtmisc, gid_File_Lib_Updchkui, gid_File_Lib_Updatefeed, - gid_File_Lib_Onlinecheck, gid_File_Lib_Cli_Oootypes_Assembly, gid_File_Lib_Policy_Cli_Oootypes_Assembly, gid_File_Lib_Policy_Cli_Oootypes_Config); @@ -616,7 +615,6 @@ Module gid_Module_Root_Files_6 gid_File_Share_Registry_Main_Xcd, gid_File_Share_Registry_Forcedefault_Xcd, gid_File_Pymailmerge, - gid_File_Pymailmerge_msgbox, gid_File_Xsl_Common_Measure_Conversion, gid_File_Xsl_Common_Math_Functions, gid_File_Xsl_Export_Common_Body, diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index aece7265edd2..58d8ec017ae6 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -191,7 +191,11 @@ End File gid_File_Dl_Cppuhelper LIB_FILE_BODY; Dir = SCP2_URE_DL_DIR; +#if defined WNT && !defined _MSC // Hack for not gbuild'ified cppuhelper on MinGW: + Name = "uno_cppuhelpergcc33.dll"; +#else Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3"); +#endif Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "D2A191E6-2023-41F5-9032-B98C50C37964"; End |