rename In() to Contains()

Similarly to b22d4785310eac35696d, 'A.In(B)' makes it unclear
whether the check is for A in B or B in A, as it's actually
the latter.

Change-Id: Iaccc41d40f4bb105a44c1bb8d9211c06d1a3c127
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126392
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>

4 files changed, 44 insertions, 42 deletions

diff --git a/sc/qa/unit/rangelst_test.cxx b/sc/qa/unit/rangelst_test.cxx
index 4239cc91e8a9..6957891c653a 100644
--- a/sc/qa/unit/rangelst_test.cxx
+++ b/sc/qa/unit/rangelst_test.cxx
@@ -121,9 +121,9 @@ void Test::testDeleteArea_4Ranges()
         for(SCROW nRow = 0; nRow <= 5; ++nRow)
         {
             if((nCol == 2 || nCol == 3) && ( nRow == 2 || nRow == 3))
-                CPPUNIT_ASSERT(!aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(!aList.Contains(ScRange(nCol, nRow, 0)));
             else
-                CPPUNIT_ASSERT(aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(aList.Contains(ScRange(nCol, nRow, 0)));
         }
     }
 }
@@ -139,9 +139,9 @@ void Test::testDeleteArea_3Ranges()
         for(SCROW nRow = 1; nRow <= 6; ++nRow)
         {
             if((nRow == 3 || nRow == 4) && (nCol >= 3))
-                CPPUNIT_ASSERT(!aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(!aList.Contains(ScRange(nCol, nRow, 0)));
             else
-                CPPUNIT_ASSERT(aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(aList.Contains(ScRange(nCol, nRow, 0)));
         }
     }
 
@@ -162,9 +162,9 @@ void Test::testDeleteArea_3Ranges_Case2()
         for (SCROW nRow = 1; nRow <= 6; ++nRow)
         {
             if ((1 <= nCol && nCol <= 2) && (2 <= nRow && nRow <= 4))
-                CPPUNIT_ASSERT(!aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(!aList.Contains(ScRange(nCol, nRow, 0)));
             else
-                CPPUNIT_ASSERT(aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(aList.Contains(ScRange(nCol, nRow, 0)));
         }
     }
 }
@@ -182,9 +182,9 @@ void Test::testDeleteArea_3Ranges_Case3()
         for (SCROW nRow = 5; nRow <= 11; ++nRow)
         {
             if ((3 <= nCol && nCol <= 4) && (5 <= nRow && nRow <= 8))
-                CPPUNIT_ASSERT(!aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(!aList.Contains(ScRange(nCol, nRow, 0)));
             else
-                CPPUNIT_ASSERT(aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(aList.Contains(ScRange(nCol, nRow, 0)));
         }
     }
 }
@@ -202,9 +202,9 @@ void Test::testDeleteArea_3Ranges_Case4()
         for (SCROW nRow = 5; nRow <= 11; ++nRow)
         {
             if ((3 <= nCol && nCol <= 4) && 5 == nRow )
-                CPPUNIT_ASSERT(!aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(!aList.Contains(ScRange(nCol, nRow, 0)));
             else
-                CPPUNIT_ASSERT(aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(aList.Contains(ScRange(nCol, nRow, 0)));
         }
     }
 }
@@ -222,9 +222,9 @@ void Test::testDeleteArea_3Ranges_Case5()
         for (SCROW nRow = 5; nRow <= 11; ++nRow)
         {
             if ( nCol == 6 && (7 <= nRow && nRow <= 9))
-                CPPUNIT_ASSERT(!aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(!aList.Contains(ScRange(nCol, nRow, 0)));
             else
-                CPPUNIT_ASSERT(aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(aList.Contains(ScRange(nCol, nRow, 0)));
         }
     }
 }
@@ -244,9 +244,9 @@ void Test::testDeleteArea_2Ranges()
         for(SCROW nRow = 0; nRow <= 5; ++nRow)
         {
             if(nCol>=4 && nRow >= 4)
-                CPPUNIT_ASSERT(!aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(!aList.Contains(ScRange(nCol, nRow, 0)));
             else
-                CPPUNIT_ASSERT(aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(aList.Contains(ScRange(nCol, nRow, 0)));
         }
     }
 }
@@ -259,9 +259,9 @@ void Test::testDeleteArea_2Ranges_Case2()
     for(SCROW nRow = 1; nRow <= 5; ++nRow)
     {
         if(nRow == 3)
-            CPPUNIT_ASSERT(!aList.In(ScRange(1,3,0)));
+            CPPUNIT_ASSERT(!aList.Contains(ScRange(1,3,0)));
         else
-            CPPUNIT_ASSERT(aList.In(ScRange(1,nRow,0)));
+            CPPUNIT_ASSERT(aList.Contains(ScRange(1,nRow,0)));
     }
     CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(4), aList.GetCellCount());
 }
@@ -278,9 +278,9 @@ void Test::testDeleteArea_2Ranges_Case3()
         for (SCROW nRow = 5; nRow <= 10; ++nRow)
         {
             if (nCol == 2 && (5 <= nRow && nRow <= 7))
-                CPPUNIT_ASSERT(!aList.In(ScRange(nCol,nRow,0)));
+                CPPUNIT_ASSERT(!aList.Contains(ScRange(nCol,nRow,0)));
             else
-                CPPUNIT_ASSERT(aList.In(ScRange(nCol,nRow,0)));
+                CPPUNIT_ASSERT(aList.Contains(ScRange(nCol,nRow,0)));
         }
     }
 }
@@ -297,9 +297,9 @@ void Test::testDeleteArea_2Ranges_Case4()
         for (SCROW nRow = 3; nRow <= 7; ++nRow)
         {
             if (nCol == 2 && (3 <= nRow && nRow <= 5))
-                CPPUNIT_ASSERT(!aList.In(ScRange(nCol,nRow,0)));
+                CPPUNIT_ASSERT(!aList.Contains(ScRange(nCol,nRow,0)));
             else
-                CPPUNIT_ASSERT(aList.In(ScRange(nCol,nRow,0)));
+                CPPUNIT_ASSERT(aList.Contains(ScRange(nCol,nRow,0)));
         }
     }
 }
@@ -316,9 +316,9 @@ void Test::testDeleteArea_2Ranges_Case5()
         for(SCROW nRow = 2; nRow <= 5; ++nRow)
         {
             if(nRow == 5 && 4 <= nCol)
-                CPPUNIT_ASSERT(!aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(!aList.Contains(ScRange(nCol, nRow, 0)));
             else
-                CPPUNIT_ASSERT(aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(aList.Contains(ScRange(nCol, nRow, 0)));
         }
     }
 }
@@ -335,9 +335,9 @@ void Test::testDeleteArea_2Ranges_Case6()
         for(SCROW nRow = 2; nRow <= 5; ++nRow)
         {
             if(nRow == 2 && 4 <= nCol)
-                CPPUNIT_ASSERT(!aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(!aList.Contains(ScRange(nCol, nRow, 0)));
             else
-                CPPUNIT_ASSERT(aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(aList.Contains(ScRange(nCol, nRow, 0)));
         }
     }
 }
@@ -354,9 +354,9 @@ void Test::testDeleteArea_2Ranges_Case7()
         for(SCROW nRow = 2; nRow <= 5; ++nRow)
         {
             if(nRow == 5 && nCol == 2)
-                CPPUNIT_ASSERT(!aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(!aList.Contains(ScRange(nCol, nRow, 0)));
             else
-                CPPUNIT_ASSERT(aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(aList.Contains(ScRange(nCol, nRow, 0)));
         }
     }
 }
@@ -373,9 +373,9 @@ void Test::testDeleteArea_2Ranges_Case8()
         for(SCROW nRow = 2; nRow <= 5; ++nRow)
         {
             if(nRow == 2 && nCol <= 3)
-                CPPUNIT_ASSERT(!aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(!aList.Contains(ScRange(nCol, nRow, 0)));
             else
-                CPPUNIT_ASSERT(aList.In(ScRange(nCol, nRow, 0)));
+                CPPUNIT_ASSERT(aList.Contains(ScRange(nCol, nRow, 0)));
         }
     }
 }
@@ -389,7 +389,7 @@ void Test::testDeleteArea_1Range()
 
     for(SCROW nRow = 1; nRow <= 3; ++nRow)
     {
-        CPPUNIT_ASSERT(aList.In(ScRange(3,nRow,0)));
+        CPPUNIT_ASSERT(aList.Contains(ScRange(3,nRow,0)));
     }
     CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), aList.GetCellCount());
 }
@@ -511,9 +511,9 @@ void Test::testUpdateReference_DeleteRow()
     {
         for(SCROW nRow = 1; nRow <= 3; ++nRow)
         {
-            CPPUNIT_ASSERT(aList.In(ScRange(nCol, nRow, 0)));
+            CPPUNIT_ASSERT(aList.Contains(ScRange(nCol, nRow, 0)));
         }
-        CPPUNIT_ASSERT(!aList.In(ScRange(nCol, 4, 0)));
+        CPPUNIT_ASSERT(!aList.Contains(ScRange(nCol, 4, 0)));
     }
     CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(12), aList.GetCellCount());
 
@@ -553,9 +553,9 @@ void Test::testUpdateReference_DeleteCol()
     {
         for(SCCOL nCol = 1; nCol <= 3; ++nCol)
         {
-            CPPUNIT_ASSERT(aList.In(ScRange(nCol, nRow, 0)));
+            CPPUNIT_ASSERT(aList.Contains(ScRange(nCol, nRow, 0)));
         }
-        CPPUNIT_ASSERT(!aList.In(ScRange(4, nRow, 0)));
+        CPPUNIT_ASSERT(!aList.Contains(ScRange(4, nRow, 0)));
     }
     CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(12), aList.GetCellCount());
 }
diff --git a/sc/qa/unit/subsequent_export_test.cxx b/sc/qa/unit/subsequent_export_test.cxx
index 8fbe40a10ac9..355fdf4202ad 100644
--- a/sc/qa/unit/subsequent_export_test.cxx
+++ b/sc/qa/unit/subsequent_export_test.cxx
@@ -2541,9 +2541,11 @@ void ScExportTest::testEmbeddedChartXLS()
     CPPUNIT_ASSERT_MESSAGE("Failed to retrieve a chart object from the 2nd sheet.", pOleObj);
 
     ScRangeList aRanges = getChartRanges(rDoc, *pOleObj);
-    CPPUNIT_ASSERT_MESSAGE("Label range (B3:B5) not found.", aRanges.In(ScRange(1, 2, 1, 1, 4, 1)));
-    CPPUNIT_ASSERT_MESSAGE("Data label (C2) not found.", aRanges.In(ScAddress(2, 1, 1)));
-    CPPUNIT_ASSERT_MESSAGE("Data range (C3:C5) not found.", aRanges.In(ScRange(2, 2, 1, 2, 4, 1)));
+    CPPUNIT_ASSERT_MESSAGE("Label range (B3:B5) not found.",
+                           aRanges.Contains(ScRange(1, 2, 1, 1, 4, 1)));
+    CPPUNIT_ASSERT_MESSAGE("Data label (C2) not found.", aRanges.Contains(ScAddress(2, 1, 1)));
+    CPPUNIT_ASSERT_MESSAGE("Data range (C3:C5) not found.",
+                           aRanges.Contains(ScRange(2, 2, 1, 2, 4, 1)));
 
     xDocSh->DoClose();
 }
diff --git a/sc/qa/unit/subsequent_filters_test.cxx b/sc/qa/unit/subsequent_filters_test.cxx
index 99030f3e90d7..3c4939b3e8e6 100644
--- a/sc/qa/unit/subsequent_filters_test.cxx
+++ b/sc/qa/unit/subsequent_filters_test.cxx
@@ -1997,9 +1997,9 @@ void ScFiltersTest::testChartImportODS()
 
     ScRangeList aRanges = getChartRanges(rDoc, *pOleObj);
 
-    CPPUNIT_ASSERT_MESSAGE("Data series title cell not found.", aRanges.In(ScAddress(1,0,3))); // B1 on Title
-    CPPUNIT_ASSERT_MESSAGE("Data series label range not found.", aRanges.In(ScRange(0,1,2,0,3,2))); // A2:A4 on Data
-    CPPUNIT_ASSERT_MESSAGE("Data series value range not found.", aRanges.In(ScRange(1,1,2,1,3,2))); // B2:B4 on Data
+    CPPUNIT_ASSERT_MESSAGE("Data series title cell not found.", aRanges.Contains(ScAddress(1,0,3))); // B1 on Title
+    CPPUNIT_ASSERT_MESSAGE("Data series label range not found.", aRanges.Contains(ScRange(0,1,2,0,3,2))); // A2:A4 on Data
+    CPPUNIT_ASSERT_MESSAGE("Data series value range not found.", aRanges.Contains(ScRange(1,1,2,1,3,2))); // B2:B4 on Data
 
     xDocSh->DoClose();
 }
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 9a80a42ad4b1..5d32bee3223b 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4143,11 +4143,11 @@ void Test::testSearchCells()
     CPPUNIT_ASSERT_MESSAGE("Search And Replace should succeed", bSuccess);
     CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be exactly 3 matching cells.", size_t(3), aMatchedRanges.size());
     ScAddress aHit(0,0,0);
-    CPPUNIT_ASSERT_MESSAGE("A1 should be inside the matched range.", aMatchedRanges.In(aHit));
+    CPPUNIT_ASSERT_MESSAGE("A1 should be inside the matched range.", aMatchedRanges.Contains(aHit));
     aHit.SetRow(2);
-    CPPUNIT_ASSERT_MESSAGE("A3 should be inside the matched range.", aMatchedRanges.In(aHit));
+    CPPUNIT_ASSERT_MESSAGE("A3 should be inside the matched range.", aMatchedRanges.Contains(aHit));
     aHit.SetRow(4);
-    CPPUNIT_ASSERT_MESSAGE("A5 should be inside the matched range.", aMatchedRanges.In(aHit));
+    CPPUNIT_ASSERT_MESSAGE("A5 should be inside the matched range.", aMatchedRanges.Contains(aHit));
 
     m_pDoc->DeleteTab(0);
 }