Kaydet (Commit) ce565ff0 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

add disabled test for Excel 2003 XML import

Change-Id: I5c6ff3a79357ce37b220bd7cad64a3783bc7dc55
üst fd2f96c2
<?xml version="1.0"?>
<?mso-application progid="Excel.Sheet"?>
<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet" xmlns:html="http://www.w3.org/TR/REC-html40">
<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
<Author>moggi</Author>
<LastAuthor>moggi</LastAuthor>
<Created>2013-09-05T11:50:47Z</Created>
<Version>14.00</Version>
</DocumentProperties>
<OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
<AllowPNG/>
</OfficeDocumentSettings>
<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
<WindowHeight>8190</WindowHeight>
<WindowWidth>16380</WindowWidth>
<WindowTopX>0</WindowTopX>
<WindowTopY>0</WindowTopY>
<TabRatio>141</TabRatio>
<ProtectStructure>False</ProtectStructure>
<ProtectWindows>False</ProtectWindows>
</ExcelWorkbook>
<Styles>
<Style ss:ID="Default" ss:Name="Normal">
<Alignment ss:Vertical="Bottom"/>
<Borders/>
<Font ss:FontName="Arial" x:Family="Swiss"/>
<Interior/>
<NumberFormat/>
<Protection/>
</Style>
</Styles>
<Worksheet ss:Name="Sheet1">
<Table ss:ExpandedColumnCount="8" ss:ExpandedRowCount="4" x:FullColumns="1" x:FullRows="1" ss:DefaultColumnWidth="60.75">
<Row>
<Cell>
<Data ss:Type="Number">1</Data>
</Cell>
<Cell>
<Data ss:Type="String">String1</Data>
</Cell>
<Cell ss:Formula="=2*3">
<Data ss:Type="Number">6</Data>
</Cell>
</Row>
<Row>
<Cell>
<Data ss:Type="Number">2</Data>
</Cell>
<Cell>
<Data ss:Type="String">String2</Data>
</Cell>
<Cell ss:Formula="=2+3">
<Data ss:Type="Number">5</Data>
</Cell>
<Cell ss:Index="5" ss:MergeAcross="1" ss:MergeDown="1"/>
</Row>
<Row>
<Cell ss:Index="3" ss:Formula="=2-3">
<Data ss:Type="Number">-1</Data>
</Cell>
<Cell ss:Index="8">
<Comment ss:Author="">
<ss:Data xmlns="http://www.w3.org/TR/REC-html40">
<Font html:Face="Tahoma" x:CharSet="1" html:Size="9" html:Color="#000000">Test</Font>
</ss:Data>
</Comment>
</Cell>
</Row>
<Row>
<Cell ss:Index="3" ss:Formula="=R[-3]C+R[-2]C">
<Data ss:Type="Number">11</Data>
</Cell>
</Row>
</Table>
<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
<PageSetup>
<Layout x:StartPageNumber="1"/>
<Header x:Margin="0.78749999999999998" x:Data="&amp;C&amp;A"/>
<Footer x:Margin="0.78749999999999998" x:Data="&amp;CPage &amp;P"/>
<PageMargins x:Bottom="1.0249999999999999" x:Left="0.78749999999999998" x:Right="0.78749999999999998" x:Top="1.0249999999999999"/>
</PageSetup>
<Print>
<ValidPrinterInfo/>
<HorizontalResolution>300</HorizontalResolution>
<VerticalResolution>300</VerticalResolution>
</Print>
<Selected/>
<Panes>
<Pane>
<Number>3</Number>
<ActiveRow>6</ActiveRow>
<ActiveCol>3</ActiveCol>
</Pane>
</Panes>
<ProtectObjects>False</ProtectObjects>
<ProtectScenarios>False</ProtectScenarios>
<EnableSelection>NoSelection</EnableSelection>
</WorksheetOptions>
</Worksheet>
<Worksheet ss:Name="Sheet2">
<Table ss:ExpandedColumnCount="1" ss:ExpandedRowCount="1" x:FullColumns="1" x:FullRows="1" ss:DefaultColumnWidth="60.75">
</Table>
<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
<PageSetup>
<Header x:Margin="0.78749999999999998" x:Data="&amp;C&amp;A"/>
<Footer x:Margin="0.78749999999999998" x:Data="&amp;CPage &amp;P"/>
<PageMargins x:Bottom="1.0249999999999999" x:Left="0.78749999999999998" x:Right="0.78749999999999998" x:Top="1.0249999999999999"/>
</PageSetup>
<Print>
<ValidPrinterInfo/>
<HorizontalResolution>300</HorizontalResolution>
<VerticalResolution>300</VerticalResolution>
</Print>
<ProtectObjects>False</ProtectObjects>
<ProtectScenarios>False</ProtectScenarios>
<EnableSelection>NoSelection</EnableSelection>
</WorksheetOptions>
</Worksheet>
</Workbook>
...@@ -66,6 +66,7 @@ public: ...@@ -66,6 +66,7 @@ public:
void testContentXLSX(); void testContentXLSX();
void testContentLotus123(); void testContentLotus123();
void testContentDIF(); void testContentDIF();
void testContentXLS_XML();
void testSharedFormulaXLS(); void testSharedFormulaXLS();
void testSharedFormulaXLSX(); void testSharedFormulaXLSX();
#if TEST_BUG_FILES #if TEST_BUG_FILES
...@@ -86,6 +87,7 @@ public: ...@@ -86,6 +87,7 @@ public:
CPPUNIT_TEST(testContentXLSX); CPPUNIT_TEST(testContentXLSX);
CPPUNIT_TEST(testContentLotus123); CPPUNIT_TEST(testContentLotus123);
CPPUNIT_TEST(testContentDIF); CPPUNIT_TEST(testContentDIF);
//CPPUNIT_TEST(testContentXLS_XML);
CPPUNIT_TEST(testSharedFormulaXLS); CPPUNIT_TEST(testSharedFormulaXLS);
CPPUNIT_TEST(testSharedFormulaXLSX); CPPUNIT_TEST(testSharedFormulaXLSX);
CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape); CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape);
...@@ -333,6 +335,17 @@ void ScFiltersTest::testContentDIF() ...@@ -333,6 +335,17 @@ void ScFiltersTest::testContentDIF()
xDocSh->DoClose(); xDocSh->DoClose();
} }
void ScFiltersTest::testContentXLS_XML()
{
ScDocShellRef xDocSh = loadDoc("universal-content.", XLS_XML);
CPPUNIT_ASSERT(xDocSh);
ScDocument* pDoc = xDocSh->GetDocument();
CPPUNIT_ASSERT(pDoc);
testContentImpl(pDoc, XLS_XML);
xDocSh->DoClose();
}
void ScFiltersTest::testSharedFormulaXLS() void ScFiltersTest::testSharedFormulaXLS()
{ {
ScDocShellRef xDocSh = loadDoc("shared-formula.", XLS); ScDocShellRef xDocSh = loadDoc("shared-formula.", XLS);
......
...@@ -58,6 +58,7 @@ FileFormat aFileFormats[] = { ...@@ -58,6 +58,7 @@ FileFormat aFileFormats[] = {
{ "html" , "calc_HTML_WebQuery", "generic_HTML", HTML_FORMAT_TYPE }, { "html" , "calc_HTML_WebQuery", "generic_HTML", HTML_FORMAT_TYPE },
{ "123" , "Lotus", "calc_Lotus", LOTUS123_FORMAT_TYPE }, { "123" , "Lotus", "calc_Lotus", LOTUS123_FORMAT_TYPE },
{ "dif", "DIF", "calc_DIF", DIF_FORMAT_TYPE }, { "dif", "DIF", "calc_DIF", DIF_FORMAT_TYPE },
{ "xml", "MS Excel 2003 XML", "calc_MS_Excel_2003_XML", XLS_XML_FORMAT_TYPE }
}; };
bool testEqualsWithTolerance( long nVal1, long nVal2, long nTol ) bool testEqualsWithTolerance( long nVal1, long nVal2, long nTol )
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#define CSV_FORMAT_TYPE (SFX_FILTER_IMPORT | SFX_FILTER_EXPORT | SFX_FILTER_ALIEN | SFX_FILTER_USESOPTIONS) #define CSV_FORMAT_TYPE (SFX_FILTER_IMPORT | SFX_FILTER_EXPORT | SFX_FILTER_ALIEN | SFX_FILTER_USESOPTIONS)
#define HTML_FORMAT_TYPE (SFX_FILTER_IMPORT | SFX_FILTER_EXPORT | SFX_FILTER_ALIEN | SFX_FILTER_USESOPTIONS) #define HTML_FORMAT_TYPE (SFX_FILTER_IMPORT | SFX_FILTER_EXPORT | SFX_FILTER_ALIEN | SFX_FILTER_USESOPTIONS)
#define DIF_FORMAT_TYPE 195 #define DIF_FORMAT_TYPE 195
#define XLS_XML_FORMAT_TYPE (SFX_FILTER_IMPORT | SFX_FILTER_EXPORT | SFX_FILTER_ALIEN)
#define ODS 0 #define ODS 0
#define XLS 1 #define XLS 1
...@@ -44,6 +45,7 @@ ...@@ -44,6 +45,7 @@
#define HTML 4 #define HTML 4
#define LOTUS123 5 #define LOTUS123 5
#define DIF 6 #define DIF 6
#define XLS_XML 7
enum StringType { PureString, FormulaValue, StringValue }; enum StringType { PureString, FormulaValue, StringValue };
......
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