mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#76710: Adjust sheet position of conditional format entries.

Browse Source 
When inserting or deleting sheets.

Change-Id: Ibf898350e22f092ec38b75ad98957832a5580e6a
This commit is contained in:
Kohei Yoshida
2014-05-13 22:46:17 -04:00
parent dff4725f0d
commit 146f6e7e68
1 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
sc/source/core/data/conditio.cxx
View File

@@ -2002,12 +2002,49 @@ void ScConditionalFormat::InsertCol(SCTAB nTab, SCROW nRowStart, SCROW nRowEnd,
void ScConditionalFormat::UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ) void ScConditionalFormat::UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt )
{ {
for (size_t i = 0, n = maRanges.size(); i < n; ++i)
{
// We assume that the start and end sheet indices are equal.
ScRange* pRange = maRanges[i];
SCTAB nTab = pRange->aStart.Tab();
if (nTab < rCxt.mnInsertPos)
// Unaffected.
continue;
pRange->aStart.IncTab(rCxt.mnSheets);
pRange->aEnd.IncTab(rCxt.mnSheets);
}
for (CondFormatContainer::iterator it = maEntries.begin(); it != maEntries.end(); ++it) for (CondFormatContainer::iterator it = maEntries.begin(); it != maEntries.end(); ++it)
it->UpdateInsertTab(rCxt); it->UpdateInsertTab(rCxt);
} }
void ScConditionalFormat::UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ) void ScConditionalFormat::UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt )
{ {
for (size_t i = 0, n = maRanges.size(); i < n; ++i)
{
// We assume that the start and end sheet indices are equal.
ScRange* pRange = maRanges[i];
SCTAB nTab = pRange->aStart.Tab();
if (nTab < rCxt.mnDeletePos)
// Left of the deleted sheet(s). Unaffected.
continue;
if (nTab <= rCxt.mnDeletePos+rCxt.mnSheets-1)
{
// On the deleted sheet(s).
pRange->aStart.SetTab(-1);
pRange->aEnd.SetTab(-1);
continue;
}
// Right of the deleted sheet(s). Adjust the sheet indices.
pRange->aStart.IncTab(-1*rCxt.mnSheets);
pRange->aEnd.IncTab(-1*rCxt.mnSheets);
}
for (CondFormatContainer::iterator it = maEntries.begin(); it != maEntries.end(); ++it) for (CondFormatContainer::iterator it = maEntries.begin(); it != maEntries.end(); ++it)
it->UpdateDeleteTab(rCxt); it->UpdateDeleteTab(rCxt);
} }