diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-18 11:54:06 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-18 11:54:06 +0000 |
| commit | 4a99cfe8c84660f672926cc534444ee3e3bb38cb (patch) | |
| tree | 0fa5873c176bd1b7d128cb450f73673361384cdf /scp2 | |
| parent | 014467d75e9b12eaae3065449adc12fdcd5a6b8b (diff) | |
CWS-TOOLING: integrate CWS dtrans2vcl
2009-09-09 19:47:56 +0200 pl r276016 : merge fix for #i104390# into moved code
2009-09-07 12:50:47 +0200 pl r275891 : remove nonexistant header
2009-09-04 16:47:05 +0200 pl r275819 : forgot calling convention for Windoze
2009-09-04 13:27:36 +0200 pl r275800 : #150926# remove X11 dependency
2009-09-04 13:19:08 +0200 pl r275799 : #150926# move mac dtrans service to vcl to be used in service implementation
2009-09-03 21:19:01 +0200 pl r275774 : fix warning, adjust comment
2009-09-03 18:36:01 +0200 pl r275768 : no more sjlib
2009-09-03 17:56:49 +0200 pl r275767 : remove unused X11 link dependency
2009-09-03 17:43:35 +0200 pl r275766 : headless not used in X11 case
2009-09-03 17:34:36 +0200 pl r275765 : #150926# bye bye sj2
2009-09-03 16:19:04 +0200 pl r275761 : #150926# bye bye sj2, x11 dependenices removed where not necessary
2009-09-01 17:22:54 +0200 pl r275674 : #150926# step 1: move X11 code from dtrans to vcl, adapt glue code
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 28 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 6 |
2 files changed, 8 insertions, 26 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 0f8c57b2941e..1a28d5d71d9d 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -7,7 +7,6 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: file_library_ooo.scp,v $ - * $Revision: 1.303.16.2 $ * * This file is part of OpenOffice.org. * @@ -818,17 +817,6 @@ End #endif -File gid_File_Lib_J - TXT_FILE_BODY; - #ifdef UNX - Name = STRING(CONCAT5(lib,j,DLLPOSTFIX,_g,UNXSUFFIX)); - #else - Name = STRING(CONCAT4(j,DLLPOSTFIX,_g,.dll)); - #endif - Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED); -End - #ifdef SOLAR_JAVA STD_UNO_LIB_FILE( gid_File_Lib_Jdbc, jdbc) @@ -1213,6 +1201,12 @@ STD_UNO_LIB_FILE( gid_File_Lib_Preload, preload) SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistration.uno ) #if defined(UNX) && ! defined(QUARTZ) +File gid_File_Lib_Desktop_Detector + Name = LIBNAME(desktop_detector); + TXT_FILE_BODY; + Styles = (PACKED,PATCH); + Dir = SCP2_OOO_BIN_DIR; +End File gid_File_Lib_Vclplug_Gen Name = LIBNAME(vclplug_gen); TXT_FILE_BODY; @@ -1492,21 +1486,15 @@ STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui) STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword ) +#if ! defined UNX File gid_File_Lib_Sysdtrans TXT_FILE_BODY; Styles = (PACKED,PATCH,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - #ifdef QUARTZ - Name = STRING(CONCAT3(libdtransaqua,DLLPOSTFIX,UNXSUFFIX)); - #else - Name = STRING(CONCAT3(libdtransX11,DLLPOSTFIX,UNXSUFFIX)); - #endif - #else Name = "sysdtrans.dll"; - #endif End +#endif SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Syssh, syssh.uno ) SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Localebe, localebe1.uno ) diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 986e224f6a9e..519a2f865a38 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -456,12 +456,6 @@ STD_JAR_FILE( gid_File_Jar_Bsh, bsh ) #endif #ifdef SOLAR_JAVA - -STD_JAR_FILE( gid_File_Jar_Classes, classes ) - -#endif - -#ifdef SOLAR_JAVA #ifndef SYSTEM_LUCENE STD_JAR_FILE( gid_File_Jar_Lucene_Core, lucene-core-2.3 ) STD_JAR_FILE( gid_File_Jar_Lucene_Analyzers, lucene-analyzers-2.3 ) |