summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-05-22 14:28:13 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-05-22 14:28:13 +0000
commita54b9c5cd60ddb9b4c9430732cd7f9fff51cf7d4 (patch)
treee5b1dabfd4305d31ebb9532ee4e30a97c71a8c45 /scp2
parentec8293871e0da2313d4abefe665f2ff95137908a (diff)
INTEGRATION: CWS chart2mst3 (1.10.4); FILE MERGED
2007/05/15 13:02:40 bm 1.10.4.16: RESYNC: (1.51-1.52); FILE MERGED 2007/05/14 18:28:08 bm 1.10.4.15: RESYNC: (1.50-1.51); FILE MERGED 2007/02/07 16:00:58 iha 1.10.4.14: RESYNC: (1.48-1.50); FILE MERGED 2006/12/05 16:25:06 iha 1.10.4.13: remove old chart 2006/11/30 19:29:56 iha 1.10.4.12: add chart2 to patch 2006/11/24 18:51:40 bm 1.10.4.11: RESYNC: (1.47-1.48); FILE MERGED 2006/10/19 01:05:39 bm 1.10.4.10: RESYNC: (1.43-1.47); FILE MERGED 2006/06/16 13:59:52 bm 1.10.4.9: RESYNC: (1.42-1.43); FILE MERGED 2006/05/05 15:39:30 bm 1.10.4.8: RESYNC: (1.40-1.42); FILE MERGED 2006/01/25 15:26:13 bm 1.10.4.7: RESYNC: (1.26-1.40); FILE MERGED 2005/10/08 12:24:43 bm 1.10.4.6: RESYNC: (1.24-1.26); FILE MERGED 2005/07/25 20:15:22 bm 1.10.4.5: RESYNC: (1.21-1.24); FILE MERGED 2005/05/18 10:54:22 bm 1.10.4.4: RESYNC: (1.17-1.21); FILE MERGED 2005/03/18 00:55:56 bm 1.10.4.3: RESYNC: (1.12-1.17); FILE MERGED 2004/11/03 01:18:27 bm 1.10.4.2: RESYNC: (1.10-1.12); FILE MERGED 2004/09/01 16:12:34 bm 1.10.4.1: re-enable chart2 resource
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/file_resource_ooo.scp10
1 files changed, 3 insertions, 7 deletions
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 125dbc2fd79f..be47b7eb26c7 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -4,9 +4,9 @@
*
* $RCSfile: file_resource_ooo.scp,v $
*
- * $Revision: 1.52 $
+ * $Revision: 1.53 $
*
- * last change: $Author: kz $ $Date: 2007-05-14 09:50:23 $
+ * last change: $Author: vg $ $Date: 2007-05-22 15:28:13 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -41,9 +41,7 @@ STD_RES_FILE_PATCH( gid_File_Res_Bib, bib )
STD_RES_FILE( gid_File_Res_Cal, cal )
-// BM: #117495# remove chart2 from setup. I just comment this
-// out, because it will later be re-added
-// STD_RES_FILE( gid_File_Res_Chartcontroller, chartcontroller )
+STD_RES_FILE_PATCH( gid_File_Res_Chartcontroller, chartcontroller )
STD_RES_FILE( gid_File_Res_Dba, dba)
@@ -92,8 +90,6 @@ STD_RES_FILE( gid_File_Res_San, san )
#endif
-STD_RES_FILE_PATCH( gid_File_Res_Sch, sch )
-
//
// start binfilter #110743#
//