Kaydet (Commit) c444aab4 authored tarafından Eike Rathke's avatar Eike Rathke Kaydeden (comit) Andras Timar

Resolves: tdf#119623 record group positions also for top cells

So listeners can be re-established for remaining grouped cells if
top cell is deleted (which ends listening and probably was the
cause to exclude them here).

Change-Id: Ic91b74c65013452d56b5cfbc132722c4314743c8
Reviewed-on: https://gerrit.libreoffice.org/61808Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
Tested-by: Jenkins
üst 46968a28
...@@ -1522,10 +1522,12 @@ void ScColumn::EndListeningIntersectedGroups( ...@@ -1522,10 +1522,12 @@ void ScColumn::EndListeningIntersectedGroups(
{ {
ScFormulaCell* pFC = sc::formula_block::at(*it->data, aPos.second); ScFormulaCell* pFC = sc::formula_block::at(*it->data, aPos.second);
ScFormulaCellGroupRef xGroup = pFC->GetCellGroup(); ScFormulaCellGroupRef xGroup = pFC->GetCellGroup();
if (xGroup && !pFC->IsSharedTop()) if (xGroup)
{ {
// End listening. if (!pFC->IsSharedTop())
pFC->EndListeningTo(rCxt); // End listening.
pFC->EndListeningTo(rCxt);
if (pGroupPos) if (pGroupPos)
// Record the position of the top cell of the group. // Record the position of the top cell of the group.
pGroupPos->push_back(xGroup->mpTopCell->aPos); pGroupPos->push_back(xGroup->mpTopCell->aPos);
...@@ -1538,10 +1540,12 @@ void ScColumn::EndListeningIntersectedGroups( ...@@ -1538,10 +1540,12 @@ void ScColumn::EndListeningIntersectedGroups(
{ {
ScFormulaCell* pFC = sc::formula_block::at(*it->data, aPos.second); ScFormulaCell* pFC = sc::formula_block::at(*it->data, aPos.second);
ScFormulaCellGroupRef xGroup = pFC->GetCellGroup(); ScFormulaCellGroupRef xGroup = pFC->GetCellGroup();
if (xGroup && !pFC->IsSharedTop()) if (xGroup)
{ {
// End listening. if (!pFC->IsSharedTop())
pFC->EndListeningTo(rCxt); // End listening.
pFC->EndListeningTo(rCxt);
if (pGroupPos) if (pGroupPos)
{ {
// Record the position of the bottom cell of the group. // Record the position of the bottom cell of the group.
......
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