summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-08-03 17:39:56 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-08-06 10:33:46 +0100
commitd10065ea3a45ef27f2d29ee75c3a51b1fd253431 (patch)
tree74f8b72e8bb0f2dd5fe9a961290f0e8628e6f53c /scp2
parentb2fd8230172641edbd2a4f67e214c44ce740b4b2 (diff)
merge pointlessly fragmented chart2 libraries, leaving controller split.
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/file_library_ooo.scp4
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp4
2 files changed, 2 insertions, 6 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 059412075602..8d4967cedd11 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -107,9 +107,7 @@ File gid_File_Lib_Ldapbe2
End
STD_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller)
-STD_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel)
-STD_LIB_FILE(gid_File_Lib_Charttools, charttools)
-STD_LIB_FILE(gid_File_Lib_Chartview, chartview)
+STD_LIB_FILE(gid_File_Lib_Chartcore, chartcore)
#if defined _MSC_VER
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 8c6487189466..c0b3495000ee 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -198,10 +198,8 @@ Module gid_Module_Root_Files_4
gid_File_Filter_Itg,
gid_File_Filter_Iti,
gid_File_Lib_Bib,
- gid_File_Lib_Chartmodel,
- gid_File_Lib_Chartview,
+ gid_File_Lib_Chartcore,
gid_File_Lib_Chartcontroller,
- gid_File_Lib_Charttools,
gid_File_Lib_Ctl,
gid_File_Lib_Cui,
gid_File_Lib_Sdbt,