summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2006-08-04 12:34:28 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2006-08-04 12:34:28 +0000
commit46cdadac894365e68564f4777fd126ab7199f0b6 (patch)
treefbb280a0df51bac56daf290596e291322ba78562
parenta056fa394325fbc33768e871d67e08a5066da9fc (diff)
INTEGRATION: CWS thbpp4 (1.6.280); FILE MERGED
2006/07/20 11:30:52 thb 1.6.280.1: #i67433# Applied geki's patch to disable agg completely
-rw-r--r--scp2/source/canvas/canvascommons.scp6
1 files changed, 4 insertions, 2 deletions
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index 5f3aadf965c6..54f10442b66b 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -4,9 +4,9 @@
*
* $RCSfile: canvascommons.scp,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: rt $ $Date: 2005-12-14 14:43:41 $
+ * last change: $Author: ihi $ $Date: 2006-08-04 13:34:28 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -37,7 +37,9 @@
STD_LIB_FILE_PATCH(gid_File_Lib_CppCanvas, cppcanvas)
STD_LIB_FILE_PATCH(gid_File_Lib_CanvasTools, canvastools)
+#ifdef ENABLE_AGG
#ifndef SYSTEM_AGG
STD_LIB_FILE_PATCH(gid_File_Lib_Agg, agg)
#endif
+#endif
SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(gid_File_CanvasFactory, canvasfactory.uno)