summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2010-05-31 20:37:41 +0100
committerCaolán McNamara <cmc@openoffice.org>2010-05-31 20:37:41 +0100
commit4c8613d6070361aa01704e639901487deb88e283 (patch)
tree94b6f4f7ce5b4785b361ca6473830fdf00ce9d96 /filter
parentc8c98c13f7871d31053ebd7643a4eb5014ac598c (diff)
parent53017497738e9edd88b480cfaf31a11d1701835d (diff)
cmcfixes75: merge with DEV300 m80
Diffstat (limited to 'filter')
-rw-r--r--filter/source/config/fragments/types/calc_Text_txt_csv_StarCalc.xcu2
-rw-r--r--filter/source/xslt/odf2xhtml/export/xhtml/body.xsl2
2 files changed, 2 insertions, 2 deletions
diff --git a/filter/source/config/fragments/types/calc_Text_txt_csv_StarCalc.xcu b/filter/source/config/fragments/types/calc_Text_txt_csv_StarCalc.xcu
index 8b2c25903438..708717263917 100644
--- a/filter/source/config/fragments/types/calc_Text_txt_csv_StarCalc.xcu
+++ b/filter/source/config/fragments/types/calc_Text_txt_csv_StarCalc.xcu
@@ -1,7 +1,7 @@
<node oor:name="calc_Text_txt_csv_StarCalc" oor:op="replace" >
<prop oor:name="DetectService"><value>com.sun.star.comp.calc.FormatDetector</value></prop>
<prop oor:name="URLPattern"/>
- <prop oor:name="Extensions"><value>csv txt xls</value></prop>
+ <prop oor:name="Extensions"><value>csv 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 - txt - csv (StarCalc)</value></prop>
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index b2abefad2d9d..6229544cf02f 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -2869,4 +2869,4 @@
<xsl:template match="math:annotation" mode="math"/>
-</xsl:stylesheet> \ No newline at end of file
+</xsl:stylesheet>