Kaydet (Commit) 239ad92c authored tarafından Kohei Yoshida's avatar Kohei Yoshida

We normally use an 'f' prefix for double.

I'm not a big fan of Hungarian notation, but since we use it, let's
be consistent.
üst a60b1059
...@@ -342,12 +342,12 @@ namespace { ...@@ -342,12 +342,12 @@ namespace {
void testContentImpl(ScDocument* pDoc) //same code for ods, xls, xlsx void testContentImpl(ScDocument* pDoc) //same code for ods, xls, xlsx
{ {
double aValue; double fValue;
//check value import //check value import
pDoc->GetValue(0,0,0,aValue); pDoc->GetValue(0,0,0,fValue);
CPPUNIT_ASSERT_MESSAGE("value not imported correctly", aValue == 1); CPPUNIT_ASSERT_MESSAGE("value not imported correctly", fValue == 1);
pDoc->GetValue(0,1,0,aValue); pDoc->GetValue(0,1,0,fValue);
CPPUNIT_ASSERT_MESSAGE("value not imported correctly", aValue == 2); CPPUNIT_ASSERT_MESSAGE("value not imported correctly", fValue == 2);
rtl::OUString aString; rtl::OUString aString;
pDoc->GetString(1,0,0,aString); pDoc->GetString(1,0,0,aString);
//check string import //check string import
...@@ -355,14 +355,14 @@ void testContentImpl(ScDocument* pDoc) //same code for ods, xls, xlsx ...@@ -355,14 +355,14 @@ void testContentImpl(ScDocument* pDoc) //same code for ods, xls, xlsx
pDoc->GetString(1,1,0,aString); pDoc->GetString(1,1,0,aString);
CPPUNIT_ASSERT_MESSAGE("string not imported correctly", aString == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("String2"))); CPPUNIT_ASSERT_MESSAGE("string not imported correctly", aString == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("String2")));
//check basic formula import //check basic formula import
pDoc->GetValue(2,0,0,aValue); pDoc->GetValue(2,0,0,fValue);
CPPUNIT_ASSERT_MESSAGE("=2*3", aValue==6); CPPUNIT_ASSERT_MESSAGE("=2*3", fValue == 6);
pDoc->GetValue(2,1,0,aValue); pDoc->GetValue(2,1,0,fValue);
CPPUNIT_ASSERT_MESSAGE("=2+3", aValue==5); CPPUNIT_ASSERT_MESSAGE("=2+3", fValue == 5);
pDoc->GetValue(2,2,0,aValue); pDoc->GetValue(2,2,0,fValue);
CPPUNIT_ASSERT_MESSAGE("=2-3", aValue==-1); CPPUNIT_ASSERT_MESSAGE("=2-3", fValue == -1);
pDoc->GetValue(2,3,0,aValue); pDoc->GetValue(2,3,0,fValue);
CPPUNIT_ASSERT_MESSAGE("=C1+C2", aValue==11); CPPUNIT_ASSERT_MESSAGE("=C1+C2", fValue == 11);
//check merged cells import //check merged cells import
SCCOL nCol = 4; SCCOL nCol = 4;
SCROW nRow = 1; SCROW nRow = 1;
......
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