Kaydet (Commit) 02478afb authored tarafından Michael Meeks's avatar Michael Meeks Kaydeden (comit) Kohei Yoshida

don't re-build formula groups just yet.

Change-Id: Ibd7677e9e4f695be883cb20d3182cc8a8501f855
üst fa81354d
...@@ -2033,7 +2033,6 @@ void ScColumn::UpdateCompile( bool bForceIfNameInUse ) ...@@ -2033,7 +2033,6 @@ void ScColumn::UpdateCompile( bool bForceIfNameInUse )
Search( nRow, i ); // Listener deleted/inserted? Search( nRow, i ); // Listener deleted/inserted?
} }
} }
RebuildFormulaGroups();
} }
} }
...@@ -2243,6 +2242,7 @@ void ScColumn::CalcAll() ...@@ -2243,6 +2242,7 @@ void ScColumn::CalcAll()
void ScColumn::CompileAll() void ScColumn::CompileAll()
{ {
if ( !maItems.empty() ) if ( !maItems.empty() )
{
for (SCSIZE i = 0; i < maItems.size(); i++) for (SCSIZE i = 0; i < maItems.size(); i++)
{ {
ScBaseCell* pCell = maItems[i].pCell; ScBaseCell* pCell = maItems[i].pCell;
...@@ -2258,6 +2258,7 @@ void ScColumn::CompileAll() ...@@ -2258,6 +2258,7 @@ void ScColumn::CompileAll()
Search( nRow, i ); // Listener deleted/inserted? Search( nRow, i ); // Listener deleted/inserted?
} }
} }
}
} }
......
...@@ -1431,7 +1431,6 @@ void ScColumn::CellStorageModified() ...@@ -1431,7 +1431,6 @@ void ScColumn::CellStorageModified()
} }
cout << "-- end" << endl; cout << "-- end" << endl;
#endif #endif
RebuildFormulaGroups();
} }
void ScColumn::CopyScriptTypesToDocument(SCROW nRow1, SCROW nRow2, ScColumn& rDestCol) const void ScColumn::CopyScriptTypesToDocument(SCROW nRow1, SCROW nRow2, ScColumn& rDestCol) const
......
...@@ -2009,7 +2009,7 @@ ScFormulaCellGroup::~ScFormulaCellGroup() ...@@ -2009,7 +2009,7 @@ ScFormulaCellGroup::~ScFormulaCellGroup()
// of similar formulae into a formulagroup // of similar formulae into a formulagroup
void ScColumn::RebuildFormulaGroups() void ScColumn::RebuildFormulaGroups()
{ {
if ( maItems.empty() ) if ( maItems.empty() || !bDirtyGroups )
return; return;
// clear previous groups // clear previous groups
...@@ -2068,10 +2068,21 @@ void ScColumn::RebuildFormulaGroups() ...@@ -2068,10 +2068,21 @@ void ScColumn::RebuildFormulaGroups()
} }
else else
{ {
fprintf( stderr, "unusual incompatible extension of formulae\n" ); OUString aFormula;
pCur->GetFormula( aFormula );
ScAddress aAddr( nCol, rCur.nRow, nTab );
OUString aCellAddr;
aAddr.Format( aCellAddr, 0, pDocument );
fprintf( stderr, "unusual incompatible extension in cell '%s' of formulae '%s'\n" ,
OUStringToOString( aCellAddr, RTL_TEXTENCODING_UTF8 ).getStr(),
OUStringToOString( aFormula, RTL_TEXTENCODING_UTF8 ).getStr() );
pCur->ReleaseDelta( pDelta ); pCur->ReleaseDelta( pDelta );
} }
} }
bDirtyGroups = false;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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