remove STD_FILTER_FILE -- its essentially the same as STD_LIB_FILE

Change-Id: I98019eabc170b638275531036012cf8812e7f43c

4 files changed, 26 insertions, 34 deletions

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index fd336d01b67f..1b537aabaf38 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -43,14 +43,12 @@
 
 #ifdef UNX
     #define LIBNAME(name)                     STRING(CONCAT4(lib,name,DLLPOSTFIX,UNXSUFFIX))
-    #define FILTER_LIBNAME(name)              LIBNAME(name)
     #define EXENAME(name)                     STRING(name)
     #define PROFILENAME(name)                 STRING(CONCAT2(name,rc))
     #define SPECIAL_NAME(name)                STRING(CONCAT3(lib,name,UNXSUFFIX))
     #define SPECIAL_COMPONENT_LIB_NAME(name)  STRING(CONCAT2(name,UNXSUFFIX))
 #else
     #define LIBNAME(name)                     STRING(CONCAT3(name,DLLPOSTFIX,.dll))
-    #define FILTER_LIBNAME(name)              LIBNAME(name)
     #define EXENAME(name)                     STRING(CONCAT2(name,.exe))
     #define PROFILENAME(name)                 STRING(CONCAT2(name,.ini))
     #define SPECIAL_NAME(name)                STRING(CONCAT2(name,.dll))
@@ -120,12 +118,6 @@
         Styles  = (PACKED); \
     End
 
-#define STD_FILTER_FILE(id,name) \
-    File id \
-        PACKED_LIB_FILE_BODY; \
-        Name = FILTER_LIBNAME(name); \
-    End
-
 #define STD_FONTWIN_FILE(id,name,fontname) \
     File id \
         TXT_FILE_BODY; \
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index e76888789093..5c4105698489 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -55,7 +55,7 @@ STD_LIB_FILE( gid_File_Lib_Sc, sc)
 
 STD_LIB_FILE( gid_File_Lib_Scui, scui)
 
-STD_FILTER_FILE( gid_File_Lib_Scfilt, scfilt)
+STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
 
 STD_LIB_FILE( gid_File_Lib_Scd, scd)
 
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index ee58421a3d0f..9476149994f2 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -38,4 +38,4 @@ STD_LIB_FILE( gid_File_Lib_Flash, flash )
 
 STD_LIB_FILE( gid_File_Lib_Svg, svgfilter )
 
-STD_FILTER_FILE( gid_File_Lib_WpftDraw, wpftdraw )
+STD_LIB_FILE( gid_File_Lib_WpftDraw, wpftdraw )
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 39362a7ad3b8..a5c2eb952943 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -334,53 +334,53 @@ File gid_File_Dtd_Toolbar
     Name = "toolbar.dtd";
 End
 
-STD_FILTER_FILE( gid_File_Filter_Sdfilt, sdfilt)
+STD_LIB_FILE( gid_File_Filter_Sdfilt, sdfilt)
 
-STD_FILTER_FILE( git_File_Filter_Svgio, svgio)
+STD_LIB_FILE( git_File_Filter_Svgio, svgio)
 
-STD_FILTER_FILE( gid_File_Filter_Eme, eme)
+STD_LIB_FILE( gid_File_Filter_Eme, eme)
 
-STD_FILTER_FILE( gid_File_Filter_Icg, icg)
+STD_LIB_FILE( gid_File_Filter_Icg, icg)
 
-STD_FILTER_FILE( gid_File_Filter_Egi, egi)
+STD_LIB_FILE( gid_File_Filter_Egi, egi)
 
-STD_FILTER_FILE( gid_File_Filter_Epb, epb)
+STD_LIB_FILE( gid_File_Filter_Epb, epb)
 
-STD_FILTER_FILE( gid_File_Filter_Epg, epg)
+STD_LIB_FILE( gid_File_Filter_Epg, epg)
 
-STD_FILTER_FILE( gid_File_Filter_Epp, epp)
+STD_LIB_FILE( gid_File_Filter_Epp, epp)
 
-STD_FILTER_FILE( gid_File_Filter_Eps, eps)
+STD_LIB_FILE( gid_File_Filter_Eps, eps)
 
-STD_FILTER_FILE( gid_File_Filter_Ept, ept)
+STD_LIB_FILE( gid_File_Filter_Ept, ept)
 
-STD_FILTER_FILE( gid_File_Filter_Era, era)
+STD_LIB_FILE( gid_File_Filter_Era, era)
 
-STD_FILTER_FILE( gid_File_Filter_Eti, eti)
+STD_LIB_FILE( gid_File_Filter_Eti, eti)
 
-STD_FILTER_FILE( gid_File_Filter_Exp, exp)
+STD_LIB_FILE( gid_File_Filter_Exp, exp)
 
-STD_FILTER_FILE( gid_File_Filter_Icd, icd)
+STD_LIB_FILE( gid_File_Filter_Icd, icd)
 
-STD_FILTER_FILE( gid_File_Filter_Idx, idx)
+STD_LIB_FILE( gid_File_Filter_Idx, idx)
 
-STD_FILTER_FILE( gid_File_Filter_Ime, ime)
+STD_LIB_FILE( gid_File_Filter_Ime, ime)
 
-STD_FILTER_FILE( gid_File_Filter_Ipb, ipb)
+STD_LIB_FILE( gid_File_Filter_Ipb, ipb)
 
-STD_FILTER_FILE( gid_File_Filter_Ipd, ipd)
+STD_LIB_FILE( gid_File_Filter_Ipd, ipd)
 
-STD_FILTER_FILE( gid_File_Filter_Ips, ips)
+STD_LIB_FILE( gid_File_Filter_Ips, ips)
 
-STD_FILTER_FILE( gid_File_Filter_Ipt, ipt)
+STD_LIB_FILE( gid_File_Filter_Ipt, ipt)
 
-STD_FILTER_FILE( gid_File_Filter_Ipx, ipx)
+STD_LIB_FILE( gid_File_Filter_Ipx, ipx)
 
-STD_FILTER_FILE( gid_File_Filter_Ira, ira)
+STD_LIB_FILE( gid_File_Filter_Ira, ira)
 
-STD_FILTER_FILE( gid_File_Filter_Itg, itg)
+STD_LIB_FILE( gid_File_Filter_Itg, itg)
 
-STD_FILTER_FILE( gid_File_Filter_Iti, iti)
+STD_LIB_FILE( gid_File_Filter_Iti, iti)
 
 STD_RES_FILE( gid_File_Res_Eps, eps )