summaryrefslogtreecommitdiff
path: root/svx/source/fmcomp
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/fmcomp')
-rw-r--r--svx/source/fmcomp/dbaexchange.cxx2
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx8
-rw-r--r--svx/source/fmcomp/fmgridif.cxx42
-rw-r--r--svx/source/fmcomp/gridcell.cxx60
-rw-r--r--svx/source/fmcomp/gridctrl.cxx102
5 files changed, 107 insertions, 107 deletions
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index b4e22f72eb06..265f89498fdb 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -377,7 +377,7 @@ namespace svx
,const OUString& _rCommand
)
{
- construct(_rDatasource,_rConnectionResource,_nCommandType,_rCommand,NULL,(CommandType::COMMAND == _nCommandType),_rCommand);
+ construct(_rDatasource,_rConnectionResource,_nCommandType,_rCommand,nullptr,(CommandType::COMMAND == _nCommandType),_rCommand);
}
ODataAccessObjectTransferable::ODataAccessObjectTransferable(
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 707cf7a5f8f3..2de79055f8af 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -141,7 +141,7 @@ FmGridHeader::~FmGridHeader()
void FmGridHeader::dispose()
{
delete m_pImpl;
- m_pImpl = NULL;
+ m_pImpl = nullptr;
svt::EditBrowserHeader::dispose();
}
@@ -363,7 +363,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
m_pImpl->xDroppedStatement = xStatement;
m_pImpl->xDroppedResultSet = xResultSet;
- PostUserEvent(LINK(this, FmGridHeader, OnAsyncExecuteDrop), NULL, true);
+ PostUserEvent(LINK(this, FmGridHeader, OnAsyncExecuteDrop), nullptr, true);
}
catch (Exception&)
{
@@ -761,7 +761,7 @@ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMe
// ask the bindings of the current view frame (which should be the one we're residing in) for the state
if (pCurrentFrame)
{
- SfxPoolItem* pItem = NULL;
+ SfxPoolItem* pItem = nullptr;
eState = pCurrentFrame->GetBindings().QueryState(SID_FM_CTL_PROPERTIES, pItem);
if (eState >= SfxItemState::DEFAULT && pItem )
@@ -863,7 +863,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- std::unique_ptr<AbstractFmShowColsDialog> pDlg(pFact->CreateFmShowColsDialog(NULL));
+ std::unique_ptr<AbstractFmShowColsDialog> pDlg(pFact->CreateFmShowColsDialog(nullptr));
DBG_ASSERT(pDlg, "Dialog creation failed!");
pDlg->SetColumns(xCols);
pDlg->Execute();
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 3e5bf2895630..61366574fba6 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -478,7 +478,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< css::awt::XToolkit >&
// mbCreatingPeer is virtually the same as m_nPeerCreationLevel, but it's the base class' method
// to prevent recursion.
- vcl::Window* pParentWin = NULL;
+ vcl::Window* pParentWin = nullptr;
if (rParentPeer.is())
{
VCLXWindow* pParent = VCLXWindow::GetImplementation(rParentPeer);
@@ -487,7 +487,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< css::awt::XToolkit >&
}
FmXGridPeer* pPeer = imp_CreatePeer(pParentWin);
- DBG_ASSERT(pPeer != NULL, "FmXGridControl::createPeer : imp_CreatePeer didn't return a peer !");
+ DBG_ASSERT(pPeer != nullptr, "FmXGridControl::createPeer : imp_CreatePeer didn't return a peer !");
setPeer( pPeer );
// reading the properties from the model
@@ -1046,9 +1046,9 @@ FmXGridPeer::FmXGridPeer(const Reference< XComponentContext >& _rxContext)
,m_aMode( getDataModeIdentifier() )
,m_nCursorListening(0)
,m_bInterceptingDispatch(false)
- ,m_pStateCache(NULL)
- ,m_pDispatchers(NULL)
- ,m_pGridListener(NULL)
+ ,m_pStateCache(nullptr)
+ ,m_pDispatchers(nullptr)
+ ,m_pGridListener(nullptr)
,m_xContext(_rxContext)
{
// Create must be called after this constructure
@@ -1065,7 +1065,7 @@ VclPtr<FmGridControl> FmXGridPeer::imp_CreateControl(vcl::Window* pParent, WinBi
void FmXGridPeer::Create(vcl::Window* pParent, WinBits nStyle)
{
FmGridControl* pWin = imp_CreateControl(pParent, nStyle);
- DBG_ASSERT(pWin != NULL, "FmXGridPeer::Create : imp_CreateControl didn't return a control !");
+ DBG_ASSERT(pWin != nullptr, "FmXGridPeer::Create : imp_CreateControl didn't return a control !");
pWin->SetStateProvider(LINK(this, FmXGridPeer, OnQueryGridSlotState));
pWin->SetSlotExecutor(LINK(this, FmXGridPeer, OnExecuteGridSlot));
@@ -1102,7 +1102,7 @@ const Sequence< sal_Int8 >& FmXGridPeer::getUnoTunnelImplementationId() throw()
FmXGridPeer* FmXGridPeer::getImplementation( const Reference< XInterface >& _rxIFace ) throw()
{
- FmXGridPeer* pReturn = NULL;
+ FmXGridPeer* pReturn = nullptr;
Reference< XUnoTunnel > xTunnel(_rxIFace, UNO_QUERY);
if (xTunnel.is())
pReturn = reinterpret_cast<FmXGridPeer*>(xTunnel->getSomething(getUnoTunnelImplementationId()));
@@ -1145,7 +1145,7 @@ using namespace ::com::sun::star::util;
if (xCursor.is())
{
setRowSet( m_xCursor );
- m_xCursor = NULL;
+ m_xCursor = nullptr;
bKnownSender = true;
}
@@ -1159,7 +1159,7 @@ using namespace ::com::sun::star::util;
if ( m_pDispatchers[i] == e.Source )
{
m_pDispatchers[i]->removeStatusListener( static_cast< css::frame::XStatusListener* >( this ), *pSupportedURLs );
- m_pDispatchers[i] = NULL;
+ m_pDispatchers[i] = nullptr;
m_pStateCache[i] = false;
bKnownSender = true;
}
@@ -1555,21 +1555,21 @@ void FmXGridPeer::loaded(const EventObject& /*rEvent*/) throw( RuntimeException,
void FmXGridPeer::unloaded(const EventObject& /*rEvent*/) throw( RuntimeException, std::exception )
{
- updateGrid( Reference< XRowSet > (NULL) );
+ updateGrid( Reference< XRowSet > (nullptr) );
}
void FmXGridPeer::reloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
{
// empty the grid
- updateGrid( Reference< XRowSet > (NULL) );
+ updateGrid( Reference< XRowSet > (nullptr) );
}
void FmXGridPeer::unloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
{
// empty the grid
- updateGrid( Reference< XRowSet > (NULL) );
+ updateGrid( Reference< XRowSet > (nullptr) );
}
@@ -2092,12 +2092,12 @@ void FmXGridPeer::dispose() throw( RuntimeException, std::exception )
while ( xInterceptor.is() )
{
// tell the interceptor it has a new (means no) predecessor
- xInterceptor->setMasterDispatchProvider( NULL );
+ xInterceptor->setMasterDispatchProvider( nullptr );
// ask for it's successor
Reference< XDispatchProvider > xSlave = xInterceptor->getSlaveDispatchProvider();
// and give it the new (means no) successoert
- xInterceptor->setSlaveDispatchProvider( NULL );
+ xInterceptor->setSlaveDispatchProvider( nullptr );
// start over with the next chain element
xInterceptor.set(xSlave, css::uno::UNO_QUERY);
@@ -2735,15 +2735,15 @@ void FmXGridPeer::UpdateDispatches()
{
delete[] m_pStateCache;
delete[] m_pDispatchers;
- m_pStateCache = NULL;
- m_pDispatchers = NULL;
+ m_pStateCache = nullptr;
+ m_pDispatchers = nullptr;
}
}
void FmXGridPeer::ConnectToDispatcher()
{
- DBG_ASSERT((m_pStateCache != NULL) == (m_pDispatchers != NULL), "FmXGridPeer::ConnectToDispatcher : inconsistent !");
+ DBG_ASSERT((m_pStateCache != nullptr) == (m_pDispatchers != nullptr), "FmXGridPeer::ConnectToDispatcher : inconsistent !");
if (m_pStateCache)
{ // already connected -> just do an update
UpdateDispatches();
@@ -2773,8 +2773,8 @@ void FmXGridPeer::ConnectToDispatcher()
{
delete[] m_pStateCache;
delete[] m_pDispatchers;
- m_pStateCache = NULL;
- m_pDispatchers = NULL;
+ m_pStateCache = nullptr;
+ m_pDispatchers = nullptr;
}
}
@@ -2795,8 +2795,8 @@ void FmXGridPeer::DisConnectFromDispatcher()
delete[] m_pStateCache;
delete[] m_pDispatchers;
- m_pStateCache = NULL;
- m_pDispatchers = NULL;
+ m_pStateCache = nullptr;
+ m_pDispatchers = nullptr;
}
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 1c05b027a468..20b8aca7eb10 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -179,7 +179,7 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< css::bea
}
}
- DbCellControl* pCellControl = NULL;
+ DbCellControl* pCellControl = nullptr;
if (m_rParent.IsFilterMode())
{
pCellControl = new DbFilterField(m_rParent.getContext(),*this);
@@ -318,11 +318,11 @@ void DbGridColumn::Clear()
m_pCell->dispose();
m_pCell->release();
- m_pCell = NULL;
+ m_pCell = nullptr;
}
- m_xController = NULL;
- m_xField = NULL;
+ m_xController = nullptr;
+ m_xField = nullptr;
m_nFormatKey = 0;
m_nFieldPos = -1;
@@ -545,14 +545,14 @@ TYPEINIT1( DbFilterField, DbCellControl )
DbCellControl::DbCellControl( DbGridColumn& _rColumn, bool /*_bText*/ )
:OPropertyChangeListener(m_aMutex)
- ,m_pModelChangeBroadcaster(NULL)
- ,m_pFieldChangeBroadcaster(NULL)
+ ,m_pModelChangeBroadcaster(nullptr)
+ ,m_pFieldChangeBroadcaster(nullptr)
,m_bTransparent( false )
,m_bAlignedController( true )
,m_bAccessingValueProperty( false )
,m_rColumn( _rColumn )
- ,m_pPainter( NULL )
- ,m_pWindow( NULL )
+ ,m_pPainter( nullptr )
+ ,m_pWindow( nullptr )
{
Reference< XPropertySet > xColModelProps( _rColumn.getModel(), UNO_QUERY );
if ( xColModelProps.is() )
@@ -634,7 +634,7 @@ static void lcl_clearBroadCaster(::comphelper::OPropertyChangeMultiplexer*& _pBr
{
_pBroadcaster->dispose();
_pBroadcaster->release();
- _pBroadcaster = NULL;
+ _pBroadcaster = nullptr;
// no delete, this is done implicitly
}
}
@@ -1075,8 +1075,8 @@ void DbLimitedLengthField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen )
DbTextField::DbTextField(DbGridColumn& _rColumn)
:DbLimitedLengthField(_rColumn)
- ,m_pEdit( NULL )
- ,m_pPainterImplementation( NULL )
+ ,m_pEdit( nullptr )
+ ,m_pPainterImplementation( nullptr )
,m_bIsSimpleEdit( true )
{
}
@@ -1335,7 +1335,7 @@ void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& x
}
}
- SvNumberFormatter* pFormatterUsed = NULL;
+ SvNumberFormatter* pFormatterUsed = nullptr;
if (m_xSupplier.is())
{
SvNumberFormatsSupplierObj* pImplmentation = SvNumberFormatsSupplierObj::getImplementation(m_xSupplier);
@@ -1348,10 +1348,10 @@ void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& x
}
// einen Standard-Formatter ...
- if (pFormatterUsed == NULL)
+ if (pFormatterUsed == nullptr)
{
pFormatterUsed = static_cast<FormattedField*>(m_pWindow.get())->StandardFormatter();
- DBG_ASSERT(pFormatterUsed != NULL, "DbFormattedField::Init : no standard formatter given by the numeric field !");
+ DBG_ASSERT(pFormatterUsed != nullptr, "DbFormattedField::Init : no standard formatter given by the numeric field !");
}
// ... und einen Standard-Key
if (nFormatKey == -1)
@@ -1488,8 +1488,8 @@ void DbFormattedField::_propertyChanged( const PropertyChangeEvent& _rEvent ) th
OUString DbFormattedField::GetFormatText(const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** ppColor)
{
// defaultmaessig keine Farb-Angabe
- if (ppColor != NULL)
- *ppColor = NULL;
+ if (ppColor != nullptr)
+ *ppColor = nullptr;
// NULL-Wert -> leerer Text
if (!_rxField.is())
@@ -1526,7 +1526,7 @@ OUString DbFormattedField::GetFormatText(const Reference< css::sdb::XColumn >& _
}
aText = m_pPainter->GetText();
- if (ppColor != NULL)
+ if (ppColor != nullptr)
*ppColor = static_cast<FormattedField*>(m_pPainter.get())->GetLastOutputColor();
return aText;
@@ -1922,16 +1922,16 @@ void DbNumericField::implAdjustGenericFieldSetting( const Reference< XPropertySe
xForm.set( Reference< XInterface >(*m_rColumn.GetParent().getDataSource()), UNO_QUERY );
if ( xForm.is() )
xSupplier = getNumberFormats( getConnection( xForm ), true );
- SvNumberFormatter* pFormatterUsed = NULL;
+ SvNumberFormatter* pFormatterUsed = nullptr;
if ( xSupplier.is() )
{
SvNumberFormatsSupplierObj* pImplmentation = SvNumberFormatsSupplierObj::getImplementation( xSupplier );
- pFormatterUsed = pImplmentation ? pImplmentation->GetNumberFormatter() : NULL;
+ pFormatterUsed = pImplmentation ? pImplmentation->GetNumberFormatter() : nullptr;
}
- if ( NULL == pFormatterUsed )
+ if ( nullptr == pFormatterUsed )
{ // der Cursor fuehrte nicht zum Erfolg -> Standard
pFormatterUsed = static_cast< DoubleNumericField* >( m_pWindow.get() )->StandardFormatter();
- DBG_ASSERT( pFormatterUsed != NULL, "DbNumericField::implAdjustGenericFieldSetting: no standard formatter given by the numeric field !" );
+ DBG_ASSERT( pFormatterUsed != nullptr, "DbNumericField::implAdjustGenericFieldSetting: no standard formatter given by the numeric field !" );
}
static_cast< DoubleNumericField* >( m_pWindow.get() )->SetFormatter( pFormatterUsed );
static_cast< DoubleNumericField* >( m_pPainter.get() )->SetFormatter( pFormatterUsed );
@@ -3169,7 +3169,7 @@ vcl::Window* FmXGridCell::getEventWindow() const
{
if ( m_pCellControl )
return &m_pCellControl->GetWindow();
- return NULL;
+ return nullptr;
}
@@ -3228,7 +3228,7 @@ void FmXGridCell::disposing()
m_aMouseMotionListeners.disposeAndClear( aEvent );
OComponentHelper::disposing();
- m_pColumn = NULL;
+ m_pColumn = nullptr;
DELETEZ(m_pCellControl);
}
@@ -3240,7 +3240,7 @@ Any SAL_CALL FmXGridCell::queryAggregation( const css::uno::Type& _rType ) throw
if ( !aReturn.hasValue() )
aReturn = FmXGridCell_Base::queryInterface( _rType );
- if ( !aReturn.hasValue() && ( m_pCellControl != NULL ) )
+ if ( !aReturn.hasValue() && ( m_pCellControl != nullptr ) )
aReturn = FmXGridCell_WindowBase::queryInterface( _rType );
return aReturn;
@@ -3569,9 +3569,9 @@ void FmXTextCell::PaintFieldToCell(OutputDevice& rDev,
nStyle |= DrawTextFlags::Left;
}
- Color* pColor = NULL;
+ Color* pColor = nullptr;
OUString aText = GetText(_rxField, xFormatter, &pColor);
- if (pColor != NULL)
+ if (pColor != nullptr)
{
Color aOldTextColor( rDev.GetTextColor() );
rDev.SetTextColor( *pColor );
@@ -3586,7 +3586,7 @@ FmXEditCell::FmXEditCell( DbGridColumn* pColumn, DbCellControl& _rControl )
:FmXTextCell( pColumn, _rControl )
,m_aTextListeners(m_aMutex)
,m_aChangeListeners( m_aMutex )
- ,m_pEditImplementation( NULL )
+ ,m_pEditImplementation( nullptr )
,m_bOwnEditImplementation( false )
{
@@ -3628,7 +3628,7 @@ void FmXEditCell::disposing()
m_pEditImplementation->SetModifyHdl( Link<Edit&,void>() );
if ( m_bOwnEditImplementation )
delete m_pEditImplementation;
- m_pEditImplementation = NULL;
+ m_pEditImplementation = nullptr;
FmXDataCell::disposing();
}
@@ -3872,7 +3872,7 @@ void FmXCheckBoxCell::disposing()
m_aActionListeners.disposeAndClear(aEvt);
static_cast< CheckBoxControl& >( m_pCellControl->GetWindow() ).SetClickHdl(Link<VclPtr<CheckBox>,void>());
- m_pBox = NULL;
+ m_pBox = nullptr;
FmXDataCell::disposing();
}
@@ -4049,7 +4049,7 @@ void FmXListBoxCell::disposing()
m_pBox->SetSelectHdl( Link<ListBox&,void>() );
m_pBox->SetDoubleClickHdl( Link<ListBox&,void>() );
- m_pBox = NULL;
+ m_pBox = nullptr;
FmXTextCell::disposing();
}
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());
generated by cgit (git 2.34.1) at 2024-07-26 01:32:57 +0000