Removed writer_Text_encoded type; merged it with generic_Text.

Change-Id: I95c04f954026047e48976451eb755340d005d773

8 files changed, 33 insertions, 46 deletions

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 0c2229639d98..f08a04bea5c2 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -329,7 +329,6 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter
 	writer_T602_Document \
 	writer_LotusWordPro_Document \
 	generic_Text \
-	writer_Text_encoded \
 	writer_MIZI_Hwp_97 \
 	writer_StarOffice_XML_Writer_Template \
 	pdf_Portable_Document_Format \
diff --git a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
index d8e98a83e284..1669462a8cfa 100644
--- a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
+++ b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
@@ -100,7 +100,7 @@ import util.utils;
  * Example:
  *
  * Writer6_1;Writer/Writer6.sxw;writer_StarOffice_XML_Writer;writer_StarOffice_XML_Writer
- * text1;Writer/Text.txt;writer_Text_encoded:generic_Text;writer_Text_encoded:generic_Text
+ * text1;Writer/Text.txt:generic_Text:generic_Text
  *
  * The first example shows you the following:
  * <code>Writer6_1</code> is a free chosen name
@@ -109,10 +109,10 @@ import util.utils;
  * <code>writer_StarOffice_XML_Writer</code>: this is the default file type of
  * this file
  *
- * The second example displays two document types for <code>XInputStream</CODE>
- * (<code>writer_Text_encoded</CODE> and <code>generic_Text</CODE>. This two
- * document types are listed by a colon ':' as separator. This is needed because
- * XInputStream can detect a text file as writer_Text_encoded as well as
+ * The second example displays two document types for
+ * <code>XInputStream</CODE> (<code>generic_Text</CODE>). This
+ * two document types are listed by a colon ':' as separator.
+ * This is needed because XInputStream can detect a text file as
  * generic_Text.
  * <p>
  *
diff --git a/filter/qa/complex/filter/detection/typeDetection/files.csv b/filter/qa/complex/filter/detection/typeDetection/files.csv
index 9a3cb3b71cb3..aaeb772fa99e 100644
--- a/filter/qa/complex/filter/detection/typeDetection/files.csv
+++ b/filter/qa/complex/filter/detection/typeDetection/files.csv
@@ -10,7 +10,7 @@ fileAlias;fileURL;defaultFileType;streamFileType
 # W R I T E R   D O C U M E N T S
 #################################
 rtf1;Writer/AoE2a.rtf;writer_Rich_Text_Format;writer_Rich_Text_Format;writer_Rich_Text_Format
-text1;Writer/Text_DOS.txt;writer_Text_encoded:generic_Text;writer_Text_encoded:generic_Text
+text1;Writer/Text_DOS.txt;generic_Text;generic_Text
 Word2000_document;Writer/Word2000.doc;writer_MS_Word_97;writer_MS_Word_97
 Word2000_template;Writer/Word2000_template.dot;writer_MS_Word_97_Vorlage;writer_MS_Word_97_Vorlage
 Word6_document;Writer/Word6.doc;writer_MS_WinWord_60;writer_MS_WinWord_60
@@ -29,24 +29,24 @@ Writer5_template;Writer/Writer5_template.vor;writer_StarWriter_50_VorlageTemplat
 Writer6_document;Writer/Writer6.sxw;writer_StarOffice_XML_Writer;writer_StarOffice_XML_Writer
 Writer6_template;Writer/Writer6_template.stw;writer_StarOffice_XML_Writer_Template;writer_StarOffice_XML_Writer
 Writer6_html;Writer/WriterWeb.html;generic_HTML;generic_HTML
-ApiPro3;Writer/AmiPro_3x.sam;writer_Text_encoded:generic_Text;writer_Text_encoded:generic_Text
-Applix;Writer/Applix.aw;writer_Text_encoded:generic_Text;writer_Text_encoded:generic_Text
-Text2;Writer/Counterstrike I.txt;writer_Text_encoded:generic_Text;writer_Text_encoded:generic_Text
-FrameMake_document;Writer/FrameMaker.mif;writer_Text_encoded:generic_Text;writer_Text_encoded:generic_Text
-WordPro_Hangul;Writer/HangulWordPro.hwp;writer_Text_encoded:generic_Text;writer_Text_encoded:generic_Text
+ApiPro3;Writer/AmiPro_3x.sam;generic_Text;generic_Text
+Applix;Writer/Applix.aw;generic_Text;generic_Text
+Text2;Writer/Counterstrike I.txt;generic_Text;generic_Text
+FrameMake_document;Writer/FrameMaker.mif;generic_Text;generic_Text
+WordPro_Hangul;Writer/HangulWordPro.hwp;generic_Text;generic_Text
 Ichitaro;Writer/Ichitaro.jtd;writer_JustSystem_Ichitaro_10;writer_JustSystem_Ichitaro_10
-MacWord5_document;Writer/MacWord_5.mcw;writer_Text_encoded:generic_Text;writer_Text_encoded:generic_Text
+MacWord5_document;Writer/MacWord_5.mcw;generic_Text;generic_Text
 rtf2;Writer/RTF.rtf;writer_Rich_Text_Format;writer_Rich_Text_Format
 wps2000_document;Writer/WPS_2000.wps;writer_WPSSystem_WPS2000_10;writer_WPSSystem_WPS2000_10
-WinWord2_document;Writer/WinWord_2x.doc;writer_Text_encoded:generic_Text;writer_Text_encoded:generic_Text
+WinWord2_document;Writer/WinWord_2x.doc;generic_Text;generic_Text
 WinWord6_95_document;Writer/WinWord_6_95.doc;writer_MS_WinWord_60;writer_MS_WinWord_60
 WinWord97_2000_XP_document;Writer/Winword_97_2000_xp.doc;writer_MS_Word_97;writer_MS_Word_97
-WordPerfect;Writer/WordPerfect.wpd;writer_Text_encoded:generic_Text;writer_Text_encoded:generic_Text
-csv2;Writer/Text_CSV.txt;writer_Text_encoded:generic_Text;writer_Text_encoded:generic_Text
+WordPerfect;Writer/WordPerfect.wpd;generic_Text;generic_Text
+csv2;Writer/Text_CSV.txt;generic_Text;generic_Text
 ###################################
 # C A L C   D O C U M E N T S
 ##################################
-csv1;Calc/Text_CSV.csv;generic_Text;writer_Text_encoded:generic_Text
+csv1;Calc/Text_CSV.csv;generic_Text;generic_Text
 Calc1;Calc/Calc1.SDC;calc_StarCalc_10;calc_StarCalc_10
 Calc2_document;Calc/Calc3.SDC;calc_StarCalc_30_VorlageTemplate;calc_StarCalc_30
 Calc2_template;Calc/Calc3.vor;calc_StarCalc_30;calc_StarCalc_30
@@ -56,7 +56,7 @@ Calc5_document;Calc/Calc5.sdc;calc_StarCalc_50;calc_StarCalc_50
 Calc5_template;Calc/Calc5.vor;calc_StarCalc_50_VorlageTemplate;calc_StarCalc_50
 Calc6_document;Calc/Calc_6.stc;calc_StarOffice_XML_Calc;calc_StarOffice_XML_Calc
 Calc6_template;Calc/Calc_6.sxc;calc_StarOffice_XML_Calc_Template;calc_StarOffice_XML_Calc
-dif;Calc/DIF.DIF;calc_DIF;writer_Text_encoded:generic_Text
+dif;Calc/DIF.DIF;calc_DIF;generic_Text
 Excel2;Calc/Excel2.XLS;calc_MS_Excel_40;calc_MS_Excel_40
 Excel3;Calc/Excel3.XLS;calc_MS_Excel_40;calc_MS_Excel_40
 Excel4_document;Calc/Excel4.XLS;calc_MS_Excel_40;calc_MS_Excel_40
@@ -69,9 +69,9 @@ Excel97_template;Calc/Excel97_2000_XP.xlt;calc_MS_Excel_97;calc_MS_Excel_97
 Calc_html;Calc/HTML_Calc.html;generic_HTML;generic_HTML
 Lotus;Calc/Lotus.WK1;writer_Lotus_1_2_3_10_DOS_StarWriter;writer_Lotus_1_2_3_10_DOS_StarWriter
 Calc_rtf;Calc/RTF_StarOffice_Calc.rtf;writer_Rich_Text_Format;writer_Rich_Text_Format
-slk;Calc/SYLK.SLK;calc_SYLK;writer_Text_encoded:writer_Text_encoded
+slk;Calc/SYLK.SLK;calc_SYLK;generic_Text
 Webpagequery;Calc/Webpagequery.html;generic_HTML;generic_HTML
-dbase;Calc/dbase.DBF;calc_dBase;writer_Text_encoded
+dbase;Calc/dbase.DBF;calc_dBase;generic_Text
 ######################################################
 # D R A W
 ######################################################
@@ -99,19 +99,19 @@ Impress5_template;Impress/imp9.vor;impress_StarImpress_50_Vorlage;impress_StarIm
 # G R A P H I C S
 ######################################################
 bitmap;Graphics/pic.bmp;bmp_MS_Windows;bmp_MS_Windows
-emf;Graphics/pic.emf;emf_MS_Windows_Metafile;emf_MS_Windows_Metafile:writer_Text_encoded:generic_Text
+emf;Graphics/pic.emf;emf_MS_Windows_Metafile;emf_MS_Windows_Metafile:generic_Text
 eps;Graphics/pic.eps;eps_Encapsulated_PostScript;eps_Encapsulated_PostScript
 gif;Graphics/pic.gif;gif_Graphics_Interchange;gif_Graphics_Interchange
 jpg;Graphics/pic.jpg;jpg_JPEG;jpg_JPEG
-met;Graphics/pic.met;met_OS2_Metafile;met_OS2_Metafile:writer_Text_encoded:generic_Text
+met;Graphics/pic.met;met_OS2_Metafile;met_OS2_Metafile:generic_Text
 pbm;Graphics/pic.pbm;pbm_Portable_Bitmap;pbm_Portable_Bitmap
 pct;Graphics/pic.pct;pct_Mac_Pict;pct_Mac_Pict
 pgm;Graphics/pic.pgm;pgm_Portable_Graymap;pgm_Portable_Graymap
 png;Graphics/pic.png;png_Portable_Network_Graphic;png_Portable_Network_Graphic
 ppm;Graphics/pic.ppm;ppm_Portable_Pixelmap;ppm_Portable_Pixelmap
 ras;Graphics/pic.ras;ras_Sun_Rasterfile;ras_Sun_Rasterfile
-svm;Graphics/pic.svm;svm_StarView_Metafile;svm_StarView_Metafile:writer_Text_encoded:generic_Text
-tif;Graphics/pic.tif;tif_Tag_Image_File;tif_Tag_Image_File:writer_Text_encoded:generic_Text
-wmf;Graphics/pic.wmf;wmf_MS_Windows_Metafile;wmf_MS_Windows_Metafile:writer_Text_encoded:generic_Text
+svm;Graphics/pic.svm;svm_StarView_Metafile;svm_StarView_Metafile:generic_Text
+tif;Graphics/pic.tif;tif_Tag_Image_File;tif_Tag_Image_File:generic_Text
+wmf;Graphics/pic.wmf;wmf_MS_Windows_Metafile;wmf_MS_Windows_Metafile:generic_Text
 
 
diff --git a/filter/qa/complex/filter/detection/typeDetection/preselectedFilter.csv b/filter/qa/complex/filter/detection/typeDetection/preselectedFilter.csv
index c7055a2bccf8..ccf4d864c341 100644
--- a/filter/qa/complex/filter/detection/typeDetection/preselectedFilter.csv
+++ b/filter/qa/complex/filter/detection/typeDetection/preselectedFilter.csv
@@ -1,6 +1,6 @@
 fileAlias;FilterName;FilterOptions;FilterData;expectedFileType
-text1;%SO6productname %SO6formatversion Textdokument;;;writer_Text_encoded:generic_Text
-csv1;%SO6productname %SO6formatversion Textdokument;;;writer_Text_encoded:generic_Text
+text1;%SO6productname %SO6formatversion Textdokument;;;generic_Text
+csv1;%SO6productname %SO6formatversion Textdokument;;;generic_Text
 csv1;Text - txt - csv (StarCalc);;;generic_Text
-csv2;%SO6productname %SO6formatversion Textdokument;;;writer_Text_encoded:generic_Text
+csv2;%SO6productname %SO6formatversion Textdokument;;;generic_Text
 csv2;Text - txt - csv (StarCalc);;;generic_Text
diff --git a/filter/qa/complex/filter/detection/typeDetection/preselectedType.csv b/filter/qa/complex/filter/detection/typeDetection/preselectedType.csv
index ec6a6d80f41f..07abce185a1b 100644
--- a/filter/qa/complex/filter/detection/typeDetection/preselectedType.csv
+++ b/filter/qa/complex/filter/detection/typeDetection/preselectedType.csv
@@ -1,6 +1,6 @@
 fileAlias;preselectFileType;expectFileType
-csv1;generic_Text;writer_Text_encoded:generic_Text
 csv1;generic_Text;generic_Text
-#csv2;writer_Text_encoded
+csv1;generic_Text;generic_Text
+#csv2;generic_Text
 #csv2;generic_Text
-text1;writer_Text_encoded;writer_Text_encoded:generic_Text
\ No newline at end of file
+text1;generic_Text;generic_Text
\ No newline at end of file
diff --git a/filter/qa/complex/filter/detection/typeDetection/serviceName.csv b/filter/qa/complex/filter/detection/typeDetection/serviceName.csv
index 34f941ad0f12..1e174fa85302 100644
--- a/filter/qa/complex/filter/detection/typeDetection/serviceName.csv
+++ b/filter/qa/complex/filter/detection/typeDetection/serviceName.csv
@@ -1,6 +1,6 @@
 fileAlias;serviceName;expectedType
 text1;com.sun.star.text.FormatDetector
-csv1;com.sun.star.text.FormatDetector;writer_Text_encoded
+csv1;com.sun.star.text.FormatDetector;generic_Text
 csv1;com.sun.star.comp.filters.PlainTextFilterDetect;generic_Text
-csv2;com.sun.star.text.FormatDetector;writer_Text_encoded
+csv2;com.sun.star.text.FormatDetector;generic_Text
 csv2;com.sun.star.comp.filters.PlainTextFilterDetect;generic_Text
diff --git a/filter/source/config/fragments/filters/Text__encoded_.xcu b/filter/source/config/fragments/filters/Text__encoded_.xcu
index a0b19b9b32bb..a27c3c7cf5a1 100644
--- a/filter/source/config/fragments/filters/Text__encoded_.xcu
+++ b/filter/source/config/fragments/filters/Text__encoded_.xcu
@@ -4,7 +4,7 @@
         <prop oor:name="FilterService"/>
         <prop oor:name="UserData"><value>TEXT_DLG</value></prop>
         <prop oor:name="FileFormatVersion"><value>0</value></prop>
-        <prop oor:name="Type"><value>writer_Text_encoded</value></prop>
+        <prop oor:name="Type"><value>generic_Text</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
     </node>
diff --git a/filter/source/config/fragments/types/writer_Text_encoded.xcu b/filter/source/config/fragments/types/writer_Text_encoded.xcu
deleted file mode 100644
index 6959f61c4dba..000000000000
--- a/filter/source/config/fragments/types/writer_Text_encoded.xcu
+++ /dev/null
@@ -1,12 +0,0 @@
-    <node oor:name="writer_Text_encoded" oor:op="replace" >
-        <prop oor:name="DetectService"><value>com.sun.star.text.FormatDetector</value></prop>
-        <prop oor:name="URLPattern"/>
-        <prop oor:name="Extensions"><value>txt</value></prop>
-        <prop oor:name="MediaType"><value>text/plain</value></prop>
-        <prop oor:name="Preferred"><value>false</value></prop>
-        <prop oor:name="PreferredFilter"><value>Text (encoded)</value></prop>
-        <prop oor:name="UIName">
-            <value>Text - encoded</value>
-        </prop>
-        <prop oor:name="ClipboardFormat"/>
-    </node>