diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:15:23 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:15:23 +0000 |
| commit | 6e248e4aec39f7ac61f83731ac09d79bbf96e982 (patch) | |
| tree | 64111274a0425c8806e624f5d28bd66fee2717fc /scp2/source/ooo/ure.scp | |
| parent | 67e862f3b1f4e37b10550d28c5e1a66e35036fc0 (diff) | |
INTEGRATION: CWS sb88 (1.4.40); FILE MERGED
2008/06/11 10:49:23 sb 1.4.40.3: RESYNC: (1.4-1.7); FILE MERGED
2008/06/06 08:33:55 sb 1.4.40.2: #i89507# take care of .jnilib vs. .dylib feature of MACOSX
2008/05/15 10:06:46 sb 1.4.40.1: #i88329# move just-for-moz msvcp71.dll/msvcr71.dll from URE to Basis layer
Diffstat (limited to 'scp2/source/ooo/ure.scp')
| -rwxr-xr-x | scp2/source/ooo/ure.scp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 00b9505933e8..1a91b48742de 100755 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ure.scp,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -474,7 +474,7 @@ End File gid_File_Dl_Jpipe TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_NORMAL("jpipe"); + Name = SCP2_URE_JDL_NORMAL("jpipe"); Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "B1A60DD4-51D7-4898-B899-9BD05DE2DA8F"; End @@ -756,7 +756,7 @@ End #endif #ifdef WNT -#if defined(M1310) || ( (defined(M1400) || defined(M1500) ) && ( !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) )) +#if defined(M1310) File gid_File_Dl_Msvcr71 TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -772,7 +772,7 @@ End #endif #if defined(WNT) -#if defined(M1310) || ( (defined(M1400) || defined(M1500) ) && ( !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) )) +#if defined(M1310) File gid_File_Dl_Msvcp71 TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; |