Bug 1584473 - Remove broken/unused morkRowCellCursor::MakeCell(). r=jorgk
authorBen Campbell <benc@thunderbird.net>
Mon, 30 Sep 2019 09:11:07 +1300
changeset 37018 2220e70b16a4d3ecafcb1e1c3c7185da60123d54
parent 37017 1b282633191defb0a9411d6cfe8e059aa2b87e45
child 37019 f1957edea768e093d4ca1ce7a6a55bb00a7540bd
push id395
push userclokep@gmail.com
push dateMon, 02 Dec 2019 19:38:57 +0000
reviewersjorgk
bugs1584473
Bug 1584473 - Remove broken/unused morkRowCellCursor::MakeCell(). r=jorgk
db/mork/public/mdb.h
db/mork/src/morkRowCellCursor.cpp
db/mork/src/morkRowCellCursor.h
--- a/db/mork/public/mdb.h
+++ b/db/mork/public/mdb.h
@@ -2340,24 +2340,16 @@ class nsIMdbRowCellCursor : public nsISu
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_IMDBROWCELLCURSOR_IID)
   // { ===== begin nsIMdbRowCellCursor methods =====
 
   // { ----- begin attribute methods -----
   NS_IMETHOD SetRow(nsIMdbEnv* ev, nsIMdbRow* ioRow) = 0;  // sets pos to -1
   NS_IMETHOD GetRow(nsIMdbEnv* ev, nsIMdbRow** acqRow) = 0;
   // } ----- end attribute methods -----
 
-  // { ----- begin cell creation methods -----
-  NS_IMETHOD MakeCell(            // get cell at current pos in the row
-      nsIMdbEnv* ev,              // context
-      mdb_column* outColumn,      // column for this particular cell
-      mdb_pos* outPos,            // position of cell in row sequence
-      nsIMdbCell** acqCell) = 0;  // the cell at inPos
-  // } ----- end cell creation methods -----
-
   // { ----- begin cell seeking methods -----
   NS_IMETHOD SeekCell(            // same as SetRow() followed by MakeCell()
       nsIMdbEnv* ev,              // context
       mdb_pos inPos,              // position of cell in row sequence
       mdb_column* outColumn,      // column for this particular cell
       nsIMdbCell** acqCell) = 0;  // the cell at inPos
   // } ----- end cell seeking methods -----
 
--- a/db/mork/src/morkRowCellCursor.cpp
+++ b/db/mork/src/morkRowCellCursor.cpp
@@ -152,46 +152,16 @@ morkRowCellCursor::GetRow(nsIMdbEnv* mev
 
     outErr = ev->AsErr();
   }
   if (acqRow) *acqRow = outRow;
   return outErr;
 }
 // } ----- end attribute methods -----
 
-// { ----- begin cell creation methods -----
-NS_IMETHODIMP
-morkRowCellCursor::MakeCell(  // get cell at current pos in the row
-    nsIMdbEnv* mev,           // context
-    mdb_column* outColumn,    // column for this particular cell
-    mdb_pos* outPos,          // position of cell in row sequence
-    nsIMdbCell** acqCell) {
-  nsresult outErr = NS_OK;
-  nsIMdbCell* outCell = 0;
-  mdb_pos pos = 0;
-  mdb_column col = 0;
-  morkRow* row = 0;
-  morkEnv* ev = morkEnv::FromMdbEnv(mev);
-  if (ev) {
-    pos = mCursor_Pos;
-    morkCell* cell = row->CellAt(ev, pos);
-    if (cell) {
-      col = cell->GetColumn();
-      outCell = row->AcquireCellHandle(ev, cell, col, pos);
-    }
-    outErr = ev->AsErr();
-  }
-  if (acqCell) *acqCell = outCell;
-  if (outPos) *outPos = pos;
-  if (outColumn) *outColumn = col;
-
-  return outErr;
-}
-// } ----- end cell creation methods -----
-
 // { ----- begin cell seeking methods -----
 NS_IMETHODIMP
 morkRowCellCursor::SeekCell(  // same as SetRow() followed by MakeCell()
     nsIMdbEnv* mev,           // context
     mdb_pos inPos,            // position of cell in row sequence
     mdb_column* outColumn,    // column for this particular cell
     nsIMdbCell** acqCell) {
   NS_ASSERTION(false, "not implemented");
--- a/db/mork/src/morkRowCellCursor.h
+++ b/db/mork/src/morkRowCellCursor.h
@@ -55,24 +55,16 @@ class morkRowCellCursor : public morkCur
   void CloseRowCellCursor(morkEnv* ev);  // called by CloseMorkNode();
 
   // { ----- begin attribute methods -----
   NS_IMETHOD SetRow(nsIMdbEnv* ev,
                     nsIMdbRow* ioRow) override;  // sets pos to -1
   NS_IMETHOD GetRow(nsIMdbEnv* ev, nsIMdbRow** acqRow) override;
   // } ----- end attribute methods -----
 
-  // { ----- begin cell creation methods -----
-  NS_IMETHOD MakeCell(                 // get cell at current pos in the row
-      nsIMdbEnv* ev,                   // context
-      mdb_column* outColumn,           // column for this particular cell
-      mdb_pos* outPos,                 // position of cell in row sequence
-      nsIMdbCell** acqCell) override;  // the cell at inPos
-  // } ----- end cell creation methods -----
-
   // { ----- begin cell seeking methods -----
   NS_IMETHOD SeekCell(        // same as SetRow() followed by MakeCell()
       nsIMdbEnv* ev,          // context
       mdb_pos inPos,          // position of cell in row sequence
       mdb_column* outColumn,  // column for this particular cell
       nsIMdbCell** acqCell) override;  // the cell at inPos
   // } ----- end cell seeking methods -----