[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf2' - 2 commits - sc/qa sc/source

[Daniel Bankston]

 sc/qa/unit/data/contentCSV/matrix2.csv |    7 +++++--
 sc/qa/unit/data/ods/matrix.ods         |binary
 sc/source/filter/xml/xmlcelli.cxx      |    3 ---
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 1651e7b7ff0f97bf738bf5b210e1c97e201627a1
Author: Daniel Bankston <daniel.e.bankston at gmail.com>
Date:   Sun Jul 8 13:28:22 2012 -0500

    Remove calls to ScFormulaCell::SetFormatType() that are no longer necessary
    
    Change-Id: I632273a2278cd76d2af96192885a11bea85bd6a0

diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index e5c81e0..fc20f36 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -760,7 +760,6 @@ void ScXMLTableRowCellContext::AddTextCellToDoc( const ScAddress& rCurrentPos,
                 pFCell->SetHybridString( *pOUText );
             else
                 bDoIncrement = false;
-            pFCell->SetFormatType( nCellType );
             pFCell->ResetDirty();
         }
     }
@@ -1030,7 +1029,6 @@ void ScXMLTableRowCellContext::AddNonMatrixFormulaCell( const ScAddress& rCellPo
                 pFCell->SetHybridString( *pOUTextValue );
             else
                 pFCell->SetHybridDouble( fValue );
-            pFCell->SetFormatType( nCellType );
             pFCell->ResetDirty();
         }
         else if ( aText[0] == '\'' && aText.getLength() > 1 )
@@ -1083,7 +1081,6 @@ void ScXMLTableRowCellContext::AddFormulaCell( const ScAddress& rCellPos )
                         pFCell->SetHybridString( *pOUTextValue );
                     else
                         pFCell->SetHybridDouble( fValue );
-                    pFCell->SetFormatType( nCellType );
                     pFCell->ResetDirty();
                 }
             }
commit 98c2c3be6e38f9f9d96b1889fc18a68fc77da51e
Author: Daniel Bankston <daniel.e.bankston at gmail.com>
Date:   Sun Jul 8 13:13:14 2012 -0500

    Expand cached matrix formula result test case to include other potential probs
    
    Change-Id: Idb036ffdf09ee92b34118d9f52ea1d06c15fb31b

diff --git a/sc/qa/unit/data/contentCSV/matrix2.csv b/sc/qa/unit/data/contentCSV/matrix2.csv
index 44b3f71..955d345 100644
--- a/sc/qa/unit/data/contentCSV/matrix2.csv
+++ b/sc/qa/unit/data/contentCSV/matrix2.csv
@@ -1,2 +1,5 @@
-Matrix with errors:,,
-Err:502,Err:502,Err:502
+Matrices with errors and other misc potential problems:,,,,
+Err:502,Err:502,Err:502,,error result
+#N/A,#N/A,#N/A,,n/a
+TRUE,TRUE,TRUE,,Display TRUE instead of 1
+FALSE,FALSE,FALSE,,Display FALSE instead of 0
diff --git a/sc/qa/unit/data/ods/matrix.ods b/sc/qa/unit/data/ods/matrix.ods
index 7b69691..2a8c4ab 100644
Binary files a/sc/qa/unit/data/ods/matrix.ods and b/sc/qa/unit/data/ods/matrix.ods differ