Skip to content

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

Renamed writer_web_HTML to generic_HTML. 

This should reflect the fact that this type was already used as a
generic HTML type.

Change-Id: I0a209d51ed229f07aff001075c39bfc82d4c3088
üst 552bebe6
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 30 deletions
filter/Configuration_filter.mk
Dosyayı görüntüle @ 3f76713d
......@@ -310,7 +310,7 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr
# fcfg_writer
$(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter/source/config/fragments/types,\
writer_web_HTML \
generic_HTML \
writer_Lotus_1_2_3_10_DOS_StarWriter \
writer_Lotus_1_2_3_10_WIN_StarWriter \
calc_MS_Excel_40 \
......@@ -396,7 +396,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,\
writer_web_HTML \
generic_HTML \
writer_Text \
writer_web_HTML_help \
writer_StarOffice_XML_Writer \
......@@ -457,7 +457,7 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr
# fcfg_calc
$(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,filter/source/config/fragments/types,\
calc_DIF \
writer_web_HTML \
generic_HTML \
calc_Lotus \
calc_QPro \
calc_MS_Excel_40 \
......
filter/qa/complex/filter/detection/typeDetection/files.csv
Dosyayı görüntüle @ 3f76713d
......@@ -28,7 +28,7 @@ Writer5_document;Writer/Writer5.sdw;writer_StarWriter_50;writer_StarWriter_50_Vo
Writer5_template;Writer/Writer5_template.vor;writer_StarWriter_50_VorlageTemplate;writer_StarWriter_50_VorlageTemplate
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;writer_web_HTML;writer_web_HTML
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
......@@ -66,11 +66,11 @@ Exel95_template;Calc/Excel5_template.XLT;calc_MS_Excel_5095;calc_MS_Excel_5095
Excel97_document;Calc/Excel97_2000_XP.xls;calc_MS_Excel_97;calc_MS_Excel_97
#Excel97_1dummy;Calc/Excel97_2000_XP.dummy;calc_MS_Excel_97;calc_MS_Excel_97
Excel97_template;Calc/Excel97_2000_XP.xlt;calc_MS_Excel_97;calc_MS_Excel_97
Calc_html;Calc/HTML_Calc.html;writer_web_HTML;writer_web_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
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
Webpagequery;Calc/Webpagequery.html;writer_web_HTML;writer_web_HTML
Webpagequery;Calc/Webpagequery.html;generic_HTML;generic_HTML
dbase;Calc/dbase.DBF;calc_dBase;writer_Text_encoded
######################################################
# D R A W
......
filter/source/config/fragments/filters/HTML.xcu
Dosyayı görüntüle @ 3f76713d
......@@ -4,7 +4,7 @@
<prop oor:name="FilterService"/>
<prop oor:name="UserData"><value>HTML</value></prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>writer_web_HTML</value></prop>
<prop oor:name="Type"><value>generic_HTML</value></prop>
<prop oor:name="TemplateName"/>
<prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop>
</node>
filter/source/config/fragments/filters/HTML_MasterDoc.xcu
Dosyayı görüntüle @ 3f76713d
<node oor:name="HTML_MasterDoc" oor:op="replace">
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>writer_web_HTML</value></prop>
<prop oor:name="Type"><value>generic_HTML</value></prop>
<prop oor:name="DocumentService"><value>com.sun.star.text.GlobalDocument</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="UserData"><value>HTML</value></prop>
......
filter/source/config/fragments/filters/HTML__StarCalc_.xcu
Dosyayı görüntüle @ 3f76713d
......@@ -4,7 +4,7 @@
<prop oor:name="FilterService"/>
<prop oor:name="UserData"><value></value></prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>writer_web_HTML</value></prop>
<prop oor:name="Type"><value>generic_HTML</value></prop>
<prop oor:name="TemplateName"/>
<prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
</node>
filter/source/config/fragments/filters/HTML__StarWriter_.xcu
Dosyayı görüntüle @ 3f76713d
......@@ -4,7 +4,7 @@
<prop oor:name="FilterService"/>
<prop oor:name="UserData"><value>HTML</value></prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>writer_web_HTML</value></prop>
<prop oor:name="Type"><value>generic_HTML</value></prop>
<prop oor:name="TemplateName"/>
<prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
</node>
filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu
Dosyayı görüntüle @ 3f76713d
......@@ -4,7 +4,7 @@
<prop oor:name="FilterService"/>
<prop oor:name="UserData"><value></value></prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>writer_web_HTML</value></prop>
<prop oor:name="Type"><value>generic_HTML</value></prop>
<prop oor:name="TemplateName"/>
<prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
</node>
filter/source/config/fragments/filters/writerglobal8_HTML.xcu
Dosyayı görüntüle @ 3f76713d
......@@ -4,7 +4,7 @@
<prop oor:name="FilterService"/>
<prop oor:name="UserData"><value>HTML</value></prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>writer_web_HTML</value></prop>
<prop oor:name="Type"><value>generic_HTML</value></prop>
<prop oor:name="TemplateName"/>
<prop oor:name="DocumentService"><value>com.sun.star.text.GlobalDocument</value></prop>
<prop oor:name="UIName">
......
filter/source/config/fragments/types/writer_web_HTML.xcu → filter/source/config/fragments/types/generic_HTML.xcu
Dosyayı görüntüle @ 3f76713d
<node oor:name="writer_web_HTML" oor:op="replace" >
<node oor:name="generic_HTML" oor:op="replace" >
<prop oor:name="DetectService"><value>com.sun.star.text.FormatDetector</value></prop>
<prop oor:name="URLPattern"><value>private:factory/swriter/web*</value></prop>
<prop oor:name="Extensions"><value>html htm</value></prop>
......
sfx2/source/dialog/filtergrouping.cxx
Dosyayı görüntüle @ 3f76713d
......@@ -999,7 +999,7 @@ namespace sfx2
std::vector< ExportFilter > aFilterGroup;
Reference< XFilterGroupManager > xFilterGroupManager( _rxFilterManager, UNO_QUERY );
::rtl::OUString sTypeName;
const ::rtl::OUString sWriterHTMLType( DEFINE_CONST_OUSTRING("writer_web_HTML") );
const ::rtl::OUString sWriterHTMLType( DEFINE_CONST_OUSTRING("generic_HTML") );
const ::rtl::OUString sGraphicHTMLType( DEFINE_CONST_OUSTRING("graphic_HTML") );
const ::rtl::OUString sXHTMLType( DEFINE_CONST_OUSTRING("XHTML_File") );
const ::rtl::OUString sPDFType( DEFINE_CONST_OUSTRING("pdf_Portable_Document_Format") );
......
sfx2/source/view/viewsh.cxx
Dosyayı görüntüle @ 3f76713d
......@@ -607,7 +607,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case SID_WEBHTML:
{
static const char HTML_DOCUMENT_TYPE[] = "writer_web_HTML";
static const char HTML_DOCUMENT_TYPE[] = "generic_HTML";
static const char HTML_GRAPHIC_TYPE[] = "graphic_HTML";
const sal_Int32 FILTERFLAG_EXPORT = 0x00000002;
......
wizards/com/sun/star/wizards/web/data/CGDocument.java
Dosyayı görüntüle @ 3f76713d
......@@ -264,16 +264,13 @@ public class CGDocument extends ConfigSetItem implements XMLProvider
{
return TypeDetection.NO_TYPE;
}
if (media.startsWith("generic_HTML"))
{
return TypeDetection.HTML_DOC;
}
if (media.startsWith("writer"))
{
if (media.startsWith("writer_web_HTML"))
{
return TypeDetection.HTML_DOC;
}
else
{
return TypeDetection.WRITER_DOC;
}
return TypeDetection.WRITER_DOC;
}
else if (media.startsWith("calc"))
{
......
wizards/com/sun/star/wizards/web/data/CGDocument.py
Dosyayı görüntüle @ 3f76713d
......@@ -153,13 +153,10 @@ class CGDocument(ConfigGroup):
def getDocType(self, media):
if media == "":
return NO_TYPE
if media.startswith("writer"):
if media.startswith("writer_web_HTML"):
return HTML_DOC
else:
return WRITER_DOC
elif media.startswith("generic_HTML"):
return HTML_DOC
elif media.startswith("writer"):
return WRITER_DOC
elif media.startswith("calc"):
return CALC_DOC
elif media.startswith("draw"):
......
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