diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-02-07 22:51:50 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-02-11 22:33:32 -0500 |
| commit | 5becce4c4462d483f0856b4dbca8d92113fa5bec (patch) | |
| tree | 9a764323397b985508b5d908323ffcaf4eab9c68 /sc | |
| parent | 10461da782ae403563d5b47e3853ddb819f72dde (diff) | |
These method names should use singular 'Cell', not 'Cells'.
Change-Id: I9faa2727eda05be041aff4347f921ec9cd9b49d2
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/xml/xmlcelli.cxx | 13 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlcelli.hxx | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 179c992d18a0..d1df64f579b9 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -785,7 +785,7 @@ bool isEmptyOrNote( ScDocument* pDoc, const ScAddress& rCurrentPos ) } -void ScXMLTableRowCellContext::AddTextAndValueCells( const ScAddress& rCellPos, +void ScXMLTableRowCellContext::AddTextAndValueCell( const ScAddress& rCellPos, const ::boost::optional< rtl::OUString >& pOUText, ScAddress& rCurrentPos ) { ScMyTables& rTables = rXMLImport.GetTables(); @@ -925,7 +925,7 @@ rtl::OUString getOutputString(ScDocument* pDoc, const ScAddress& aCellPos) } -void ScXMLTableRowCellContext::AddNonFormulaCells( const ScAddress& rCellPos ) +void ScXMLTableRowCellContext::AddNonFormulaCell( const ScAddress& rCellPos ) { ::boost::optional< rtl::OUString > pOUText; @@ -942,7 +942,7 @@ void ScXMLTableRowCellContext::AddNonFormulaCells( const ScAddress& rCellPos ) if( HasSpecialContent() ) bIsEmpty = false; - AddTextAndValueCells( rCellPos, pOUText, aCurrentPos ); + AddTextAndValueCell( rCellPos, pOUText, aCurrentPos ); if( CellsAreRepeated() ) { @@ -1114,10 +1114,11 @@ void ScXMLTableRowCellContext::EndElement() aCellPos.SetRow( aCellPos.Row() - (nRepeatedRows - 1) ); if( bIsMerged ) DoMerge( aCellPos, nMergedCols - 1, nMergedRows - 1 ); - if (!maFormula) - AddNonFormulaCells( aCellPos ); + + if (maFormula) + AddFormulaCell(aCellPos); else - AddFormulaCell( aCellPos ); + AddNonFormulaCell(aCellPos); UnlockSolarMutex(); //if LockSolarMutex got used, we presumably need to ensure an UnlockSolarMutex diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index b71537ec3fcf..58d0e4526562 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -81,9 +81,9 @@ class ScXMLTableRowCellContext : public SvXMLImportContext void PutTextCell ( const ScAddress& rScCurrentPos, const SCCOL nCurrentCol, const ::boost::optional< rtl::OUString >& pOUText ); void PutValueCell ( const ScAddress& rScCurrentPos ); - void AddTextAndValueCells ( const ScAddress& rScCellPos, + void AddTextAndValueCell ( const ScAddress& rScCellPos, const ::boost::optional< rtl::OUString >& pOUText, ScAddress& rScCurrentPos ); - void AddNonFormulaCells ( const ScAddress& rScCellPos ); + void AddNonFormulaCell ( const ScAddress& rScCellPos ); void PutFormulaCell ( const ScAddress& rScCurrentPos ); void AddFormulaCell ( const ScAddress& rScCellPos ); |