Bug 1584473 - Fix several issues

* Fix undefined HRESULT codes in class CMapiApi in MapiApi.cpp.
* Fix doubled up sub-expressions in MIME and MAPI.
* Remove broken/unused morkRowCellCursor::MakeCell()

Tag #1273
This commit is contained in:
Matt A. Tobin 2019-11-11 02:08:59 -05:00 • committed by Roy Tam
commit e7cf7528e2
6 changed files with 3 additions and 60 deletions

View file

@ -2305,14 +2305,6 @@ public:
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

View file

@ -183,42 +183,6 @@ morkRowCellCursor::GetRow(nsIMdbEnv* mev, nsIMdbRow** acqRow)
}
// } ----- 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()

View file

@ -59,14 +59,6 @@ public: // morkRowCellCursor construction & destruction
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