[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/qa sc/source

[Kohei Yoshida]

 sc/qa/unit/filters-test.cxx         |    4 ++--
 sc/source/filter/excel/excform8.cxx |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ea09d81c0e9affedc29970d4287f4233e995ea25
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Wed Jul 24 22:28:01 2013 -0400

    These static_cast's are very significant. Don't remove these.
    
    This fixes the shared formula import from xls.
    
    Change-Id: I8790e642c3ef1a335694891eb574a68ae5270649

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 6b4419c..1d7eeca 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -84,8 +84,8 @@ public:
     CPPUNIT_TEST(testContentXLSX);
     CPPUNIT_TEST(testContentLotus123);
     CPPUNIT_TEST(testContentDIF);
-//  CPPUNIT_TEST(testSharedFormulaXLS);
-//  CPPUNIT_TEST(testSharedFormulaXLSX);
+    CPPUNIT_TEST(testSharedFormulaXLS);
+    CPPUNIT_TEST(testSharedFormulaXLSX);
     CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape);
 
 #if TEST_BUG_FILES
diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx
index 862584e..4810a7e 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -1433,9 +1433,9 @@ void ExcelToSc8::ExcRelToScRel8( sal_uInt16 nRow, sal_uInt16 nC, ScSingleRefData
     {
         // C O L
         if( bColRel )
-            rSRD.SetRelCol(nC);
+            rSRD.SetRelCol(static_cast<SCCOL>(static_cast<sal_Int8>(nC)));
         else
-            rSRD.SetAbsCol(nCol);
+            rSRD.SetAbsCol(static_cast<SCCOL>(nCol));
 
         // R O W
         if( bRowRel )