summaryrefslogtreecommitdiff
path: root/scp2/source/canvas/canvascommons.scp
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-11-02 13:07:37 +0000
committerKurt Zenker <kz@openoffice.org>2005-11-02 13:07:37 +0000
commit6ed3f7ab8109aa8b04d174c6072bf20dbaea4f7a (patch)
treebb4d97907f0a956f2ca2c2ae7d1b15362be68580 /scp2/source/canvas/canvascommons.scp
parent842382acff4abd153813700583ae3d3f3c0566a2 (diff)
INTEGRATION: CWS canvas02 (1.4.52); FILE MERGED
2005/10/27 13:38:51 thb 1.4.52.3: #i48939# Changed agg module to now provide a dynamic lib (here: of course, a dll needs to be packed) 2005/10/26 19:23:56 thb 1.4.52.2: #i48939# Now needing agg for canvas 2005/10/25 22:31:02 thb 1.4.52.1: #i48939# #i50201# #i51362# #i52235# #i52876# #i53461# #i53538# #i53964# #i54035# #i54960# #i55166# #i55756# #i56205# #118732# #122302# #124780# #i50485# #125760# #i56550#: Added patch flags for CWS canvas02
Diffstat (limited to 'scp2/source/canvas/canvascommons.scp')
-rw-r--r--scp2/source/canvas/canvascommons.scp11
1 files changed, 6 insertions, 5 deletions
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index 806026cde206..6b85a536588b 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -1,12 +1,12 @@
/*************************************************************************
-*
+ *
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: canvascommons.scp,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: hr $ $Date: 2005-09-23 14:29:49 $
+ * last change: $Author: kz $ $Date: 2005-11-02 14:07:37 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -36,5 +36,6 @@
#include "macros.inc"
STD_LIB_FILE_PATCH(gid_File_Lib_CppCanvas, cppcanvas)
-STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools)
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno)
+STD_LIB_FILE_PATCH(gid_File_Lib_CanvasTools, canvastools)
+STD_LIB_FILE_PATCH(gid_File_Lib_Agg, agg)
+SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(gid_File_CanvasFactory, canvasfactory.uno)