diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-06-17 11:32:18 +0200 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-06-17 11:32:18 +0200 |
| commit | 74721a30a80c06fac3d51dbe9da54344b60542ab (patch) | |
| tree | 4443d765a3a9b4ccc7317f3fbe258925e75394c2 /filter | |
| parent | 614e369c4cb48ea4bcafcae6c29f412e20a4e6a7 (diff) | |
| parent | 1f4a5d96da42928176c86bc7b29423b63dbaefc9 (diff) | |
mib16: rebase to m82
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/config/fragments/types/calc_Text_txt_csv_StarCalc.xcu | 2 | ||||
| -rwxr-xr-x | filter/source/config/tools/merge/pyAltFCFGMerge | 4 | ||||
| -rw-r--r-- | filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 2 |
3 files changed, 4 insertions, 4 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/config/tools/merge/pyAltFCFGMerge b/filter/source/config/tools/merge/pyAltFCFGMerge index d9a974eb9fec..a44a4bb81d29 100755 --- a/filter/source/config/tools/merge/pyAltFCFGMerge +++ b/filter/source/config/tools/merge/pyAltFCFGMerge @@ -9,9 +9,9 @@ # there is a java which is available for use by all #_____________________________________________ -import sys, string, os.path +import sys, string, os.path -CFGFILE = "../../../../l10ntools/source/filter/merge/FCFGMerge.cfg" +CFGFILE = os.environ["SOLARVER"] + "/" + os.environ["INPATH"] + "/inc/l10ntools/FCFGMerge.cfg" PROP_XMLVERSION = "xmlversion" # // <= global cfg file PROP_XMLENCODING = "xmlencoding" # // <= global cfg file 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> |