diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 10:57:39 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 10:57:39 +0000 |
| commit | 33dd50a62c1ef89a3cd9455f7f39351254b46250 (patch) | |
| tree | 9a1e0a7b4d784f536725540804ad970e46012dc7 /filter | |
| parent | 580c0de3c8c3bf37c96e65dd1ecb2110861342a2 (diff) | |
INTEGRATION: CWS xsltfilter10 (1.6.42); FILE MERGED
2008/07/09 18:57:57 sus 1.6.42.2: #i91376# Updates due to XSLT processor adaption from Xalan to Saxon
2008/07/09 17:36:28 sus 1.6.42.1: #i91376# Updates due to XSLT processor adaption from Xalan to Saxon
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl index d26fabd592e4..a1576db37f10 100644 --- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl +++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl @@ -9,7 +9,7 @@ $RCSfile: spreadsheetml2ooo.xsl,v $ - $Revision: 1.6 $ + $Revision: 1.7 $ This file is part of OpenOffice.org. @@ -35,7 +35,7 @@ <xsl:import href="../../common/measure_conversion.xsl"/> <xsl:output indent="no" version="1.0" encoding="UTF-8" method="xml"/> <xsl:template match="/"> - <office:document office:mimetype="application/x-vnd.oasis.openoffice.spreadsheet" office:version="1.0"> + <office:document office:mimetype="application/vnd.oasis.opendocument.spreadsheet" office:version="1.0"> <xsl:apply-templates select="ss:Workbook/o:DocumentProperties"/> <xsl:apply-templates select="ss:Workbook/x:ExcelWorkbook"/> <xsl:call-template name="font-declaration"/> @@ -6726,7 +6726,7 @@ </xsl:choose> </xsl:variable> <xsl:choose> - <xsl:when test="$calculatedColumnStart >= $calculatedCellPosition <= $calculatedColumnEnd"> + <xsl:when test="$calculatedColumnStart >= $calculatedCellPosition and $calculatedCellPosition <= $calculatedColumnEnd"> <xsl:value-of select="$columnXMLNode/@ss:StyleID"/> </xsl:when> <xsl:when test="$calculatedColumnEnd <= $calculatedCellPosition"> |