summaryrefslogtreecommitdiff
path: root/svx/source/fmcomp/gridctrl.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/fmcomp/gridctrl.cxx')
-rw-r--r--svx/source/fmcomp/gridctrl.cxx102
1 files changed, 51 insertions, 51 deletions
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 107baac9f1c0..aaba9fdfc616 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -149,7 +149,7 @@ public:
GridFieldValueListener::GridFieldValueListener(DbGridControl& _rParent, const Reference< XPropertySet >& _rField, sal_uInt16 _nId)
:OPropertyChangeListener(m_aMutex)
,m_rParent(_rParent)
- ,m_pRealListener(NULL)
+ ,m_pRealListener(nullptr)
,m_nId(_nId)
,m_nSuspended(0)
,m_bDisposed(false)
@@ -178,7 +178,7 @@ void GridFieldValueListener::dispose()
{
if (m_bDisposed)
{
- DBG_ASSERT(m_pRealListener == NULL, "GridFieldValueListener::dispose : inconsistent !");
+ DBG_ASSERT(m_pRealListener == nullptr, "GridFieldValueListener::dispose : inconsistent !");
return;
}
@@ -186,7 +186,7 @@ void GridFieldValueListener::dispose()
{
m_pRealListener->dispose();
m_pRealListener->release();
- m_pRealListener = NULL;
+ m_pRealListener = nullptr;
}
m_bDisposed = true;
@@ -209,7 +209,7 @@ public:
DisposeListenerGridBridge::DisposeListenerGridBridge(DbGridControl& _rParent, const Reference< XComponent >& _rxObject, sal_Int16 _rId)
:FmXDisposeListener(m_aMutex)
,m_rParent(_rParent)
- ,m_pRealListener(NULL)
+ ,m_pRealListener(nullptr)
{
if (_rxObject.is())
@@ -225,7 +225,7 @@ DisposeListenerGridBridge::~DisposeListenerGridBridge()
{
m_pRealListener->dispose();
m_pRealListener->release();
- m_pRealListener = NULL;
+ m_pRealListener = nullptr;
}
}
@@ -623,7 +623,7 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich)
{
bool bAvailable = GetState(nWhich);
DbGridControl* pParent = static_cast<DbGridControl*>(GetParent());
- vcl::Window* pWnd = NULL;
+ vcl::Window* pWnd = nullptr;
switch (nWhich)
{
case NavigationBar::RECORD_FIRST:
@@ -891,20 +891,20 @@ DbGridControl::DbGridControl(
:DbGridControl_Base(pParent, EditBrowseBoxFlags::NONE, nBits, DEFAULT_BROWSE_MODE )
,m_xContext(_rxContext)
,m_aBar(VclPtr<DbGridControl::NavigationBar>::Create(this))
- ,m_nAsynAdjustEvent(0)
- ,m_pDataSourcePropMultiplexer(NULL)
- ,m_pDataSourcePropListener(NULL)
- ,m_pFieldListeners(NULL)
- ,m_pCursorDisposeListener(NULL)
- ,m_pGridListener(NULL)
- ,m_pDataCursor(NULL)
- ,m_pSeekCursor(NULL)
+ ,m_nAsynAdjustEvent(nullptr)
+ ,m_pDataSourcePropMultiplexer(nullptr)
+ ,m_pDataSourcePropListener(nullptr)
+ ,m_pFieldListeners(nullptr)
+ ,m_pCursorDisposeListener(nullptr)
+ ,m_pGridListener(nullptr)
+ ,m_pDataCursor(nullptr)
+ ,m_pSeekCursor(nullptr)
,m_nSeekPos(-1)
,m_nTotalCount(-1)
,m_aNullDate(::dbtools::DBTypeConversion::getStandardDate())
,m_nMode(DEFAULT_BROWSE_MODE)
,m_nCurrentPos(-1)
- ,m_nDeleteEvent(0)
+ ,m_nDeleteEvent(nullptr)
,m_nOptions(OPT_READONLY)
,m_nOptionMask(OPT_INSERT | OPT_UPDATE | OPT_DELETE)
,m_nLastColId((sal_uInt16)-1)
@@ -969,7 +969,7 @@ void DbGridControl::dispose()
if (m_pCursorDisposeListener)
{
delete m_pCursorDisposeListener;
- m_pCursorDisposeListener = NULL;
+ m_pCursorDisposeListener = nullptr;
}
}
@@ -981,15 +981,15 @@ void DbGridControl::dispose()
m_pDataSourcePropMultiplexer->dispose();
m_pDataSourcePropMultiplexer->release(); // this should delete the multiplexer
delete m_pDataSourcePropListener;
- m_pDataSourcePropMultiplexer = NULL;
- m_pDataSourcePropListener = NULL;
+ m_pDataSourcePropMultiplexer = nullptr;
+ m_pDataSourcePropListener = nullptr;
}
m_xRowSetListener.clear();
delete m_pDataCursor;
- m_pDataCursor = NULL;
+ m_pDataCursor = nullptr;
delete m_pSeekCursor;
- m_pSeekCursor = NULL;
+ m_pSeekCursor = nullptr;
m_aBar.disposeAndClear();
@@ -1109,7 +1109,7 @@ void DbGridControl::RemoveRows(bool bNewCursor)
if (!bNewCursor)
{
DELETEZ(m_pSeekCursor);
- m_xPaintRow = m_xDataRow = m_xEmptyRow = m_xCurrentRow = m_xSeekRow = NULL;
+ m_xPaintRow = m_xDataRow = m_xEmptyRow = m_xCurrentRow = m_xSeekRow = nullptr;
m_nCurrentPos = m_nSeekPos = -1;
m_nOptions = OPT_READONLY;
@@ -1136,7 +1136,7 @@ void DbGridControl::RemoveRows()
DELETEZ(m_pSeekCursor);
DELETEZ(m_pDataCursor);
- m_xPaintRow = m_xDataRow = m_xEmptyRow = m_xCurrentRow = m_xSeekRow = NULL;
+ m_xPaintRow = m_xDataRow = m_xEmptyRow = m_xCurrentRow = m_xSeekRow = nullptr;
m_nCurrentPos = m_nSeekPos = m_nTotalCount = -1;
m_nOptions = OPT_READONLY;
@@ -1301,7 +1301,7 @@ sal_uInt16 DbGridControl::SetOptions(sal_uInt16 nOpt)
}
else
{ // the insert option is to be reset
- m_xEmptyRow = NULL;
+ m_xEmptyRow = nullptr;
if ((GetCurRow() == GetRowCount() - 1) && (GetCurRow() > 0))
GoToRowColumnId(GetCurRow() - 1, GetCurColumnId());
RowRemoved(GetRowCount());
@@ -1377,8 +1377,8 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
m_pDataSourcePropMultiplexer->dispose();
m_pDataSourcePropMultiplexer->release(); // this should delete the multiplexer
delete m_pDataSourcePropListener;
- m_pDataSourcePropMultiplexer = NULL;
- m_pDataSourcePropListener = NULL;
+ m_pDataSourcePropMultiplexer = nullptr;
+ m_pDataSourcePropListener = nullptr;
}
m_xRowSetListener.clear();
@@ -1406,12 +1406,12 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
{
// the adjust was thought to work with the old cursor which we don't have anymore
RemoveUserEvent(m_nAsynAdjustEvent);
- m_nAsynAdjustEvent = 0;
+ m_nAsynAdjustEvent = nullptr;
}
}
// get a new formatter and data cursor
- m_xFormatter = NULL;
+ m_xFormatter = nullptr;
Reference< css::util::XNumberFormatsSupplier > xSupplier = getNumberFormats(getConnection(_xCursor), true);
if (xSupplier.is())
{
@@ -1999,7 +1999,7 @@ void DbGridControl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uI
return;
size_t Location = GetModelColumnPos(nColumnId);
- DbGridColumn* pColumn = (Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
+ DbGridColumn* pColumn = (Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr;
if (pColumn)
{
Rectangle aArea(rRect);
@@ -2173,7 +2173,7 @@ void DbGridControl::AdjustDataSource(bool bFull)
// If the current row is recalculated at the moment, do not adjust
if (bFull)
- m_xCurrentRow = NULL;
+ m_xCurrentRow = nullptr;
// if we are on the same row only repaint
// but this is only possible for rows which are not inserted, in that case the comparison result
// may not be correct
@@ -2624,7 +2624,7 @@ void DbGridControl::SetFilterMode(bool bMode)
OUString DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
{
size_t Location = GetModelColumnPos( _nColId );
- DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
+ DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr;
OUString sRet;
if ( const_cast<DbGridControl*>(this)->SeekRow(_nRow) )
sRet = GetCurrentRowCellText(pColumn, m_xPaintRow);
@@ -2645,7 +2645,7 @@ sal_uInt32 DbGridControl::GetTotalCellWidth(long nRow, sal_uInt16 nColId)
if (SeekRow(nRow))
{
size_t Location = GetModelColumnPos( nColId );
- DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
+ DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr;
return GetDataWindow().GetTextWidth(GetCurrentRowCellText(pColumn,m_xPaintRow));
}
else
@@ -2679,7 +2679,7 @@ void DbGridControl::PostExecuteRowContextMenu(sal_uInt16 /*nRow*/, const PopupMe
// delete asynchronously
if (m_nDeleteEvent)
Application::RemoveUserEvent(m_nDeleteEvent);
- m_nDeleteEvent = Application::PostUserEvent(LINK(this,DbGridControl,OnDelete), NULL, true);
+ m_nDeleteEvent = Application::PostUserEvent(LINK(this,DbGridControl,OnDelete), nullptr, true);
break;
case SID_FM_RECORD_UNDO:
Undo();
@@ -2757,7 +2757,7 @@ void DbGridControl::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel )
GetDataWindow().ReleaseMouse();
size_t Location = GetModelColumnPos( nColId );
- DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
+ DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr;
OStringTransferable* pTransferable = new OStringTransferable(GetCurrentRowCellText(pColumn,m_xPaintRow));
Reference< XTransferable > xEnsureDelete(pTransferable);
pTransferable->StartDrag(this, DND_ACTION_COPY);
@@ -2850,7 +2850,7 @@ void DbGridControl::Command(const CommandEvent& rEvt)
IMPL_LINK_NOARG_TYPED(DbGridControl, OnDelete, void*, void)
{
- m_nDeleteEvent = 0;
+ m_nDeleteEvent = nullptr;
DeleteSelectedRows();
}
@@ -2865,14 +2865,14 @@ void DbGridControl::DeleteSelectedRows()
CellController* DbGridControl::GetController(long /*nRow*/, sal_uInt16 nColumnId)
{
if (!IsValid(m_xCurrentRow) || !IsEnabled())
- return NULL;
+ return nullptr;
size_t Location = GetModelColumnPos(nColumnId);
- DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
+ DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr;
if (!pColumn)
- return NULL;
+ return nullptr;
- CellController* pReturn = NULL;
+ CellController* pReturn = nullptr;
if (IsFilterMode())
pReturn = &pColumn->GetController();
else
@@ -2880,7 +2880,7 @@ CellController* DbGridControl::GetController(long /*nRow*/, sal_uInt16 nColumnId
if (::comphelper::hasProperty(FM_PROP_ENABLED, pColumn->getModel()))
{
if (!::comphelper::getBOOL(pColumn->getModel()->getPropertyValue(FM_PROP_ENABLED)))
- return NULL;
+ return nullptr;
}
bool bInsert = (m_xCurrentRow->IsNew() && (m_nOptions & OPT_INSERT));
@@ -2896,7 +2896,7 @@ CellController* DbGridControl::GetController(long /*nRow*/, sal_uInt16 nColumnId
// controller could not be set to read-only in forceROController
if (!bInsert && !bUpdate)
// better use no controller than one without read-only
- pReturn = NULL;
+ pReturn = nullptr;
}
}
}
@@ -2913,7 +2913,7 @@ void DbGridControl::CellModified()
{
SAL_INFO("svx.fmcomp", "forcing a synchron call to " << (m_bPendingAdjustRows ? "AdjustRows" : "AdustDataSource"));
RemoveUserEvent(m_nAsynAdjustEvent);
- m_nAsynAdjustEvent = 0;
+ m_nAsynAdjustEvent = nullptr;
// force the call : this should be no problem as we're probably running in the solar thread here
// (cell modified is triggered by user actions)
@@ -3103,7 +3103,7 @@ bool DbGridControl::SaveModified()
return true;
size_t Location = GetModelColumnPos( GetCurColumnId() );
- DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
+ DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr;
bool bOK = pColumn && pColumn->Commit();
DBG_ASSERT( Controller().Is(), "DbGridControl::SaveModified: was modified, by have no controller?!" );
if ( !Controller().Is() )
@@ -3257,7 +3257,7 @@ bool DbGridControl::PreNotify(NotifyEvent& rEvt)
// delete asynchronously
if (m_nDeleteEvent)
Application::RemoveUserEvent(m_nDeleteEvent);
- m_nDeleteEvent = Application::PostUserEvent(LINK(this,DbGridControl,OnDelete), NULL, true);
+ m_nDeleteEvent = Application::PostUserEvent(LINK(this,DbGridControl,OnDelete), nullptr, true);
return true;
}
}
@@ -3289,7 +3289,7 @@ void DbGridControl::KeyInput( const KeyEvent& rEvt )
if (nRow >= 0 && nRow < GetRowCount() && nColId < ColCount())
{
size_t Location = GetModelColumnPos( nColId );
- DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
+ DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr;
OStringTransfer::CopyString( GetCurrentRowCellText( pColumn, m_xCurrentRow ), this );
return;
}
@@ -3313,7 +3313,7 @@ void DbGridControl::HideColumn(sal_uInt16 nId)
// update my model
size_t Location = GetModelColumnPos( nId );
- DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
+ DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr;
DBG_ASSERT(pColumn, "DbGridControl::HideColumn : somebody did hide a nonexistent column !");
if (pColumn)
{
@@ -3461,7 +3461,7 @@ void DbGridControl::implAdjustInSolarThread(bool _bRows)
IMPL_LINK_TYPED(DbGridControl, OnAsyncAdjust, void*, pAdjustWhat, void)
{
- m_nAsynAdjustEvent = 0;
+ m_nAsynAdjustEvent = nullptr;
AdjustRows();
// see implAdjustInSolarThread for a comment why we do this every time
@@ -3551,7 +3551,7 @@ void DbGridControl::DisconnectFromFields()
}
delete pListeners;
- m_pFieldListeners = NULL;
+ m_pFieldListeners = nullptr;
}
void DbGridControl::FieldValueChanged(sal_uInt16 _nId, const PropertyChangeEvent& /*_evt*/)
@@ -3563,7 +3563,7 @@ void DbGridControl::FieldValueChanged(sal_uInt16 _nId, const PropertyChangeEvent
return;
size_t Location = GetModelColumnPos( _nId );
- DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
+ DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr;
if (pColumn)
{
std::unique_ptr<vcl::SolarMutexTryAndBuyGuard> pGuard;
@@ -3609,11 +3609,11 @@ void DbGridControl::disposing(sal_uInt16 _nId, const EventObject& /*_rEvt*/)
if (_nId == 0)
{ // the seek cursor is being disposed
::osl::MutexGuard aGuard(m_aAdjustSafety);
- setDataSource(NULL,0); // our clone was disposed so we set our datasource to null to avoid later access to it
+ setDataSource(nullptr,0); // our clone was disposed so we set our datasource to null to avoid later access to it
if (m_nAsynAdjustEvent)
{
RemoveUserEvent(m_nAsynAdjustEvent);
- m_nAsynAdjustEvent = 0;
+ m_nAsynAdjustEvent = nullptr;
}
}
}
@@ -3639,7 +3639,7 @@ Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, s
{
sal_uInt16 nColumnId = GetColumnId( _nColumnPos );
size_t Location = GetModelColumnPos(nColumnId);
- DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
+ DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : nullptr;
if ( pColumn )
{
Reference< css::awt::XControl> xInt(pColumn->GetCell());