Kaydet (Commit) 4dab3a66 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

No need to check for empty value; it's checked when a value is assigned.

Change-Id: I7d96910a6d8216aa17858b0cb05e161080c8dccc
üst 5becce4c
...@@ -690,7 +690,7 @@ void ScXMLTableRowCellContext::PutTextCell( const ScAddress& rCurrentPos, ...@@ -690,7 +690,7 @@ void ScXMLTableRowCellContext::PutTextCell( const ScAddress& rCurrentPos,
{ {
ScFormulaCell* pFCell = static_cast<ScFormulaCell*>(pCell); ScFormulaCell* pFCell = static_cast<ScFormulaCell*>(pCell);
OUString aCellString; OUString aCellString;
if (maStringValue && !maStringValue->isEmpty()) if (maStringValue)
aCellString = *maStringValue; aCellString = *maStringValue;
else if (!maParagraphs.empty()) else if (!maParagraphs.empty())
aCellString = maParagraphs.back(); aCellString = maParagraphs.back();
...@@ -725,7 +725,7 @@ void ScXMLTableRowCellContext::PutTextCell( const ScAddress& rCurrentPos, ...@@ -725,7 +725,7 @@ void ScXMLTableRowCellContext::PutTextCell( const ScAddress& rCurrentPos,
{ {
ScBaseCell* pNewCell = NULL; ScBaseCell* pNewCell = NULL;
ScDocument* pDoc = rXMLImport.GetDocument(); ScDocument* pDoc = rXMLImport.GetDocument();
if (maStringValue && !maStringValue->isEmpty()) if (maStringValue)
pNewCell = ScBaseCell::CreateTextCell( *maStringValue, pDoc ); pNewCell = ScBaseCell::CreateTextCell( *maStringValue, pDoc );
else if (!maParagraphs.empty()) else if (!maParagraphs.empty())
pNewCell = ScBaseCell::CreateTextCell(maParagraphs.back(), pDoc); pNewCell = ScBaseCell::CreateTextCell(maParagraphs.back(), pDoc);
...@@ -935,7 +935,7 @@ void ScXMLTableRowCellContext::AddNonFormulaCell( const ScAddress& rCellPos ) ...@@ -935,7 +935,7 @@ void ScXMLTableRowCellContext::AddNonFormulaCell( const ScAddress& rCellPos )
pOUText.reset( getOutputString(rXMLImport.GetDocument(), rCellPos) ); pOUText.reset( getOutputString(rXMLImport.GetDocument(), rCellPos) );
if (maParagraphs.empty() && !pOUText && !maStringValue) if (maParagraphs.empty() && !pOUText && !maStringValue)
bIsEmpty = true; bIsEmpty = true;
} }
ScAddress aCurrentPos( rCellPos ); ScAddress aCurrentPos( rCellPos );
......
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