diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-05-22 20:16:28 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-05-24 12:40:46 +0300 |
| commit | 6cf30940750607eeb062113dbee9968769d7bd06 (patch) | |
| tree | 5d30410c5f32f45105d896c065da3fffbd5edf88 /dbaccess | |
| parent | 503b248127a92b9ad190e05f6a1d50574183cd47 (diff) | |
WaE: implicit conversion of NULL constant to nullptr_t
Change-Id: I2eefbca1ef986219f04504cba4ca09a22972e8cb
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/querydesign/JoinController.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/QueryTableView.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/tabledesign/TEditControl.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 89b192ac158b..31c939058c26 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -221,7 +221,7 @@ void OJoinController::SaveTabWinPosSize(OTableWindow* pTabWin, long nOffsetX, lo { // the data for the window TTableWindowData::value_type pData = pTabWin->GetData(); - OSL_ENSURE(pData != NULL, "SaveTabWinPosSize : TabWin hat keine Daten !"); + OSL_ENSURE(pData != 0, "SaveTabWinPosSize : TabWin hat keine Daten !"); // set Position & Size of data anew (with current window parameters) Point aPos = pTabWin->GetPosPixel(); diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 1971bcce2845..cbf8b93a73ac 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -914,7 +914,7 @@ sal_Bool OQueryTableView::ShowTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUn if (pTabWin->Init()) { TTableWindowData::value_type pData = pTabWin->GetData(); - OSL_ENSURE(pData != NULL, "OQueryTableView::ShowTabWin : TabWin has no data !"); + OSL_ENSURE(pData != 0, "OQueryTableView::ShowTabWin : TabWin has no data !"); // If there is a position and size defined, we use them if (pData->HasPosition() && pData->HasSize()) { diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 70654ce4f535..839b470cd3ee 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -344,7 +344,7 @@ sal_Bool OTableEditorCtrl::SetDataPtr( long nRow ) if(nRow >= (long)m_pRowList->size()) return sal_False; pActRow = (*m_pRowList)[nRow]; - return pActRow != NULL; + return pActRow != 0; } //------------------------------------------------------------------------------ |