From e838919d425116dbcdb941d1d5b112dc808c4153 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Wed, 2 Nov 2005 13:08:05 +0000 Subject: [PATCH] INTEGRATION: CWS canvas02 (1.2.70); FILE MERGED 2005/10/25 22:31:02 thb 1.2.70.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 --- scp2/source/canvas/directxcanvas.scp | 12 +++--------- scp2/source/canvas/vclcanvas.scp | 16 +++------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp index d637e525fc99..b3cecb4d1bf5 100644 --- a/scp2/source/canvas/directxcanvas.scp +++ b/scp2/source/canvas/directxcanvas.scp @@ -4,9 +4,9 @@ * * $RCSfile: directxcanvas.scp,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-09 01:23:10 $ + * last change: $Author: kz $ $Date: 2005-11-02 14:07:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,12 +37,6 @@ #ifdef WNT -File gid_File_Lib_DirectXCanvas - TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; - Name = "directxcanvas.uno.dll"; -End +SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(gid_File_Lib_DirectXCanvas, directxcanvas.uno) #endif diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp index ee375698fc30..1620caa08414 100644 --- a/scp2/source/canvas/vclcanvas.scp +++ b/scp2/source/canvas/vclcanvas.scp @@ -4,9 +4,9 @@ * * $RCSfile: vclcanvas.scp,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-09 01:23:40 $ + * last change: $Author: kz $ $Date: 2005-11-02 14:08:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,14 +35,4 @@ #include "macros.inc" -File gid_File_Lib_VCLCanvas - TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; - #ifdef UNX - Name = STRING(CONCAT2(vclcanvas.uno,UNXSUFFIX)); - #else - Name = "vclcanvas.uno.dll"; - #endif -End +SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(gid_File_Lib_VCLCanvas, vclcanvas.uno)