diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-12-13 16:52:50 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-12-17 16:34:23 +0100 |
| commit | 77d3777c8934171a9557a96872d020cf12443fb9 (patch) | |
| tree | 405281132307da4125f32651aee78e19ed47b34b /scp2 | |
| parent | c075b8068bff1b3c6025638aaf0acab5bbebab4d (diff) | |
Remove --with-stlport from LO 4.0
The STLport was only built for the benefit of old extensions on platforms that
once used it themselves (Linux x86, Solaris x86 and SPARC, Windows). We
deliberately break such old extensions for LO 4.0 by no longer shipping that
backwards-compatiblity cludge.
Keeps STLport listed in readlicense_oo/ because of
o3tl/inc/o3tl/compat_functionality.hxx.
Also removes GXX_INCLUDE_PATH, as that was only used by STLport (if at all?).
Removes a spurious #define MOVEFILE_REPLACE_EXISTING 0x01 from
l10ntools/inc/helpmerge.hxx that was once added with
854812584862d0609b695682d2bfea2667d75c00 "INTEGRATION: CWS extensionl10nfix01
(1.11.6); FILE MERGED: 2008/06/26 13:56:03 ihi 1.11.6.1: #i90987# windows rename
-> MoveFileEx" but now starts to cause trouble on Windows. Also disables
warning C4005 about redefinition of WB_LEFT/RIGHT macros (defined in both
tools/wintypes.hxx and the Windows API) in a number of places that include
windows.h -- however the old STLport caused those warnings to not show.
Change-Id: Ie138a219fbbc86fb5aaa7ea0b88cf349935d9829
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 2 | ||||
| -rwxr-xr-x | scp2/source/ooo/ure.scp | 39 |
2 files changed, 0 insertions, 41 deletions
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 13bb7b7593a3..267105189160 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -461,8 +461,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Msvcp70_So, gid_File_Lib_Msvcr70_So, gid_File_Lib_Gdiplus, - gid_File_Lib_Stlport_Vc6, - gid_File_Lib_Stlport_Vc7, gid_File_Tabaction, gid_File_Lib_Fps_Office, gid_File_Lib_Fpicker, diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index a53ddcb6abb6..50c42b2a720c 100755 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -842,44 +842,6 @@ Unixlink gid_Unixlink_File_Dl_Libxml2 End #endif -#if defined WITH_STLPORT -File gid_File_Dl_Stlport - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; -#if defined _gcc3 && defined WNT -#if defined _DEBUG_RUNTIME - Name = SCP2_URE_DL_NORMAL("libstlport_gcc_stldebug"); -#else - Name = SCP2_URE_DL_NORMAL("libstlport_gcc"); -#endif -#elif defined _gcc3 -#if defined _DEBUG_RUNTIME - Name = SCP2_URE_DL_NORMAL("stlport_gcc_stldebug"); -#else - Name = SCP2_URE_DL_NORMAL("stlport_gcc"); -#endif -#elif defined SOLARIS -#if defined IS_LP64 - Name = SCP2_URE_DL_VER("stlport", "1"); -#else -#if defined _DEBUG_RUNTIME - Name = SCP2_URE_DL_NORMAL("stlport_sunpro_debug"); -#else - Name = SCP2_URE_DL_NORMAL("stlport_sunpro"); -#endif -#endif -#elif defined _MSC_VER -#if defined _DEBUG_RUNTIME - Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45"); -#else - Name = SCP2_URE_DL_NORMAL("stlport_vc7145"); -#endif -#endif - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "D976338D-D2A5-4D29-B765-D3AC43181C7F"; -End -#endif - #if defined(WNT) && defined( _gcc3 ) #if defined(MINGW_GCCDLL) @@ -1102,7 +1064,6 @@ Module gid_Module_Root_Ure_Hidden gid_File_Dl_Textoutstream, gid_File_Dl_Uuresolver, gid_File_Dl_Libxml2, - gid_File_Dl_Stlport, gid_File_Lib_Mingw_GccS_Ure, gid_File_Lib_Mingw_Stdcpp_Ure, gid_File_Dl_Unicows, |