Skip to content

C
core
Kaydet (Commit) 9036eea4 authored tarafından Kohei Yoshida's avatar Kohei Yoshida
Dosyalara gözat
Seçenekler

Removed writer_Text_encoded type; merged it with generic_Text. 

Change-Id: I95c04f954026047e48976451eb755340d005d773
üst 9a7d3d47
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 49 deletions
filter/Configuration_filter.mk
Dosyayı görüntüle @ 9036eea4
...@@ -329,7 +329,6 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter ...@@ -329,7 +329,6 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter
writer_T602_Document \ writer_T602_Document \
writer_LotusWordPro_Document \ writer_LotusWordPro_Document \
generic_Text \ generic_Text \
writer_Text_encoded \
writer_MIZI_Hwp_97 \ writer_MIZI_Hwp_97 \
writer_StarOffice_XML_Writer_Template \ writer_StarOffice_XML_Writer_Template \
pdf_Portable_Document_Format \ pdf_Portable_Document_Format \
......
filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
Dosyayı görüntüle @ 9036eea4
...@@ -100,7 +100,7 @@ import util.utils; ...@@ -100,7 +100,7 @@ import util.utils;
* Example: * Example:
* *
* Writer6_1;Writer/Writer6.sxw;writer_StarOffice_XML_Writer;writer_StarOffice_XML_Writer * 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: * The first example shows you the following:
* <code>Writer6_1</code> is a free chosen name * <code>Writer6_1</code> is a free chosen name
...@@ -109,10 +109,10 @@ import util.utils; ...@@ -109,10 +109,10 @@ import util.utils;
* <code>writer_StarOffice_XML_Writer</code>: this is the default file type of * <code>writer_StarOffice_XML_Writer</code>: this is the default file type of
* this file * this file
* *
* The second example displays two document types for <code>XInputStream</CODE> * The second example displays two document types for
* (<code>writer_Text_encoded</CODE> and <code>generic_Text</CODE>. This two * <code>XInputStream</CODE> (<code>generic_Text</CODE>). This
* document types are listed by a colon ':' as separator. This is needed because * two document types are listed by a colon ':' as separator.
* XInputStream can detect a text file as writer_Text_encoded as well as * This is needed because XInputStream can detect a text file as
* generic_Text. * generic_Text.
* <p> * <p>
* *
......
filter/qa/complex/filter/detection/typeDetection/files.csv
Dosyayı görüntüle @ 9036eea4
...@@ -10,7 +10,7 @@ fileAlias;fileURL;defaultFileType;streamFileType ...@@ -10,7 +10,7 @@ fileAlias;fileURL;defaultFileType;streamFileType
# W R I T E R D O C U M E N T S # 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 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_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 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 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 ...@@ -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_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_template;Writer/Writer6_template.stw;writer_StarOffice_XML_Writer_Template;writer_StarOffice_XML_Writer
Writer6_html;Writer/WriterWeb.html;generic_HTML;generic_HTML Writer6_html;Writer/WriterWeb.html;generic_HTML;generic_HTML
ApiPro3;Writer/AmiPro_3x.sam;writer_Text_encoded:generic_Text;writer_Text_encoded:generic_Text ApiPro3;Writer/AmiPro_3x.sam;generic_Text;generic_Text
Applix;Writer/Applix.aw;writer_Text_encoded:generic_Text;writer_Text_encoded:generic_Text Applix;Writer/Applix.aw;generic_Text;generic_Text
Text2;Writer/Counterstrike I.txt;writer_Text_encoded:generic_Text;writer_Text_encoded:generic_Text Text2;Writer/Counterstrike I.txt;generic_Text;generic_Text
FrameMake_document;Writer/FrameMaker.mif;writer_Text_encoded:generic_Text;writer_Text_encoded:generic_Text FrameMake_document;Writer/FrameMaker.mif;generic_Text;generic_Text
WordPro_Hangul;Writer/HangulWordPro.hwp;writer_Text_encoded:generic_Text;writer_Text_encoded:generic_Text WordPro_Hangul;Writer/HangulWordPro.hwp;generic_Text;generic_Text
Ichitaro;Writer/Ichitaro.jtd;writer_JustSystem_Ichitaro_10;writer_JustSystem_Ichitaro_10 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 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 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 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 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 WordPerfect;Writer/WordPerfect.wpd;generic_Text;generic_Text
csv2;Writer/Text_CSV.txt;writer_Text_encoded:generic_Text;writer_Text_encoded:generic_Text csv2;Writer/Text_CSV.txt;generic_Text;generic_Text
################################### ###################################
# C A L C D O C U M E N T S # 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 Calc1;Calc/Calc1.SDC;calc_StarCalc_10;calc_StarCalc_10
Calc2_document;Calc/Calc3.SDC;calc_StarCalc_30_VorlageTemplate;calc_StarCalc_30 Calc2_document;Calc/Calc3.SDC;calc_StarCalc_30_VorlageTemplate;calc_StarCalc_30
Calc2_template;Calc/Calc3.vor;calc_StarCalc_30;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 ...@@ -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 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_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 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 Excel2;Calc/Excel2.XLS;calc_MS_Excel_40;calc_MS_Excel_40
Excel3;Calc/Excel3.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 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 ...@@ -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 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 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 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 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 # D R A W
###################################################### ######################################################
...@@ -99,19 +99,19 @@ Impress5_template;Impress/imp9.vor;impress_StarImpress_50_Vorlage;impress_StarIm ...@@ -99,19 +99,19 @@ Impress5_template;Impress/imp9.vor;impress_StarImpress_50_Vorlage;impress_StarIm
# G R A P H I C S # G R A P H I C S
###################################################### ######################################################
bitmap;Graphics/pic.bmp;bmp_MS_Windows;bmp_MS_Windows 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 eps;Graphics/pic.eps;eps_Encapsulated_PostScript;eps_Encapsulated_PostScript
gif;Graphics/pic.gif;gif_Graphics_Interchange;gif_Graphics_Interchange gif;Graphics/pic.gif;gif_Graphics_Interchange;gif_Graphics_Interchange
jpg;Graphics/pic.jpg;jpg_JPEG;jpg_JPEG 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 pbm;Graphics/pic.pbm;pbm_Portable_Bitmap;pbm_Portable_Bitmap
pct;Graphics/pic.pct;pct_Mac_Pict;pct_Mac_Pict pct;Graphics/pic.pct;pct_Mac_Pict;pct_Mac_Pict
pgm;Graphics/pic.pgm;pgm_Portable_Graymap;pgm_Portable_Graymap pgm;Graphics/pic.pgm;pgm_Portable_Graymap;pgm_Portable_Graymap
png;Graphics/pic.png;png_Portable_Network_Graphic;png_Portable_Network_Graphic png;Graphics/pic.png;png_Portable_Network_Graphic;png_Portable_Network_Graphic
ppm;Graphics/pic.ppm;ppm_Portable_Pixelmap;ppm_Portable_Pixelmap ppm;Graphics/pic.ppm;ppm_Portable_Pixelmap;ppm_Portable_Pixelmap
ras;Graphics/pic.ras;ras_Sun_Rasterfile;ras_Sun_Rasterfile 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 svm;Graphics/pic.svm;svm_StarView_Metafile;svm_StarView_Metafile:generic_Text
tif;Graphics/pic.tif;tif_Tag_Image_File;tif_Tag_Image_File:writer_Text_encoded: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:writer_Text_encoded:generic_Text wmf;Graphics/pic.wmf;wmf_MS_Windows_Metafile;wmf_MS_Windows_Metafile:generic_Text
filter/qa/complex/filter/detection/typeDetection/preselectedFilter.csv
Dosyayı görüntüle @ 9036eea4
fileAlias;FilterName;FilterOptions;FilterData;expectedFileType fileAlias;FilterName;FilterOptions;FilterData;expectedFileType
text1;%SO6productname %SO6formatversion Textdokument;;;writer_Text_encoded:generic_Text text1;%SO6productname %SO6formatversion Textdokument;;;generic_Text
csv1;%SO6productname %SO6formatversion Textdokument;;;writer_Text_encoded:generic_Text csv1;%SO6productname %SO6formatversion Textdokument;;;generic_Text
csv1;Text - txt - csv (StarCalc);;;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 csv2;Text - txt - csv (StarCalc);;;generic_Text
filter/qa/complex/filter/detection/typeDetection/preselectedType.csv
Dosyayı görüntüle @ 9036eea4
fileAlias;preselectFileType;expectFileType fileAlias;preselectFileType;expectFileType
csv1;generic_Text;writer_Text_encoded:generic_Text
csv1;generic_Text;generic_Text csv1;generic_Text;generic_Text
#csv2;writer_Text_encoded csv1;generic_Text;generic_Text
#csv2;generic_Text
#csv2;generic_Text #csv2;generic_Text
text1;writer_Text_encoded;writer_Text_encoded:generic_Text text1;generic_Text;generic_Text
\ No newline at end of file \ No newline at end of file
filter/qa/complex/filter/detection/typeDetection/serviceName.csv
Dosyayı görüntüle @ 9036eea4
fileAlias;serviceName;expectedType fileAlias;serviceName;expectedType
text1;com.sun.star.text.FormatDetector 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 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 csv2;com.sun.star.comp.filters.PlainTextFilterDetect;generic_Text
filter/source/config/fragments/filters/Text__encoded_.xcu
Dosyayı görüntüle @ 9036eea4
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<prop oor:name="FilterService"/> <prop oor:name="FilterService"/>
<prop oor:name="UserData"><value>TEXT_DLG</value></prop> <prop oor:name="UserData"><value>TEXT_DLG</value></prop>
<prop oor:name="FileFormatVersion"><value>0</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="TemplateName"/>
<prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop> <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
</node> </node>
filter/source/config/fragments/types/writer_Text_encoded.xcu deleted 100644 → 0
Dosyayı görüntüle @ 9a7d3d47
<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>
sc/source/ui/vba/vbaworkbooks.cxx
Dosyayı görüntüle @ 9036eea4
...@@ -195,8 +195,7 @@ ScVbaWorkbooks::isTextFile( const rtl::OUString& sType ) ...@@ -195,8 +195,7 @@ ScVbaWorkbooks::isTextFile( const rtl::OUString& sType )
// c) unknown // c) unknown
// returning true basically means treat this like a csv file // returning true basically means treat this like a csv file
const static rtl::OUString txtType("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.isEmpty();
return sType.equals( txtType ) || sType.isEmpty() || sType.equals( encodedTxtType );
} }
bool bool
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment