diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 10:28:22 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 10:28:22 +0000 |
| commit | 375f9b5c0895898b96d8863ed4125cb60aeb7bd1 (patch) | |
| tree | 9035095cc0e2d14bc3a7210ef33e7d0f87fcb238 | |
| parent | 5be3d0a9df6ac898ec2b9163c4c1f3fd7beab994 (diff) | |
INTEGRATION: CWS obo12 (1.230.10); FILE MERGED
2007/05/30 12:44:58 obo 1.230.10.2: RESYNC: (1.230-1.234); FILE MERGED
2007/05/23 13:09:19 obo 1.230.10.1: #i76713# Windows Vista PSDK DISABLE_ATL, DISABLE_ADO
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 8237c2b68909..21604d6a60e7 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -4,9 +4,9 @@ * * $RCSfile: file_library_ooo.scp,v $ * - * $Revision: 1.237 $ + * $Revision: 1.238 $ * - * last change: $Author: vg $ $Date: 2007-05-25 15:23:45 $ + * last change: $Author: ihi $ $Date: 2007-06-05 11:28:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -69,7 +69,7 @@ End #endif -#ifdef WNT +#if defined(WNT) && !defined(DISABLE_ADO) File gid_File_Lib_Ado_2 TXT_FILE_BODY; @@ -779,9 +779,12 @@ End #endif SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Embobj,embobj) + +#ifndef DISABLE_ATL SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Emboleobj,emboleobj) +#endif -#ifdef WNT +#if defined(WNT) && !defined(DISABLE_ATL) STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Emser , emser) @@ -1599,7 +1602,7 @@ End #endif #endif -#if defined(WNT) +#if defined(WNT) && !defined(DISABLE_ATL) File gid_File_Lib_Ole TXT_FILE_BODY; @@ -2657,4 +2660,3 @@ File gid_File_Lib_Onlinecheck Name = "onlinecheck.dll"; End #endif - |