summaryrefslogtreecommitdiff
path: root/scp2/source/canvas/canvascommons.scp
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-04-15 09:39:45 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-04-15 09:39:45 +0000
commit65656062e65157fc81723b51ffd3a20daa3b7497 (patch)
tree5809d86e8706aba59688aefbc1a62ce8734d2663 /scp2/source/canvas/canvascommons.scp
parentdc164009f20785fa22f24f0985912f0842363419 (diff)
INTEGRATION: CWS native140 (1.9.156); FILE MERGED
2008/03/31 15:12:23 is 1.9.156.1: #i87653# removing all PATCH flags
Diffstat (limited to 'scp2/source/canvas/canvascommons.scp')
-rw-r--r--scp2/source/canvas/canvascommons.scp16
1 files changed, 8 insertions, 8 deletions
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index 4e3284597b7f..bded4cd38f5a 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: canvascommons.scp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
* This file is part of OpenOffice.org.
*
@@ -32,25 +32,25 @@
File gid_File_Oo_Office_Canvas_Xcs
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
Name = "/registry/schema/org/openoffice/Office/Canvas.xcs";
End
File gid_File_Oo_Office_Canvas_Xcu
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
Name = "/registry/data/org/openoffice/Office/Canvas.xcu";
End
-STD_LIB_FILE_PATCH(gid_File_Lib_CppCanvas, cppcanvas)
-STD_LIB_FILE_PATCH(gid_File_Lib_CanvasTools, canvastools)
+STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas)
+STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools)
#ifdef ENABLE_AGG
#ifndef SYSTEM_AGG
-STD_LIB_FILE_PATCH(gid_File_Lib_Agg, agg)
+STD_LIB_FILE(gid_File_Lib_Agg, agg)
#endif
#endif
-SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(gid_File_CanvasFactory, canvasfactory.uno)
-SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(gid_File_SimpleCanvas, simplecanvas.uno)
+SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno)
+SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno)