summaryrefslogtreecommitdiffstats
path: root/db
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-11-11 02:08:59 -0500
committerMatt A. Tobin <email@mattatobin.com>2019-11-11 02:08:59 -0500
commit7406d488b363588be8f677f698be11ea478f377b (patch)
tree4eace33f71b9b53b7500bcadc59c9979ec6f45b1 /db
parent73e14fb7049306439a5637ff261f1370a94518e5 (diff)
downloadUXP-7406d488b363588be8f677f698be11ea478f377b.tar
UXP-7406d488b363588be8f677f698be11ea478f377b.tar.gz
UXP-7406d488b363588be8f677f698be11ea478f377b.tar.lz
UXP-7406d488b363588be8f677f698be11ea478f377b.tar.xz
UXP-7406d488b363588be8f677f698be11ea478f377b.zip
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
Diffstat (limited to 'db')
-rw-r--r--db/mork/public/mdb.h8
-rw-r--r--db/mork/src/morkRowCellCursor.cpp36
-rw-r--r--db/mork/src/morkRowCellCursor.h8
3 files changed, 0 insertions, 52 deletions
diff --git a/db/mork/public/mdb.h b/db/mork/public/mdb.h
index 9a48434eb..54d5ac637 100644
--- a/db/mork/public/mdb.h
+++ b/db/mork/public/mdb.h
@@ -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
diff --git a/db/mork/src/morkRowCellCursor.cpp b/db/mork/src/morkRowCellCursor.cpp
index d5d4a0d20..0649b5b55 100644
--- a/db/mork/src/morkRowCellCursor.cpp
+++ b/db/mork/src/morkRowCellCursor.cpp
@@ -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()
diff --git a/db/mork/src/morkRowCellCursor.h b/db/mork/src/morkRowCellCursor.h
index c9d95a2f2..76ad77891 100644
--- a/db/mork/src/morkRowCellCursor.h
+++ b/db/mork/src/morkRowCellCursor.h
@@ -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