summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/app
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui/app')
-rw-r--r--dbaccess/source/ui/app/AppController.cxx36
-rw-r--r--dbaccess/source/ui/app/AppController.hxx2
-rw-r--r--dbaccess/source/ui/app/AppControllerDnD.cxx10
-rw-r--r--dbaccess/source/ui/app/AppControllerGen.cxx2
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx40
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.hxx2
-rw-r--r--dbaccess/source/ui/app/AppDetailView.cxx28
-rw-r--r--dbaccess/source/ui/app/AppDetailView.hxx2
-rw-r--r--dbaccess/source/ui/app/AppIconControl.cxx4
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.cxx6
-rw-r--r--dbaccess/source/ui/app/AppTitleWindow.cxx2
-rw-r--r--dbaccess/source/ui/app/AppView.cxx12
-rw-r--r--dbaccess/source/ui/app/subcomponentmanager.cxx2
13 files changed, 74 insertions, 74 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index def970574e1b..54ccc81c44c8 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -274,8 +274,8 @@ OApplicationController::OApplicationController(const Reference< XComponentContex
,m_pSubComponentManager( new SubComponentManager( *this, getSharedMutex() ) )
,m_aTypeCollection( _rxORB )
,m_aTableCopyHelper(this)
- ,m_pClipbordNotifier(NULL)
- ,m_nAsyncDrop(0)
+ ,m_pClipbordNotifier(nullptr)
+ ,m_nAsyncDrop(nullptr)
,m_aSelectContainerEvent( LINK( this, OApplicationController, OnSelectContainer ) )
,m_ePreviewMode(E_PREVIEWNONE)
,m_eCurrentType(E_NONE)
@@ -338,11 +338,11 @@ void SAL_CALL OApplicationController::disposing()
if ( getView() )
{
- getContainer()->showPreview(NULL);
+ getContainer()->showPreview(nullptr);
m_pClipbordNotifier->ClearCallbackLink();
m_pClipbordNotifier->AddRemoveListener( getView(), false );
m_pClipbordNotifier->release();
- m_pClipbordNotifier = NULL;
+ m_pClipbordNotifier = nullptr;
}
disconnect();
@@ -364,7 +364,7 @@ void SAL_CALL OApplicationController::disposing()
m_xDataSource->removePropertyChangeListener(PROPERTY_USER, this);
// otherwise we may delete our datasource twice
Reference<XPropertySet> xProp = m_xDataSource;
- m_xDataSource = NULL;
+ m_xDataSource = nullptr;
}
Reference< XModifyBroadcaster > xBroadcaster( m_xModel, UNO_QUERY );
@@ -478,7 +478,7 @@ void SAL_CALL OApplicationController::disposing(const EventObject& _rSource) thr
}
else if ( _rSource.Source == m_xDataSource )
{
- m_xDataSource = NULL;
+ m_xDataSource = nullptr;
}
else
{
@@ -1236,7 +1236,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
case SID_APP_NEW_FOLDER:
{
ElementType eType = getContainer()->getElementType();
- OUString sName = getContainer()->getQualifiedName( NULL );
+ OUString sName = getContainer()->getQualifiedName( nullptr );
insertHierachyElement(eType,sName);
}
break;
@@ -1253,7 +1253,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
const Reference< XDataSource > xDataSource( m_xDataSource, UNO_QUERY );
const Reference< XComponent > xComponent( aDesigner.createNew( xDataSource, aCreationArgs ), UNO_QUERY );
- onDocumentOpened( OUString(), E_QUERY, E_OPEN_DESIGN, xComponent, NULL );
+ onDocumentOpened( OUString(), E_QUERY, E_OPEN_DESIGN, xComponent, nullptr );
}
}
break;
@@ -1305,7 +1305,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
const Reference< XDataSource > xDataSource( m_xDataSource, UNO_QUERY );
const Reference< XComponent > xComponent( aDesigner.createNew( xDataSource ), UNO_QUERY );
- onDocumentOpened( OUString(), SID_DB_APP_DSRELDESIGN, E_OPEN_DESIGN, xComponent, NULL );
+ onDocumentOpened( OUString(), SID_DB_APP_DSRELDESIGN, E_OPEN_DESIGN, xComponent, nullptr );
}
}
}
@@ -1778,13 +1778,13 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const
{
OSL_PRECOND( getContainer(), "OApplicationController::openElementWithArguments: no view!" );
if ( !getContainer() )
- return NULL;
+ return nullptr;
Reference< XComponent > xRet;
if ( _eOpenMode == E_OPEN_DESIGN )
{
// OJ: http://www.openoffice.org/issues/show_bug.cgi?id=30382
- getContainer()->showPreview(NULL);
+ getContainer()->showPreview(nullptr);
}
bool isStandaloneDocument = false;
@@ -1869,7 +1869,7 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const
}
xRet.set( pDesigner->openExisting( aDataSource, _sName, aArguments ) );
- onDocumentOpened( _sName, _eType, _eOpenMode, xRet, NULL );
+ onDocumentOpened( _sName, _eType, _eOpenMode, xRet, nullptr );
}
}
break;
@@ -2183,7 +2183,7 @@ void OApplicationController::onSelectionChanged()
const ElementType eType = pView->getElementType();
if ( pView->isALeafSelected() )
{
- const OUString sName = pView->getQualifiedName( NULL /* means 'first selected' */ );
+ const OUString sName = pView->getQualifiedName( nullptr /* means 'first selected' */ );
showPreviewFor( eType, sName );
}
}
@@ -2362,7 +2362,7 @@ bool OApplicationController::requestQuickHelp( const SvTreeListEntry* /*_pEntry*
bool OApplicationController::requestDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel*/ )
{
- TransferableHelper* pTransfer = NULL;
+ TransferableHelper* pTransfer = nullptr;
if ( getContainer() && getContainer()->getSelectionCount() )
{
try
@@ -2382,7 +2382,7 @@ bool OApplicationController::requestDrag( sal_Int8 /*_nAction*/, const Point& /*
}
}
- return NULL != pTransfer;
+ return nullptr != pTransfer;
}
sal_Int8 OApplicationController::queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors )
@@ -2447,7 +2447,7 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt )
if ( m_nAsyncDrop )
Application::RemoveUserEvent(m_nAsyncDrop);
- m_nAsyncDrop = 0;
+ m_nAsyncDrop = nullptr;
m_aAsyncDrop.aDroppedData.clear();
m_aAsyncDrop.nType = pView->getElementType();
m_aAsyncDrop.nAction = _rEvt.mnAction;
@@ -2598,7 +2598,7 @@ void OApplicationController::OnFirstControllerConnected()
aDetail.Message = OUString( ModuleRes( STR_SUB_DOCS_WITH_SCRIPTS_DETAIL ) );
aWarning.NextException <<= aDetail;
- Reference< XExecutableDialog > xDialog = ErrorMessageDialog::create( getORB(), "", NULL, makeAny( aWarning ) );
+ Reference< XExecutableDialog > xDialog = ErrorMessageDialog::create( getORB(), "", nullptr, makeAny( aWarning ) );
xDialog->execute();
}
catch( const Exception& )
@@ -2735,7 +2735,7 @@ OUString OApplicationController::getCurrentlySelectedName(sal_Int32& _rnCommandT
{
try
{
- sName = getContainer()->getQualifiedName( NULL );
+ sName = getContainer()->getQualifiedName( nullptr );
OSL_ENSURE( !sName.isEmpty(), "OApplicationController::getCurrentlySelectedName: no name given!" );
}
catch( const Exception& )
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 687f8bfb2860..cc7bcf1ac543 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -468,7 +468,7 @@ namespace dbaui
DO NOT CALL with getMutex() held!!
*/
- const SharedConnection& ensureConnection( ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL );
+ const SharedConnection& ensureConnection( ::dbtools::SQLExceptionInfo* _pErrorInfo = nullptr );
/** retrieves the current connection
*/
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 484acf870e8d..cc71d6b679c1 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -520,7 +520,7 @@ TransferableHelper* OApplicationController::copyObject()
::osl::MutexGuard aGuard( getMutex() );
ElementType eType = getContainer()->getElementType();
- TransferableHelper* pData = NULL;
+ TransferableHelper* pData = nullptr;
switch( eType )
{
case E_TABLE:
@@ -531,7 +531,7 @@ TransferableHelper* OApplicationController::copyObject()
if ( xConnection.is() )
xMetaData = xConnection->getMetaData();
- OUString sName = getContainer()->getQualifiedName( NULL );
+ OUString sName = getContainer()->getQualifiedName( nullptr );
if ( !sName.isEmpty() )
{
OUString sDataSource = getDatabaseName();
@@ -575,7 +575,7 @@ TransferableHelper* OApplicationController::copyObject()
{
DBG_UNHANDLED_EXCEPTION();
}
- return NULL;
+ return nullptr;
}
bool OApplicationController::paste( ElementType _eType, const svx::ODataAccessDescriptor& _rPasteData, const OUString& _sParentFolder, bool _bMove)
@@ -642,7 +642,7 @@ bool OApplicationController::paste( ElementType _eType, const svx::ODataAccessDe
{
// the concrete query
Reference< XQueryDefinitionsSupplier > xSourceQuerySup(
- getDataSourceByName( sDataSourceName, getView(), getORB(), NULL ),
+ getDataSourceByName( sDataSourceName, getView(), getORB(), nullptr ),
UNO_QUERY_THROW );
Reference< XNameAccess > xQueries( xSourceQuerySup->getQueryDefinitions(), UNO_SET_THROW );
if ( xQueries->hasByName( sCommand ) )
@@ -798,7 +798,7 @@ bool OApplicationController::isTableFormat() const
IMPL_LINK_NOARG_TYPED( OApplicationController, OnAsyncDrop, void*, void )
{
- m_nAsyncDrop = 0;
+ m_nAsyncDrop = nullptr;
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( getMutex() );
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index df9e1c3909ff..286c752c7385 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -672,7 +672,7 @@ void OApplicationController::onLoadedMenu(const Reference< css::frame::XLayoutMa
MnemonicGenerator aMnemonicGenerator;
// - the menu already has mnemonics
SystemWindow* pSystemWindow = getContainer()->GetSystemWindow();
- MenuBar* pMenu = pSystemWindow ? pSystemWindow->GetMenuBar() : NULL;
+ MenuBar* pMenu = pSystemWindow ? pSystemWindow->GetMenuBar() : nullptr;
if ( pMenu )
{
sal_uInt16 nMenuItems = pMenu->GetItemCount();
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 8ab030f3979b..c2b063f8f0e3 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -93,7 +93,7 @@ namespace
{
SvTreeListEntry* lcl_findEntry_impl(DBTreeListBox& rTree,const OUString& _rName,SvTreeListEntry* _pFirst)
{
- SvTreeListEntry* pReturn = NULL;
+ SvTreeListEntry* pReturn = nullptr;
sal_Int32 nIndex = 0;
OUString sName( _rName.getToken(0,'/',nIndex) );
@@ -122,7 +122,7 @@ namespace
{
sal_Int32 nIndex = 0;
OUString sErase = _rName.getToken(0,'/',nIndex); // we don't want to have the "private:forms" part
- return (nIndex != -1 ? lcl_findEntry_impl(rTree,_rName.copy(sErase.getLength() + 1),_pFirst) : NULL);
+ return (nIndex != -1 ? lcl_findEntry_impl(rTree,_rName.copy(sErase.getLength() + 1),_pFirst) : nullptr);
}
// class OPreviewWindow
class OTablePreviewWindow : public vcl::Window
@@ -143,7 +143,7 @@ namespace
{
bool bRet = Window::Notify( rNEvt );
if ( rNEvt.GetType() == MouseNotifyEvent::INPUTENABLE && IsInputEnabled() )
- PostUserEvent( LINK( this, OTablePreviewWindow, OnDisableInput), NULL, true );
+ PostUserEvent( LINK( this, OTablePreviewWindow, OnDisableInput), nullptr, true );
return bRet;
}
IMPL_LINK_NOARG_TYPED(OTablePreviewWindow, OnDisableInput, void*, void)
@@ -220,7 +220,7 @@ OAppDetailPageHelper::OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindo
SetUniqueId(UID_APP_DETAILPAGE_HELPER);
for (int i=0; i < E_ELEMENT_TYPE_COUNT; ++i)
- m_pLists[i] = NULL;
+ m_pLists[i] = nullptr;
ImplInitSettings();
}
@@ -368,7 +368,7 @@ void OAppDetailPageHelper::describeCurrentSelectionForControl( const Control& _r
void OAppDetailPageHelper::describeCurrentSelectionForType( const ElementType _eType, Sequence< NamedDatabaseObject >& _out_rSelectedObjects )
{
OSL_ENSURE( _eType < E_ELEMENT_TYPE_COUNT, "OAppDetailPageHelper::describeCurrentSelectionForType: invalid type!" );
- DBTreeListBox* pList = ( _eType < E_ELEMENT_TYPE_COUNT ) ? m_pLists[ _eType ].get() : NULL;
+ DBTreeListBox* pList = ( _eType < E_ELEMENT_TYPE_COUNT ) ? m_pLists[ _eType ].get() : nullptr;
OSL_ENSURE( pList, "OAppDetailPageHelper::describeCurrentSelectionForType: "
"You really should ensure this type has already been viewed before!" );
if ( !pList )
@@ -557,7 +557,7 @@ bool OAppDetailPageHelper::isALeafSelected() const
SvTreeListEntry* OAppDetailPageHelper::getEntry( const Point& _aPosPixel) const
{
- SvTreeListEntry* pReturn = NULL;
+ SvTreeListEntry* pReturn = nullptr;
int nPos = getVisibleControlIndex();
if ( nPos < E_ELEMENT_TYPE_COUNT )
pReturn = m_pLists[nPos]->GetEntry( _aPosPixel, true );
@@ -650,7 +650,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
{
if ( !m_pLists[_eType]->GetEntryCount() && _xContainer.is() )
{
- fillNames( _xContainer, _eType, nImageId, NULL );
+ fillNames( _xContainer, _eType, nImageId, nullptr );
m_pLists[_eType]->SelectAll(false);
}
@@ -665,11 +665,11 @@ void OAppDetailPageHelper::setDetailPage(vcl::Window* _pWindow)
if ( pCurrent )
pCurrent->Hide();
- showPreview(NULL);
+ showPreview(nullptr);
bool bHasFocus = false;
m_aFL->Show();
{
- bHasFocus = pCurrent != 0 && pCurrent->HasChildPathFocus();
+ bHasFocus = pCurrent != nullptr && pCurrent->HasChildPathFocus();
_pWindow->Show();
}
m_aTBPreview->Show();
@@ -715,7 +715,7 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine
const OUString* pEnd = pIter + aSeq.getLength();
for(;pIter != pEnd;++pIter)
{
- SvTreeListEntry* pEntry = NULL;
+ SvTreeListEntry* pEntry = nullptr;
Reference<XNameAccess> xSubElements(_xContainer->getByName(*pIter),UNO_QUERY);
if ( xSubElements.is() )
{
@@ -749,7 +749,7 @@ DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, cons
_pTreeView->SetStyle(_pTreeView->GetStyle() | WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP);
_pTreeView->GetModel()->SetSortMode(SortAscending);
- _pTreeView->EnableCheckButton( NULL ); // do not show any buttons
+ _pTreeView->EnableCheckButton( nullptr ); // do not show any buttons
_pTreeView->SetSelectionMode(MULTIPLE_SELECTION);
_pTreeView->SetDefaultCollapsedEntryBmp( _rImage );
@@ -771,7 +771,7 @@ DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, cons
void OAppDetailPageHelper::clearPages()
{
- showPreview(NULL);
+ showPreview(nullptr);
for (size_t i=0; i < E_ELEMENT_TYPE_COUNT; ++i)
{
if ( m_pLists[i] )
@@ -795,7 +795,7 @@ void OAppDetailPageHelper::elementReplaced(ElementType _eType
if ( pTreeView )
{
OUString sNewName = _rNewName;
- SvTreeListEntry* pEntry = NULL;
+ SvTreeListEntry* pEntry = nullptr;
switch( _eType )
{
case E_TABLE:
@@ -823,7 +823,7 @@ void OAppDetailPageHelper::elementReplaced(ElementType _eType
SvTreeListEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const OUString& _rName, const Any& _rObject )
{
- SvTreeListEntry* pRet = NULL;
+ SvTreeListEntry* pRet = nullptr;
DBTreeListBox* pTreeView = m_pLists[_eType];
if( _eType == E_TABLE && pTreeView )
{
@@ -832,7 +832,7 @@ SvTreeListEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const OUS
else if ( pTreeView )
{
- SvTreeListEntry* pEntry = NULL;
+ SvTreeListEntry* pEntry = nullptr;
Reference<XChild> xChild(_rObject,UNO_QUERY);
if ( xChild.is() && E_QUERY != _eType )
{
@@ -899,7 +899,7 @@ void OAppDetailPageHelper::elementRemoved( ElementType _eType,const OUString& _r
OSL_FAIL("Invalid element type");
}
if ( !pTreeView->GetEntryCount() )
- showPreview(NULL);
+ showPreview(nullptr);
}
}
@@ -910,7 +910,7 @@ IMPL_LINK_TYPED(OAppDetailPageHelper, OnEntryEnterKey, DBTreeListBox*, _pTree, v
IMPL_LINK_TYPED(OAppDetailPageHelper, OnEntryDoubleClick, SvTreeListBox*, _pTree, bool)
{
OSL_ENSURE( _pTree, "OAppDetailPageHelper, OnEntryDoubleClick: invalid callback!" );
- bool bHandled = ( _pTree != NULL ) && getBorderWin().getView()->getAppController().onEntryDoubleClick( *_pTree );
+ bool bHandled = ( _pTree != nullptr ) && getBorderWin().getView()->getAppController().onEntryDoubleClick( *_pTree );
return bHandled;
}
@@ -1114,7 +1114,7 @@ void OAppDetailPageHelper::showPreview( const OUString& _sDataSourceName,
Reference< XDatabaseDocumentUI > xApplication( getBorderWin().getView()->getAppController().getXController(), UNO_QUERY );
std::unique_ptr< DatabaseObjectView > pDispatcher( new ResultSetBrowser(
getBorderWin().getView()->getORB(),
- xApplication, NULL, _bTable
+ xApplication, nullptr, _bTable
) );
pDispatcher->setTargetFrame( Reference<XFrame>(m_xFrame,UNO_QUERY_THROW) );
@@ -1139,7 +1139,7 @@ void OAppDetailPageHelper::showPreview( const OUString& _sDataSourceName,
}
}
if ( bClearPreview )
- showPreview(NULL);
+ showPreview(nullptr);
}
}
@@ -1218,7 +1218,7 @@ void OAppDetailPageHelper::DataChanged( const DataChangedEvent& rDCEvt )
if ( m_pLists[ E_TABLE ] )
{
OTableTreeListBox* pTableTree = dynamic_cast< OTableTreeListBox* >( m_pLists[ E_TABLE ].get() );
- OSL_ENSURE( pTableTree != NULL, "OAppDetailPageHelper::DataChanged: a tree list for tables which is no TableTreeList?" );
+ OSL_ENSURE( pTableTree != nullptr, "OAppDetailPageHelper::DataChanged: a tree list for tables which is no TableTreeList?" );
if ( pTableTree )
pTableTree->notifyHiContrastChanged();
}
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index d499006deab4..38631533ea54 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -193,7 +193,7 @@ namespace dbaui
inline DBTreeListBox* getCurrentView() const
{
ElementType eType = getElementType();
- return (eType != E_NONE ) ? m_pLists[static_cast<sal_Int32>(eType)].get() : NULL;
+ return (eType != E_NONE ) ? m_pLists[static_cast<sal_Int32>(eType)].get() : nullptr;
}
/// select all entries in the visible control
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 4305a105700b..0f537e8eb131 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -74,8 +74,8 @@ TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, sal_uInt16 _nHelpID, sa
OCreationList::OCreationList( OTasksWindow& _rParent )
:SvTreeListBox( &_rParent, WB_TABSTOP | WB_HASBUTTONSATROOT | WB_HASBUTTONS )
,m_rTaskWindow( _rParent )
- ,m_pMouseDownEntry( NULL )
- ,m_pLastActiveEntry( NULL )
+ ,m_pMouseDownEntry( nullptr )
+ ,m_pLastActiveEntry( nullptr )
{
sal_uInt16 nSize = SPACEBETWEENENTRIES;
SetSpaceBetweenEntries(nSize);
@@ -156,8 +156,8 @@ Rectangle OCreationList::GetFocusRect( SvTreeListEntry* _pEntry, long _nLine )
// try to let the focus rect start before the bitmap item - this looks better
SvLBoxItem* pBitmapItem = _pEntry->GetFirstItem( SV_ITEM_ID_LBOXCONTEXTBMP );
- SvLBoxTab* pTab = pBitmapItem ? GetTab( _pEntry, pBitmapItem ) : NULL;
- SvViewDataItem* pItemData = pBitmapItem ? GetViewDataItem( _pEntry, pBitmapItem ) : NULL;
+ SvLBoxTab* pTab = pBitmapItem ? GetTab( _pEntry, pBitmapItem ) : nullptr;
+ SvViewDataItem* pItemData = pBitmapItem ? GetViewDataItem( _pEntry, pBitmapItem ) : nullptr;
OSL_ENSURE( pTab && pItemData, "OCreationList::GetFocusRect: could not find the first bitmap item!" );
if ( pTab && pItemData )
aRect.Left() = pTab->GetPos() - pItemData->maSize.Width() / 2;
@@ -180,8 +180,8 @@ void OCreationList::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel*
void OCreationList::ModelHasCleared()
{
SvTreeListBox::ModelHasCleared();
- m_pLastActiveEntry = NULL;
- m_pMouseDownEntry = NULL;
+ m_pLastActiveEntry = nullptr;
+ m_pMouseDownEntry = nullptr;
}
void OCreationList::GetFocus()
@@ -195,7 +195,7 @@ void OCreationList::LoseFocus()
{
SvTreeListBox::LoseFocus();
m_pLastActiveEntry = GetCurEntry();
- setCurrentEntryInvalidate( NULL );
+ setCurrentEntryInvalidate( nullptr );
}
void OCreationList::MouseButtonDown( const MouseEvent& rMEvt )
@@ -215,7 +215,7 @@ void OCreationList::MouseMove( const MouseEvent& rMEvt )
{
if ( rMEvt.IsLeaveWindow() )
{
- setCurrentEntryInvalidate( NULL );
+ setCurrentEntryInvalidate( nullptr );
}
else if ( !rMEvt.IsSynthetic() )
{
@@ -233,7 +233,7 @@ void OCreationList::MouseMove( const MouseEvent& rMEvt )
{
OSL_ENSURE( ( GetCurEntry() == m_pMouseDownEntry ) || !GetCurEntry(),
"OCreationList::MouseMove: inconsistence (2)!" );
- setCurrentEntryInvalidate( NULL );
+ setCurrentEntryInvalidate( nullptr );
}
}
else
@@ -268,7 +268,7 @@ void OCreationList::MouseButtonUp( const MouseEvent& rMEvt )
ReleaseMouse();
InvalidateEntry( m_pMouseDownEntry );
- m_pMouseDownEntry = NULL;
+ m_pMouseDownEntry = nullptr;
}
SvTreeListBox::MouseButtonUp( rMEvt );
@@ -572,8 +572,8 @@ OApplicationDetailView::~OApplicationDetailView()
void OApplicationDetailView::dispose()
{
- set(NULL);
- setSplitter(NULL);
+ set(nullptr);
+ setSplitter(nullptr);
m_aHorzSplitter.disposeAndClear();
m_aTasks.disposeAndClear();
m_aContainer.disposeAndClear();
@@ -644,12 +644,12 @@ bool OApplicationDetailView::interceptKeyInput( const KeyEvent& _rEvent )
void OApplicationDetailView::createTablesPage(const Reference< XConnection >& _xConnection )
{
- impl_createPage( E_TABLE, _xConnection, NULL );
+ impl_createPage( E_TABLE, _xConnection, nullptr );
}
void OApplicationDetailView::createPage( ElementType _eType,const Reference< XNameAccess >& _xContainer )
{
- impl_createPage( _eType, NULL, _xContainer );
+ impl_createPage( _eType, nullptr, _xContainer );
}
void OApplicationDetailView::impl_createPage( ElementType _eType, const Reference< XConnection >& _rxConnection,
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 776b5d094313..7ccccb81df79 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -66,7 +66,7 @@ namespace dbaui
virtual void GetFocus() override;
virtual void LoseFocus() override;
- inline void resetLastActive() { m_pLastActiveEntry = NULL;}
+ inline void resetLastActive() { m_pLastActiveEntry = nullptr;}
void updateHelpText();
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index a78910f3854b..0fcf1e76b6a5 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -33,7 +33,7 @@ OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent)
: SvtIconChoiceCtrl(_pParent,WB_ICON | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /*!WB_NOSELECTION |*/
WB_TABSTOP | WB_CLIPCHILDREN | WB_NOVSCROLL | WB_SMART_ARRANGE | WB_NOHSCROLL | WB_CENTER)
,DropTargetHelper(this)
- ,m_pActionListener(NULL)
+ ,m_pActionListener(nullptr)
{
struct CategoryDescriptor
@@ -74,7 +74,7 @@ void OApplicationIconControl::dispose()
if ( pEntry )
{
std::unique_ptr<ElementType> aType(static_cast<ElementType*>(pEntry->GetUserData()));
- pEntry->SetUserData(NULL);
+ pEntry->SetUserData(nullptr);
}
}
SvtIconChoiceCtrl::dispose();
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index eb4a6189c97a..5e6db07d5fda 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -153,7 +153,7 @@ bool OApplicationSwapWindow::onContainerSelected( ElementType _eType )
return true;
}
- PostUserEvent( LINK( this, OApplicationSwapWindow, ChangeToLastSelected ), NULL, true );
+ PostUserEvent( LINK( this, OApplicationSwapWindow, ChangeToLastSelected ), nullptr, true );
return false;
}
@@ -176,13 +176,13 @@ IMPL_LINK_NOARG_TYPED(OApplicationSwapWindow, ChangeToLastSelected, void*, void)
void OApplicationSwapWindow::selectContainer(ElementType _eType)
{
sal_uLong nCount = m_aIconControl->GetEntryCount();
- SvxIconChoiceCtrlEntry* pEntry = NULL;
+ SvxIconChoiceCtrlEntry* pEntry = nullptr;
for (sal_uLong i=0; i < nCount; ++i)
{
pEntry = m_aIconControl->GetEntry(i);
if ( pEntry && *static_cast<ElementType*>(pEntry->GetUserData()) == _eType )
break;
- pEntry = NULL;
+ pEntry = nullptr;
}
if ( pEntry )
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index 764656c7f5b8..c05151a15fdc 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -31,7 +31,7 @@ OTitleWindow::OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _n
, m_aSpace1(VclPtr<FixedText>::Create(this))
, m_aSpace2(VclPtr<FixedText>::Create(this))
, m_aTitle(VclPtr<FixedText>::Create(this))
-, m_pChild(NULL)
+, m_pChild(nullptr)
, m_bShift(_bShift)
{
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 95b0b3d46188..56947d139f90 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -60,8 +60,8 @@ using ::com::sun::star::sdb::application::NamedDatabaseObject;
// class OAppBorderWindow
OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL)
- ,m_pPanel(NULL)
- ,m_pDetailView(NULL)
+ ,m_pPanel(nullptr)
+ ,m_pDetailView(nullptr)
,m_pView(_pParent)
{
@@ -293,7 +293,7 @@ bool OApplicationView::PreNotify( NotifyEvent& rNEvt )
IClipboardTest* OApplicationView::getActiveChild() const
{
- IClipboardTest* pTest = NULL;
+ IClipboardTest* pTest = nullptr;
if ( DETAIL == m_eChildFocus )
pTest = getDetailView();
return pTest;
@@ -490,7 +490,7 @@ void OApplicationView::showPreview(const Reference< XContent >& _xContent)
{
OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF");
stopComponentListening(m_xObject);
- m_xObject = NULL;
+ m_xObject = nullptr;
getDetailView()->showPreview(_xContent);
}
@@ -503,7 +503,7 @@ void OApplicationView::showPreview( const OUString& _sDataSourceName,
if ( isPreviewEnabled() )
{
stopComponentListening(m_xObject);
- m_xObject = NULL;
+ m_xObject = nullptr;
try
{
Reference<XNameAccess> xNameAccess;
@@ -543,7 +543,7 @@ void OApplicationView::GetFocus()
void OApplicationView::_disposing( const css::lang::EventObject& /*_rSource*/ )
{
if ( m_pWin && getDetailView() )
- showPreview(NULL);
+ showPreview(nullptr);
}
void OApplicationView::ImplInitSettings()
diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx
index 880504587747..52ee4d405f57 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.cxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.cxx
@@ -277,7 +277,7 @@ namespace dbaui
Command aCommand;
aCommand.Name = "close";
- _rxCommandProcessor->execute( aCommand, nCommandIdentifier, NULL );
+ _rxCommandProcessor->execute( aCommand, nCommandIdentifier, nullptr );
bSuccess = true;
}
catch( const Exception& )
generated by cgit (git 2.34.1) at 2025-04-30 18:46:30 +0000