sc/inc/types.hxx | 11 +++++------
sc/qa/unit/ucalc.cxx | 8 ++++----
sc/qa/unit/ucalc_sharedformula.cxx | 6 +++---
sc/source/core/data/bcaslot.cxx | 13 ++++---------
sc/source/core/data/table3.cxx | 6 +++---
5 files changed, 19 insertions(+), 25 deletions(-)
New commits:
commit 8c1d25e0dbbcc9b6d4ed58f4bc9e8ffff7e10e5e
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Jul 24 11:51:57 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Jul 24 14:43:54 2019 +0200
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.gran...@collabora.co.uk>
diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx
index c4e62ae63452..5c68c606d0fe 100644
--- a/sc/inc/types.hxx
+++ b/sc/inc/types.hxx
@@ -107,13 +107,12 @@ struct MultiDataCellState
MultiDataCellState( StateType eState );
};
-enum AreaOverlapType
+enum class AreaOverlapType
{
- AreaInside,
- AreaPartialOverlap,
- AreaInsideOrOverlap,
- OneRowInsideArea,
- OneColumnInsideArea
+ Inside,
+ InsideOrOverlap,
+ OneRowInside,
+ OneColumnInside
};
enum class ListenerGroupType
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 4db44ce1b6c1..c4a6f84cd3e6 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4225,7 +4225,7 @@ void Test::testCopyPasteRepeatOneFormula()
ScRange aWholeSheet(0,0,0,MAXCOL,MAXROW,0);
ScBroadcastAreaSlotMachine* pBASM = m_pDoc->GetBASM();
CPPUNIT_ASSERT(pBASM);
- std::vector<sc::AreaListener> aListeners =
pBASM->GetAllListeners(aWholeSheet, sc::AreaInside);
+ std::vector<sc::AreaListener> aListeners =
pBASM->GetAllListeners(aWholeSheet, sc::AreaOverlapType::Inside);
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), aListeners.size());
const sc::AreaListener* pListener = aListeners.data();
CPPUNIT_ASSERT_EQUAL(ScRange(0,0,0,1,0,0), pListener->maArea);
@@ -4258,7 +4258,7 @@ void Test::testCopyPasteRepeatOneFormula()
#if !defined(USE_FORMULA_GROUP_LISTENER) || USE_FORMULA_GROUP_LISTENER
// At this point, there should only be one area listener and it should be
// a group listener listening on A1:B10.
- aListeners = pBASM->GetAllListeners(aWholeSheet, sc::AreaInside);
+ aListeners = pBASM->GetAllListeners(aWholeSheet,
sc::AreaOverlapType::Inside);
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), aListeners.size());
pListener = aListeners.data();
CPPUNIT_ASSERT_EQUAL(ScRange(0,0,0,1,9,0), pListener->maArea);
@@ -4276,7 +4276,7 @@ void Test::testCopyPasteRepeatOneFormula()
// This check makes only sense if group listeners are activated.
#if !defined(USE_FORMULA_GROUP_LISTENER) || USE_FORMULA_GROUP_LISTENER
// Make there we only have one group area listener listening on A2:B11.
- aListeners = pBASM->GetAllListeners(aWholeSheet, sc::AreaInside);
+ aListeners = pBASM->GetAllListeners(aWholeSheet,
sc::AreaOverlapType::Inside);
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), aListeners.size());
pListener = aListeners.data();
CPPUNIT_ASSERT_EQUAL(ScRange(0,1,0,1,10,0), pListener->maArea);
@@ -4303,7 +4303,7 @@ void Test::testCopyPasteRepeatOneFormula()
// This check makes only sense if group listeners are activated.
#if !defined(USE_FORMULA_GROUP_LISTENER) || USE_FORMULA_GROUP_LISTENER
// Check the group area listener again to make sure it's listening on
A1:B10 once again.
- aListeners = pBASM->GetAllListeners(aWholeSheet, sc::AreaInside);
+ aListeners = pBASM->GetAllListeners(aWholeSheet,
sc::AreaOverlapType::Inside);
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), aListeners.size());
pListener = aListeners.data();
CPPUNIT_ASSERT_EQUAL(ScRange(0,0,0,1,9,0), pListener->maArea);
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx
b/sc/qa/unit/ucalc_sharedformula.cxx
index ea22e3651d4d..d07d7edaf391 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -648,7 +648,7 @@ void Test::testSharedFormulasRefUpdateRangeDeleteRow()
// Check the area listener status.
ScBroadcastAreaSlotMachine* pBASM = m_pDoc->GetBASM();
CPPUNIT_ASSERT(pBASM);
- std::vector<sc::AreaListener> aListeners =
pBASM->GetAllListeners(aWholeArea, sc::AreaInside);
+ std::vector<sc::AreaListener> aListeners =
pBASM->GetAllListeners(aWholeArea, sc::AreaOverlapType::Inside);
std::sort(aListeners.begin(), aListeners.end(), SortByArea());
// This check makes only sense if group listeners are activated.
@@ -688,7 +688,7 @@ void Test::testSharedFormulasRefUpdateRangeDeleteRow()
// This check makes only sense if group listeners are activated.
#if !defined(USE_FORMULA_GROUP_LISTENER) || USE_FORMULA_GROUP_LISTENER
// We should only have one listener group-listening on A1:B4.
- aListeners = pBASM->GetAllListeners(aWholeArea, sc::AreaInside);
+ aListeners = pBASM->GetAllListeners(aWholeArea,
sc::AreaOverlapType::Inside);
CPPUNIT_ASSERT_EQUAL_MESSAGE("There should only be 1 area listener.",
size_t(1), aListeners.size());
CPPUNIT_ASSERT_EQUAL_MESSAGE("This listener should be listening on
A1:B4.", ScRange(0,0,0,1,3,0), aListeners[0].maArea);
CPPUNIT_ASSERT_MESSAGE("This listener should be group-listening.",
aListeners[0].mbGroupListening);
@@ -725,7 +725,7 @@ void Test::testSharedFormulasRefUpdateRangeDeleteRow()
CPPUNIT_ASSERT_EQUAL(11.0, m_pDoc->GetValue(ScAddress(2,3,0)));
CPPUNIT_ASSERT_EQUAL(15.0, m_pDoc->GetValue(ScAddress(2,4,0)));
- aListeners = pBASM->GetAllListeners(aWholeArea, sc::AreaInside);
+ aListeners = pBASM->GetAllListeners(aWholeArea,
sc::AreaOverlapType::Inside);
std::sort(aListeners.begin(), aListeners.end(), SortByArea());
// This check makes only sense if group listeners are activated.
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)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
