diff options
author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-05-25 01:39:52 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-05-25 02:04:19 -0400 |
commit | f0cb3e97d2f9b5592837903d8d8ed8aaeb130c55 (patch) | |
tree | a49374b9d156fdaddce66750a84753364edac10c | |
parent | d6b68db264930528cf7ba3111f6f664fca10cfe3 (diff) |
Removed writer_Text type; combined it with generic_Text.
Change-Id: Id7d5744af4800ef5ac6bd70b97f79a76299a2e6b
12 files changed, 35 insertions, 48 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 4709bc2fce80..0c2229639d98 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -328,7 +328,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter writer_MS_Works_Document \ writer_T602_Document \ writer_LotusWordPro_Document \ - writer_Text \ + generic_Text \ writer_Text_encoded \ writer_MIZI_Hwp_97 \ writer_StarOffice_XML_Writer_Template \ @@ -394,7 +394,7 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr # fcfg_web $(call filter_Configuration_add_types,fcfg_langpack,fcfg_web_types.xcu,filter/source/config/fragments/types,\ generic_HTML \ - writer_Text \ + generic_Text \ writer_web_HTML_help \ writer_StarOffice_XML_Writer \ writer_web_StarOffice_XML_Writer_Web_Template \ @@ -427,7 +427,6 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr # fcfg_global $(call filter_Configuration_add_types,fcfg_langpack,fcfg_global_types.xcu,filter/source/config/fragments/types,\ generic_Text \ - writer_Text \ writer_StarOffice_XML_Writer \ writer_globaldocument_StarOffice_XML_Writer_GlobalDocument \ pdf_Portable_Document_Format \ @@ -456,6 +455,7 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr $(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,filter/source/config/fragments/types,\ calc_DIF \ generic_HTML \ + generic_Text \ calc_Lotus \ calc_QPro \ calc_MS_Excel_40 \ diff --git a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java index f706c4136118..d8e98a83e284 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:writer_Text;writer_Text_encoded:writer_Text + * text1;Writer/Text.txt;writer_Text_encoded:generic_Text;writer_Text_encoded:generic_Text * * The first example shows you the following: * <code>Writer6_1</code> is a free chosen name @@ -110,10 +110,10 @@ import util.utils; * this file * * The second example displays two document types for <code>XInputStream</CODE> - * (<code>writer_Text_encoded</CODE> and <code>writer_Text</CODE>. This two + * (<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 - * writer_Text. + * generic_Text. * <p> * * <H3><A name="preselectedFilter.csv"</a> diff --git a/filter/qa/complex/filter/detection/typeDetection/files.csv b/filter/qa/complex/filter/detection/typeDetection/files.csv index f5dafdd3bf05..9a3cb3b71cb3 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:writer_Text;writer_Text_encoded:writer_Text +text1;Writer/Text_DOS.txt;writer_Text_encoded:generic_Text;writer_Text_encoded: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:writer_Text;writer_Text_encoded:writer_Text -Applix;Writer/Applix.aw;writer_Text_encoded:writer_Text;writer_Text_encoded:writer_Text -Text2;Writer/Counterstrike I.txt;writer_Text_encoded:writer_Text;writer_Text_encoded:writer_Text -FrameMake_document;Writer/FrameMaker.mif;writer_Text_encoded:writer_Text;writer_Text_encoded:writer_Text -WordPro_Hangul;Writer/HangulWordPro.hwp;writer_Text_encoded:writer_Text;writer_Text_encoded:writer_Text +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 Ichitaro;Writer/Ichitaro.jtd;writer_JustSystem_Ichitaro_10;writer_JustSystem_Ichitaro_10 -MacWord5_document;Writer/MacWord_5.mcw;writer_Text_encoded:writer_Text;writer_Text_encoded:writer_Text +MacWord5_document;Writer/MacWord_5.mcw;writer_Text_encoded:generic_Text;writer_Text_encoded: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:writer_Text;writer_Text_encoded:writer_Text +WinWord2_document;Writer/WinWord_2x.doc;writer_Text_encoded:generic_Text;writer_Text_encoded: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:writer_Text;writer_Text_encoded:writer_Text -csv2;Writer/Text_CSV.txt;writer_Text_encoded:writer_Text;writer_Text_encoded:writer_Text +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 ################################### # C A L C D O C U M E N T S ################################## -csv1;Calc/Text_CSV.csv;generic_Text;writer_Text_encoded:writer_Text +csv1;Calc/Text_CSV.csv;generic_Text;writer_Text_encoded: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:writer_Text +dif;Calc/DIF.DIF;calc_DIF;writer_Text_encoded: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 @@ -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:writer_Text +emf;Graphics/pic.emf;emf_MS_Windows_Metafile;emf_MS_Windows_Metafile:writer_Text_encoded: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:writer_Text +met;Graphics/pic.met;met_OS2_Metafile;met_OS2_Metafile:writer_Text_encoded: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:writer_Text -tif;Graphics/pic.tif;tif_Tag_Image_File;tif_Tag_Image_File:writer_Text_encoded:writer_Text -wmf;Graphics/pic.wmf;wmf_MS_Windows_Metafile;wmf_MS_Windows_Metafile:writer_Text_encoded:writer_Text +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 diff --git a/filter/qa/complex/filter/detection/typeDetection/preselectedFilter.csv b/filter/qa/complex/filter/detection/typeDetection/preselectedFilter.csv index 827e1eef33ee..c7055a2bccf8 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:writer_Text -csv1;%SO6productname %SO6formatversion Textdokument;;;writer_Text_encoded:writer_Text +text1;%SO6productname %SO6formatversion Textdokument;;;writer_Text_encoded:generic_Text +csv1;%SO6productname %SO6formatversion Textdokument;;;writer_Text_encoded:generic_Text csv1;Text - txt - csv (StarCalc);;;generic_Text -csv2;%SO6productname %SO6formatversion Textdokument;;;writer_Text_encoded:writer_Text +csv2;%SO6productname %SO6formatversion Textdokument;;;writer_Text_encoded: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 701db3301608..ec6a6d80f41f 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;writer_Text;writer_Text_encoded:writer_Text +csv1;generic_Text;writer_Text_encoded:generic_Text csv1;generic_Text;generic_Text #csv2;writer_Text_encoded #csv2;generic_Text -text1;writer_Text_encoded;writer_Text_encoded:writer_Text
\ No newline at end of file +text1;writer_Text_encoded;writer_Text_encoded:generic_Text
\ No newline at end of file diff --git a/filter/source/config/fragments/filters/Text.xcu b/filter/source/config/fragments/filters/Text.xcu index ac11931b75db..4a703d3ac35c 100644 --- a/filter/source/config/fragments/filters/Text.xcu +++ b/filter/source/config/fragments/filters/Text.xcu @@ -4,7 +4,7 @@ <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>TEXT</value></prop> <prop oor:name="FileFormatVersion"><value>0</value></prop> - <prop oor:name="Type"><value>writer_Text</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/filters/Text__StarWriter_Web_.xcu b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu index 5161a52b99a7..29ad18a64281 100644 --- a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu +++ b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu @@ -4,7 +4,7 @@ <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>TEXT</value></prop> <prop oor:name="FileFormatVersion"><value>0</value></prop> - <prop oor:name="Type"><value>writer_Text</value></prop> + <prop oor:name="Type"><value>generic_Text</value></prop> <prop oor:name="TemplateName"/> <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop> </node> diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu index 2c39de832bb6..d4fd201ae225 100644 --- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu +++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.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</value></prop> + <prop oor:name="Type"><value>generic_Text</value></prop> <prop oor:name="TemplateName"/> <prop oor:name="DocumentService"><value>com.sun.star.text.GlobalDocument</value></prop> </node> diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu index f8ced3003be1..b347977765e5 100644 --- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu +++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.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</value></prop> + <prop oor:name="Type"><value>generic_Text</value></prop> <prop oor:name="TemplateName"/> <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop> </node> diff --git a/filter/source/config/fragments/types/writer_Text.xcu b/filter/source/config/fragments/types/writer_Text.xcu deleted file mode 100644 index 014c73d729b2..000000000000 --- a/filter/source/config/fragments/types/writer_Text.xcu +++ /dev/null @@ -1,12 +0,0 @@ - <node oor:name="writer_Text" 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>true</value></prop> - <prop oor:name="PreferredFilter"><value>Text</value></prop> - <prop oor:name="UIName"> - <value>Text</value> - </prop> - <prop oor:name="ClipboardFormat"/> - </node> diff --git a/qadevOOo/tests/java/mod/_fwl/TypeDetection.java b/qadevOOo/tests/java/mod/_fwl/TypeDetection.java index 4a298e8bc637..989f4c5b22af 100644 --- a/qadevOOo/tests/java/mod/_fwl/TypeDetection.java +++ b/qadevOOo/tests/java/mod/_fwl/TypeDetection.java @@ -143,7 +143,7 @@ public class TypeDetection extends TestCase { NamedValue[] querySequenze = new NamedValue[1]; NamedValue query = new NamedValue(); query.Name = "Name"; - query.Value = "writer_Text"; + query.Value = "generic_Text"; querySequenze[0] = query; diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index 2d2b0424a890..00461b120865 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -194,10 +194,9 @@ ScVbaWorkbooks::isTextFile( const rtl::OUString& sType ) // b) a csv file // c) unknown // returning true basically means treat this like a csv file - const static rtl::OUString txtType( RTL_CONSTASCII_USTRINGPARAM("writer_Text" ) ); - const static rtl::OUString csvType("generic_Text"); + const static rtl::OUString txtType("generic_Text"); const static rtl::OUString encodedTxtType( RTL_CONSTASCII_USTRINGPARAM("writer_Text_encoded" ) ); - return sType.equals( txtType ) || sType.equals( csvType ) || sType.isEmpty() || sType.equals( encodedTxtType ); + return sType.equals( txtType ) || sType.isEmpty() || sType.equals( encodedTxtType ); } bool |