summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2008-01-15 12:31:47 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2008-01-15 12:31:47 +0000
commit124c435d718a2a847160f689379e16c9fa3048e9 (patch)
tree1a2320c60da2cd764d243835416a658522b9784f /scp2
parent0b72cb80645d9c782928e996a156d1c5edd86fc5 (diff)
INTEGRATION: CWS obo21 (1.4.398); FILE MERGED
2007/12/12 12:41:37 obo 1.4.398.1: #i84233# Change for .Net 2008 / Vista SDK
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/canvas/directxcanvas.scp11
1 files changed, 7 insertions, 4 deletions
diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp
index 73968c570c2d..9b47c21fb2e8 100644
--- a/scp2/source/canvas/directxcanvas.scp
+++ b/scp2/source/canvas/directxcanvas.scp
@@ -4,9 +4,9 @@
*
* $RCSfile: directxcanvas.scp,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: kz $ $Date: 2006-12-13 16:12:41 $
+ * last change: $Author: ihi $ $Date: 2008-01-15 13:31:47 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -36,8 +36,11 @@
#include "macros.inc"
#ifdef WNT
-
+#if defined(M1300) || defined(M1400) || defined(_gcc3)
SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(gid_File_Lib_DirectXCanvas, directxcanvas.uno)
-SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(gid_File_Lib_DirectX9Canvas, directx9canvas.uno)
+#endif
+#endif
+#ifdef WNT
+SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(gid_File_Lib_DirectX9Canvas, directx9canvas.uno)
#endif