Skip to content

C
core
Kaydet (Commit) d880f3d3 authored tarafından Daniel Bankston's avatar Daniel Bankston Kaydeden (comit) Kohei Yoshida
Dosyalara gözat
Seçenekler

Always recalc certain functions on import 

Change-Id: Ie8cffc4a856328dd658714726de7ca77028a33a7
üst 9ba62d50
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
sc/source/filter/xml/xmlcelli.cxx
Dosyayı görüntüle @ d880f3d3
...@@ -760,7 +760,8 @@ void ScXMLTableRowCellContext::AddTextCellToDoc( const ScAddress& rCurrentPos, ...@@ -760,7 +760,8 @@ void ScXMLTableRowCellContext::AddTextCellToDoc( const ScAddress& rCurrentPos,
pFCell->SetHybridString( *pOUText ); pFCell->SetHybridString( *pOUText );
else else
bDoIncrement = false; bDoIncrement = false;
pFCell->ResetDirty(); if( !pFCell->GetCode()->IsRecalcModeAlways() )
pFCell->ResetDirty();
} }
} }
else else
...@@ -798,7 +799,8 @@ void ScXMLTableRowCellContext::AddNumberCellToDoc( const ScAddress& rCurrentPos ...@@ -798,7 +799,8 @@ void ScXMLTableRowCellContext::AddNumberCellToDoc( const ScAddress& rCurrentPos
pFCell->SetHybridString( *pOUTextValue ); pFCell->SetHybridString( *pOUTextValue );
else else
pFCell->SetHybridDouble( fValue ); pFCell->SetHybridDouble( fValue );
pFCell->ResetDirty(); if( !pFCell->GetCode()->IsRecalcModeAlways() )
pFCell->ResetDirty();
} }
} }
else else
...@@ -1029,7 +1031,8 @@ void ScXMLTableRowCellContext::AddNonMatrixFormulaCell( const ScAddress& rCellPo ...@@ -1029,7 +1031,8 @@ void ScXMLTableRowCellContext::AddNonMatrixFormulaCell( const ScAddress& rCellPo
pFCell->SetHybridString( *pOUTextValue ); pFCell->SetHybridString( *pOUTextValue );
else else
pFCell->SetHybridDouble( fValue ); pFCell->SetHybridDouble( fValue );
pFCell->ResetDirty(); if( !(pFCell->GetCode()->IsRecalcModeOnLoad() || !pFCell->GetCode()->IsRecalcModeOnLoadOnce()) )
pFCell->ResetDirty();
} }
else if ( aText[0] == '\'' && aText.getLength() > 1 ) else if ( aText[0] == '\'' && aText.getLength() > 1 )
{ {
...@@ -1081,7 +1084,8 @@ void ScXMLTableRowCellContext::AddFormulaCell( const ScAddress& rCellPos ) ...@@ -1081,7 +1084,8 @@ void ScXMLTableRowCellContext::AddFormulaCell( const ScAddress& rCellPos )
pFCell->SetHybridString( *pOUTextValue ); pFCell->SetHybridString( *pOUTextValue );
else else
pFCell->SetHybridDouble( fValue ); pFCell->SetHybridDouble( fValue );
pFCell->ResetDirty(); if( !pFCell->GetCode()->IsRecalcModeAlways() )
pFCell->ResetDirty();
} }
} }
} }
......
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