diff options
Diffstat (limited to 'dbaccess/source/ui/app/AppDetailPageHelper.cxx')
-rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.cxx | 40 |
1 files changed, 20 insertions, 20 deletions
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(); } |