[Libreoffice-commits] core.git: sc/qa

Stephan Bergmann sbergman at redhat.com
Tue Apr 15 01:07:25 PDT 2014


 sc/qa/unit/filters-test.cxx |   23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

New commits:
commit 05a940f993dfdd9546c8108526a483c1d6e6377c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Apr 15 10:06:28 2014 +0200

    testContentXLSXStrict was left out by accident?
    
    ...and completely comment out commented-out testContentXLS_XML
    
    Change-Id: I24d149bb7b16d1d36b388a39e719b6b9ead142c2

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 43692b5..07f3fa2 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -66,7 +66,7 @@ public:
     void testContentXLSXStrict(); // strict OOXML
     void testContentLotus123();
     void testContentDIF();
-    void testContentXLS_XML();
+    //void testContentXLS_XML();
     void testSharedFormulaXLS();
     void testSharedFormulaXLSX();
     void testLegacyCellAnchoredRotatedShape();
@@ -79,6 +79,7 @@ public:
     CPPUNIT_TEST(testContentODS);
     CPPUNIT_TEST(testContentXLS);
     CPPUNIT_TEST(testContentXLSX);
+    CPPUNIT_TEST(testContentXLSXStrict);
     CPPUNIT_TEST(testContentLotus123);
     CPPUNIT_TEST(testContentDIF);
     //CPPUNIT_TEST(testContentXLS_XML);
@@ -278,16 +279,16 @@ void ScFiltersTest::testContentDIF()
     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::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()
 {


More information about the Libreoffice-commits mailing list