diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-04-19 14:33:09 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-04-19 14:38:00 +0200 |
| commit | 9284c50f975ce91fcb50e3849bbe38af50dbcb6c (patch) | |
| tree | 511f012db23292e7952cfa3a494d6a6771239656 /scp2 | |
| parent | b98c960e9707d8222dd7c8fad22e84bbfb725822 (diff) | |
Diminish the number of writerperfect libraries
Instead of a pleiade of libraries, one for graphic filters (wpftdraw)
and one for text document filters (wpftwriter) to diminish duplicate
static linking.
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/graphicfilter/file_graphicfilter.scp | 6 | ||||
| -rw-r--r-- | scp2/source/graphicfilter/module_graphicfilter.scp | 3 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 4 | ||||
| -rw-r--r-- | scp2/source/writer/module_writer.scp | 3 |
4 files changed, 4 insertions, 12 deletions
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp index 17761ded9054..ee58421a3d0f 100644 --- a/scp2/source/graphicfilter/file_graphicfilter.scp +++ b/scp2/source/graphicfilter/file_graphicfilter.scp @@ -38,8 +38,4 @@ STD_LIB_FILE( gid_File_Lib_Flash, flash ) STD_LIB_FILE( gid_File_Lib_Svg, svgfilter ) -STD_FILTER_FILE( gid_File_Lib_WPGImport, wpgimport ) - -STD_FILTER_FILE( gid_File_Lib_VisioImport, visioimport ) - -STD_FILTER_FILE( gid_File_Lib_CDRImport, cdrimport ) +STD_FILTER_FILE( gid_File_Lib_WpftDraw, wpftdraw ) diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index dd66724517a8..f428c0cf038e 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -33,7 +33,6 @@ Module gid_Module_Optional_Grfflt Sortkey = "600"; ParentID = gid_Module_Optional; Default = YES; - Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WPGImport, - gid_File_Lib_VisioImport, gid_File_Lib_CDRImport, + Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WpftDraw, gid_File_Share_Registry_Graphicfilter_Xcd); End diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 1f3b6056cee4..63b2f8f350d8 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -888,9 +888,7 @@ End #endif -STD_LIB_FILE(gid_File_Lib_Wpft,wpft) - -STD_LIB_FILE(gid_File_Lib_Msworks,msworks) +STD_LIB_FILE(gid_File_Lib_WpftWriter,wpftwriter) STD_LIB_FILE(gid_File_Lib_T602Filter,t602filter) diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp index e66214bbc71c..33b9e449e072 100644 --- a/scp2/source/writer/module_writer.scp +++ b/scp2/source/writer/module_writer.scp @@ -48,8 +48,7 @@ Module gid_Module_Prg_Wrt_Bin gid_File_Lib_Swd, gid_File_Lib_Swui, gid_File_Lib_Msword, - gid_File_Lib_Wpft, - gid_File_Lib_Msworks, + gid_File_Lib_WpftWriter, gid_File_Lib_T602Filter, gid_File_Lib_Writerfilter, gid_File_Lib_Wlwp, |