diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-24 11:51:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-24 14:43:54 +0200 |
| commit | 8c1d25e0dbbcc9b6d4ed58f4bc9e8ffff7e10e5e (patch) | |
| tree | 01829072339384da0f12f5fc3f15b424dde67741 /sc/source/core | |
| parent | ba031cc41321c7817c5b23e0b5378e532f7e1dea (diff) | |
convert AreaOverlapType to scoped enum
and remove unused AreaPartialOverlap
Change-Id: I21e94d8d15c59485c1287e99dcc6558e0570a8eb
Reviewed-on: https://gerrit.libreoffice.org/76234
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/core')
| -rw-r--r-- | sc/source/core/data/bcaslot.cxx | 13 | ||||
| -rw-r--r-- | sc/source/core/data/table3.cxx | 6 |
2 files changed, 7 insertions, 12 deletions
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx index 5026d65de397..91fe7076409e 100644 --- a/sc/source/core/data/bcaslot.cxx +++ b/sc/source/core/data/bcaslot.cxx @@ -526,28 +526,23 @@ void ScBroadcastAreaSlot::GetAllListeners( switch (eType) { - case sc::AreaInside: + case sc::AreaOverlapType::Inside: if (!rRange.In(rAreaRange)) // The range needs to be fully inside specified range. continue; break; - case sc::AreaPartialOverlap: - if (!rRange.Intersects(rAreaRange) || rRange.In(rAreaRange)) - // The range needs to be only partially overlapping. - continue; - break; - case sc::AreaInsideOrOverlap: + case sc::AreaOverlapType::InsideOrOverlap: if (!rRange.Intersects(rAreaRange)) // The range needs to be partially overlapping or fully inside. continue; break; - case sc::OneRowInsideArea: + case sc::AreaOverlapType::OneRowInside: if (rAreaRange.aStart.Row() != rAreaRange.aEnd.Row() || !rRange.In(rAreaRange)) // The range needs to be one single row and fully inside // specified range. continue; break; - case sc::OneColumnInsideArea: + case sc::AreaOverlapType::OneColumnInside: if (rAreaRange.aStart.Col() != rAreaRange.aEnd.Col() || !rRange.In(rAreaRange)) // The range needs to be one single column and fully inside // specified range. diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index da1e5e981753..a5779276c019 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -954,7 +954,7 @@ void ScTable::SortReorderByColumn( // and end their listening. ScRange aMoveRange( nStart, nRow1, nTab, nLast, nRow2, nTab); std::vector<sc::AreaListener> aAreaListeners = pDocument->GetBASM()->GetAllListeners( - aMoveRange, sc::OneColumnInsideArea); + aMoveRange, sc::AreaOverlapType::OneColumnInside); { for (auto& rAreaListener : aAreaListeners) { @@ -1174,7 +1174,7 @@ void ScTable::SortReorderByRowRefUpdate( ScBroadcastAreaSlotMachine* pBASM = pDocument->GetBASM(); std::vector<sc::AreaListener> aGrpListeners = pBASM->GetAllListeners( - aMoveRange, sc::AreaInsideOrOverlap, sc::ListenerGroupType::Group); + aMoveRange, sc::AreaOverlapType::InsideOrOverlap, sc::ListenerGroupType::Group); { for (auto& rGrpListener : aGrpListeners) @@ -1353,7 +1353,7 @@ void ScTable::SortReorderByRowRefUpdate( // Get all area listeners that listen on one row within the range and end // their listening. std::vector<sc::AreaListener> aAreaListeners = pDocument->GetBASM()->GetAllListeners( - aMoveRange, sc::OneRowInsideArea); + aMoveRange, sc::AreaOverlapType::OneRowInside); { for (auto& rAreaListener : aAreaListeners) { |