diff options
Diffstat (limited to 'dbaccess/source/ui/dlg')
28 files changed, 136 insertions, 136 deletions
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index ecd2edc7bac8..da5b77b4a6cb 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -90,7 +90,7 @@ namespace dbaui OConnectionHelper::OConnectionHelper( vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs) : OGenericAdministrationPage(pParent, _rId, _rUIXMLDescription, _rCoreAttrs) , m_bUserGrabFocus(false) - , m_pCollection(NULL) + , m_pCollection(nullptr) { get(m_pFT_Connection, "browseurllabel"); get(m_pConnectionURL, "browseurl"); @@ -536,7 +536,7 @@ namespace dbaui ::ucbhelper::Content aCheckExistence; IS_PATH_EXIST eExists = PATH_NOT_EXIST; Reference< css::task::XInteractionHandler > xInteractionHandler( - task::InteractionHandler::createWithParent(m_xORB, 0), UNO_QUERY ); + task::InteractionHandler::createWithParent(m_xORB, nullptr), UNO_QUERY ); OFilePickerInteractionHandler* pHandler = new OFilePickerInteractionHandler(xInteractionHandler); xInteractionHandler = pHandler; diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 8719315b9203..565386d7ea18 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -183,7 +183,7 @@ using namespace ::com::sun::star; if ( m_pETHostServer->IsValueChangedFromSaved() ) { const DbuTypeCollectionItem* pCollectionItem = dynamic_cast<const DbuTypeCollectionItem*>( _rSet->GetItem(DSID_TYPECOLLECTION) ); - ::dbaccess::ODsnTypeCollection* pCollection = NULL; + ::dbaccess::ODsnTypeCollection* pCollection = nullptr; if (pCollectionItem) pCollection = pCollectionItem->getCollection(); OSL_ENSURE(pCollection, "OLDAPConnectionPageSetup::FillItemSet : really need a DSN type collection !"); @@ -279,7 +279,7 @@ using namespace ::com::sun::star; { // show the "Connect directly" option only if the driver is installed const DbuTypeCollectionItem* pCollectionItem = dynamic_cast<const DbuTypeCollectionItem*>( _rSet.GetItem(DSID_TYPECOLLECTION) ); - bool bHasMySQLNative = ( pCollectionItem != NULL ) && pCollectionItem->getCollection()->hasDriver( "sdbc:mysqlc:" ); + bool bHasMySQLNative = ( pCollectionItem != nullptr ) && pCollectionItem->getCollection()->hasDriver( "sdbc:mysqlc:" ); if ( bHasMySQLNative ) m_pNATIVEDatabase->Show(); @@ -414,7 +414,7 @@ using namespace ::com::sun::star; const SfxStringItem* pUrlItem = _rCoreAttrs.GetItem<SfxStringItem>(DSID_CONNECTURL); const DbuTypeCollectionItem* pTypesItem = _rCoreAttrs.GetItem<DbuTypeCollectionItem>(DSID_TYPECOLLECTION); - ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : NULL; + ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : nullptr; if (pTypeCollection && pUrlItem && pUrlItem->GetValue().getLength() ) { m_sDefaultJdbcDriverName = pTypeCollection->getJavaDriverClass(pUrlItem->GetValue()); diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 684f9bc85ec2..9f23a8e6dfa9 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -86,7 +86,7 @@ namespace dbaui OLDAPConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual ~OLDAPConnectionPageSetup(); virtual void dispose() override; - virtual void callModifiedHdl(void* pControl = 0) override; + virtual void callModifiedHdl(void* pControl = nullptr) override; protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; @@ -126,7 +126,7 @@ namespace dbaui virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; - virtual void callModifiedHdl(void* pControl = 0) override; + virtual void callModifiedHdl(void* pControl = nullptr) override; }; // OGeneralSpecialJDBCConnectionPageSetup @@ -150,7 +150,7 @@ namespace dbaui virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; - virtual void callModifiedHdl(void* pControl = 0) override; + virtual void callModifiedHdl(void* pControl = nullptr) override; DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); VclPtr<FixedText> m_pHeaderText; diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 2ec9b1b90fbb..d295374a4478 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -245,13 +245,13 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal if ( !xHandler.is() ) { // instantiate the default SDB interaction handler - xHandler.set( task::InteractionHandler::createWithParent(m_xContext, 0), UNO_QUERY ); + xHandler.set( task::InteractionHandler::createWithParent(m_xContext, nullptr), UNO_QUERY ); } OUString sName = pName ? pName->GetValue() : OUString(); OUString sLoginRequest(ModuleRes(STR_ENTER_CONNECTION_PASSWORD)); OUString sTemp = sName; - sName = ::dbaui::getStrippedDatabaseName(NULL,sTemp); + sName = ::dbaui::getStrippedDatabaseName(nullptr,sTemp); if ( !sName.isEmpty() ) sLoginRequest = sLoginRequest.replaceAll("$name$", sName); else @@ -267,7 +267,7 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal aRequest.Diagnostic = sLoginRequest; aRequest.HasRealm = aRequest.HasAccount = sal_False; // aRequest.Realm - aRequest.HasUserName = pUser != 0; + aRequest.HasUserName = pUser != nullptr; aRequest.UserName = pUser ? OUString(pUser->GetValue()) : OUString(); aRequest.HasPassword = sal_True; //aRequest.Password @@ -535,7 +535,7 @@ OUString ODbDataSourceAdministrationHelper::getConnectionURL() const case ::dbaccess::DST_LDAP: { const SfxInt32Item* pPortNumber = m_pItemSetHelper->getOutputSet()->GetItem<SfxInt32Item>(DSID_CONN_LDAP_PORTNUMBER); - sNewUrl = pCollection->cutPrefix(pUrlItem->GetValue()) + lcl_createHostWithPort(NULL,pPortNumber); + sNewUrl = pCollection->cutPrefix(pUrlItem->GetValue()) + lcl_createHostWithPort(nullptr,pPortNumber); } break; case ::dbaccess::DST_JDBC: diff --git a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx index 7182276a6224..2b0d4d303686 100644 --- a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx +++ b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx @@ -15,9 +15,9 @@ namespace dbaui QueryPropertiesDialog::QueryPropertiesDialog( vcl::Window* pParent, const bool bDistinct, const sal_Int64 nLimit ) : ModalDialog(pParent, "QueryPropertiesDialog", "dbaccess/ui/querypropertiesdialog.ui") - , m_pRB_Distinct( 0 ) - , m_pRB_NonDistinct( 0 ) - , m_pLB_Limit( 0 ) + , m_pRB_Distinct( nullptr ) + , m_pRB_NonDistinct( nullptr ) + , m_pLB_Limit( nullptr ) { get( m_pRB_Distinct, "distinct" ); get( m_pRB_NonDistinct, "nondistinct" ); diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 689a47d24e91..7a312f7d1452 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -109,7 +109,7 @@ namespace dbaui { TC_SEPARATORS, m_pFormatHeader }, { TC_HEADER, m_pRowHeader }, { TC_CHARSET, m_pCharSetHeader }, - { 0, NULL } + { 0, nullptr } }; for ( size_t section=0; section < sizeof( aSections ) / sizeof( aSections[0] ) - 1; ++section ) @@ -245,7 +245,7 @@ namespace dbaui { OUString sExtension = GetExtension(); OUString aErrorText; - Control* pErrorWin = NULL; + Control* pErrorWin = nullptr; OUString aDelText(m_pFieldSeparator->GetText()); if(aDelText.isEmpty()) { // No FieldSeparator diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 954a530c63fc..94d98687a44e 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -118,10 +118,10 @@ IMPL_LINK_TYPED( OPasswordDialog, ModifiedHdl, Edit&, rEdit, void ) // OUserAdmin OUserAdmin::OUserAdmin(vcl::Window* pParent,const SfxItemSet& _rAttrSet) : OGenericAdministrationPage( pParent, "UserAdminPage", "dbaccess/ui/useradminpage.ui", _rAttrSet) - , m_pUSER(0) - , m_pNEWUSER(0) - , m_pCHANGEPWD(0) - , m_pDELETEUSER(0) + , m_pUSER(nullptr) + , m_pNEWUSER(nullptr) + , m_pCHANGEPWD(nullptr) + , m_pDELETEUSER(nullptr) ,m_TableCtrl(VclPtr<OTableGrantControl>::Create(get<VclAlignment>("table"), WB_TABSTOP)) { m_TableCtrl->Show(); @@ -144,7 +144,7 @@ OUserAdmin::~OUserAdmin() void OUserAdmin::dispose() { - m_xConnection = NULL; + m_xConnection = nullptr; m_TableCtrl.disposeAndClear(); m_pUSER.clear(); m_pNEWUSER.clear(); diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 0d138142b99a..fc2241f15043 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -65,7 +65,7 @@ namespace dbaui delete pExampleSet; pExampleSet = new SfxItemSet(*GetInputSetImpl()); - AddTabPage("settings", OUserAdmin::Create, 0); + AddTabPage("settings", OUserAdmin::Create, nullptr); // remove the reset button - it's meaning is much too ambiguous in this dialog RemoveResetButton(); @@ -89,7 +89,7 @@ namespace dbaui } } - SetInputSet(NULL); + SetInputSet(nullptr); DELETEZ(pExampleSet); SfxTabDialog::dispose(); } @@ -102,7 +102,7 @@ namespace dbaui if ( !aMetaData.supportsUserAdministration( getORB() ) ) { OUString sError(ModuleRes(STR_USERADMIN_NOT_AVAILABLE)); - throw SQLException(sError,NULL,OUString("S1000") ,0,Any()); + throw SQLException(sError,nullptr,OUString("S1000") ,0,Any()); } } catch(const SQLException&) diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index f5c23bdeb67a..91404f5330d0 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -59,8 +59,8 @@ namespace dbaui OGenericAdministrationPage::OGenericAdministrationPage(vcl::Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet) :SfxTabPage(_pParent, _rId, _rUIXMLDescription, &_rAttrSet) ,m_abEnableRoadmap(false) - ,m_pAdminDialog(NULL) - ,m_pItemSetHelper(NULL) + ,m_pAdminDialog(nullptr) + ,m_pItemSetHelper(nullptr) { SetExchangeSupport(); diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index 5f32265b6489..17d66a91684f 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -136,7 +136,7 @@ namespace dbaui virtual void ActivatePage() override; protected: - virtual void callModifiedHdl(void* /*pControl*/ = 0) { m_aModifiedHandler.Call(this); } + virtual void callModifiedHdl(void* /*pControl*/ = nullptr) { m_aModifiedHandler.Call(this); } /// called from within DeactivatePage. The page is allowed to be deactivated if this method returns sal_True virtual bool prepareLeave() { return true; } diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index c689dd1814eb..1dcfc1f6a94a 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -343,7 +343,7 @@ OAddTableDlg::OAddTableDlg( vcl::Window* pParent, IAddTableDialogContext& _rCont m_pTableList->EnableInplaceEditing( false ); m_pTableList->SetStyle(m_pTableList->GetStyle() | WB_BORDER | WB_HASLINES |WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HASLINESATROOT | WB_SORT | WB_HSCROLL ); - m_pTableList->EnableCheckButton( NULL ); // do not show any buttons + m_pTableList->EnableCheckButton( nullptr ); // do not show any buttons m_pTableList->SetSelectionMode( SINGLE_SELECTION ); m_pTableList->notifyHiContrastChanged(); m_pTableList->suppressEmptyFolders(); @@ -419,7 +419,7 @@ void OAddTableDlg::impl_addTable() IMPL_LINK_NOARG_TYPED( OAddTableDlg, AddClickHdl, Button*, void ) { - TableListDoubleClickHdl(NULL); + TableListDoubleClickHdl(nullptr); } IMPL_LINK_NOARG_TYPED( OAddTableDlg, TableListDoubleClickHdl, SvTreeListBox*, bool ) diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 1f1e68595b33..d7a0fd7cd1a0 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -62,26 +62,26 @@ namespace dbaui SpecialSettingsPage::SpecialSettingsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta ) : OGenericAdministrationPage(pParent, "SpecialSettingsPage", "dbaccess/ui/specialsettingspage.ui", _rCoreAttrs) - , m_pIsSQL92Check( NULL ) - , m_pAppendTableAlias( NULL ) - , m_pAsBeforeCorrelationName( NULL ) - , m_pEnableOuterJoin( NULL ) - , m_pIgnoreDriverPrivileges( NULL ) - , m_pParameterSubstitution( NULL ) - , m_pSuppressVersionColumn( NULL ) - , m_pCatalog( NULL ) - , m_pSchema( NULL ) - , m_pIndexAppendix( NULL ) - , m_pDosLineEnds( NULL ) - , m_pCheckRequiredFields( NULL ) - , m_pIgnoreCurrency(NULL) - , m_pEscapeDateTime(NULL) - , m_pPrimaryKeySupport(NULL) - , m_pRespectDriverResultSetType(NULL) - , m_pBooleanComparisonModeLabel( NULL ) - , m_pBooleanComparisonMode( NULL ) - , m_pMaxRowScanLabel( NULL ) - , m_pMaxRowScan( NULL ) + , m_pIsSQL92Check( nullptr ) + , m_pAppendTableAlias( nullptr ) + , m_pAsBeforeCorrelationName( nullptr ) + , m_pEnableOuterJoin( nullptr ) + , m_pIgnoreDriverPrivileges( nullptr ) + , m_pParameterSubstitution( nullptr ) + , m_pSuppressVersionColumn( nullptr ) + , m_pCatalog( nullptr ) + , m_pSchema( nullptr ) + , m_pIndexAppendix( nullptr ) + , m_pDosLineEnds( nullptr ) + , m_pCheckRequiredFields( nullptr ) + , m_pIgnoreCurrency(nullptr) + , m_pEscapeDateTime(nullptr) + , m_pPrimaryKeySupport(nullptr) + , m_pRespectDriverResultSetType(nullptr) + , m_pBooleanComparisonModeLabel( nullptr ) + , m_pBooleanComparisonMode( nullptr ) + , m_pMaxRowScanLabel( nullptr ) + , m_pMaxRowScan( nullptr ) , m_aControlDependencies() , m_aBooleanSettings() , m_bHasBooleanComparisonMode( _rDSMeta.getFeatureSet().has( DSID_BOOLEANCOMPARISON ) ) @@ -105,7 +105,7 @@ namespace dbaui // check whether this must be a tristate check box const SfxPoolItem& rItem = _rCoreAttrs.Get( nItemId ); - if ( 0 != dynamic_cast< const OptionalBoolItem* >(&rItem) ) + if ( nullptr != dynamic_cast< const OptionalBoolItem* >(&rItem) ) (*setting->ppControl)->EnableTriState(); } } @@ -436,13 +436,13 @@ namespace dbaui // auto-generated values? if (rFeatures.supportsGeneratedValues()) - AddTabPage("generated", ODriversSettings::CreateGeneratedValuesPage, NULL); + AddTabPage("generated", ODriversSettings::CreateGeneratedValuesPage, nullptr); else RemoveTabPage("generated"); // any "special settings"? if (rFeatures.supportsAnySpecialSetting()) - AddTabPage("special", ODriversSettings::CreateSpecialSettingsPage, NULL); + AddTabPage("special", ODriversSettings::CreateSpecialSettingsPage, nullptr); else RemoveTabPage("special"); @@ -457,7 +457,7 @@ namespace dbaui void AdvancedSettingsDialog::dispose() { - SetInputSet(NULL); + SetInputSet(nullptr); DELETEZ(pExampleSet); SfxTabDialog::dispose(); } diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 62c7668500cc..26a0879ae7e8 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -58,7 +58,7 @@ ODbAdminDialog::ODbAdminDialog(vcl::Window* _pParent m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxContext,this,this)); // add the initial tab page - m_nMainPageID = AddTabPage("advanced", OConnectionTabPage::Create, NULL); + m_nMainPageID = AddTabPage("advanced", OConnectionTabPage::Create, nullptr); // remove the reset button - it's meaning is much too ambiguous in this dialog RemoveResetButton(); @@ -71,7 +71,7 @@ ODbAdminDialog::~ODbAdminDialog() void ODbAdminDialog::dispose() { - SetInputSet(NULL); + SetInputSet(nullptr); DELETEZ(pExampleSet); SfxTabDialog::dispose(); } @@ -99,7 +99,7 @@ void ODbAdminDialog::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) void ODbAdminDialog::addDetailPage(sal_uInt16 _nPageId, sal_uInt16 _nTextId, CreateTabPage _pCreateFunc) { - AddTabPage(_nPageId, OUString(ModuleRes(_nTextId)), _pCreateFunc, NULL); + AddTabPage(_nPageId, OUString(ModuleRes(_nTextId)), _pCreateFunc, nullptr); m_aCurrentDetailPages.push(_nPageId); } @@ -159,7 +159,7 @@ void ODbAdminDialog::impl_selectDataSource(const css::uno::Any& _aDataSourceName case ::dbaccess::DST_USERDEFINE10: { OUString aTitle(ModuleRes(STR_PAGETITLE_ADVANCED)); - AddTabPage(PAGE_USERDRIVER, aTitle, ODriversSettings::CreateUser, 0, false, 1); + AddTabPage(PAGE_USERDRIVER, aTitle, ODriversSettings::CreateUser, nullptr, false, 1); m_aCurrentDetailPages.push(PAGE_USERDRIVER); } break; @@ -204,7 +204,7 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou ::dbaccess::ODsnTypeCollection* pCollection = rCollectionItem.getCollection(); if ( pCollection->determineType(getDatasourceType( *pExampleSet )) == ::dbaccess::DST_MYSQL_NATIVE ) { - AddTabPage( PAGE_MYSQL_NATIVE, OUString( ModuleRes( STR_PAGETITLE_CONNECTION ) ), ODriversSettings::CreateMySQLNATIVE, NULL ); + AddTabPage( PAGE_MYSQL_NATIVE, OUString( ModuleRes( STR_PAGETITLE_CONNECTION ) ), ODriversSettings::CreateMySQLNATIVE, nullptr ); RemoveTabPage("advanced"); m_nMainPageID = PAGE_MYSQL_NATIVE; } @@ -298,9 +298,9 @@ void ODbAdminDialog::clearPassword() SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults, ::dbaccess::ODsnTypeCollection* _pTypeCollection) { // just to be sure .... - _rpSet = NULL; - _rpPool = NULL; - _rppDefaults = NULL; + _rpSet = nullptr; + _rpPool = nullptr; + _rppDefaults = nullptr; const OUString sFilterAll( "%", 1, RTL_TEXTENCODING_ASCII_US ); // create and initialize the defaults @@ -451,7 +451,7 @@ void ODbAdminDialog::destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, if (_rpSet) { delete _rpSet; - _rpSet = NULL; + _rpSet = nullptr; } // delete the pool @@ -460,11 +460,11 @@ void ODbAdminDialog::destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, _rpPool->ReleaseDefaults(true); // the "true" means delete the items, too SfxItemPool::Free(_rpPool); - _rpPool = NULL; + _rpPool = nullptr; } // reset the defaults ptr - _rppDefaults = NULL; + _rppDefaults = nullptr; // no need to explicitly delete the defaults, this has been done by the ReleaseDefaults } diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 938d30dfcb23..85cf0b4a9a53 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -68,7 +68,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent ,const css::uno::Any& _aDataSourceName ) :OWizardMachine(_pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP ) - ,m_pOutSet(NULL) + ,m_pOutSet(nullptr) { m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,this,this)); m_pImpl->setDataSourceOrName(_aDataSourceName); diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 7263981da244..e8bda3d711d0 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -108,7 +108,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent ) :svt::RoadmapWizard( _pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP ) - , m_pOutSet(NULL) + , m_pOutSet(nullptr) , m_bIsConnectable( false) , m_sRM_IntroText( ModuleRes( STR_PAGETITLE_INTROPAGE ) ) , m_sRM_dBaseText( ModuleRes( STR_PAGETITLE_DBASE ) ) @@ -125,10 +125,10 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent , m_sRM_AuthentificationText( ModuleRes( STR_PAGETITLE_AUTHENTIFICATION ) ) , m_sRM_FinalText( ModuleRes( STR_PAGETITLE_FINAL ) ) , m_sWorkPath( SvtPathOptions().GetWorkPath() ) - , m_pGeneralPage( NULL ) - , m_pMySQLIntroPage( NULL ) - , m_pFinalPage( NULL ) - , m_pCollection( NULL ) + , m_pGeneralPage( nullptr ) + , m_pMySQLIntroPage( nullptr ) + , m_pFinalPage( nullptr ) + , m_pCollection( nullptr ) { // no local resources needed anymore // extract the datasource type collection from the item set @@ -268,7 +268,7 @@ ODbTypeWizDialogSetup::~ODbTypeWizDialogSetup() void ODbTypeWizDialogSetup::dispose() { delete m_pOutSet; - m_pOutSet = NULL; + m_pOutSet = nullptr; m_pGeneralPage.clear(); m_pMySQLIntroPage.clear(); m_pFinalPage.clear(); @@ -681,7 +681,7 @@ namespace bool ODbTypeWizDialogSetup::SaveDatabaseDocument() { - Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(getORB(), 0) ); + Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(getORB(), nullptr) ); try { if (callSaveAsDialog()) @@ -907,7 +907,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument() { m_xDesktop.set( Desktop::create(_rxORB) ); m_xFrameLoader.set( m_xDesktop, UNO_QUERY_THROW ); - m_xInteractionHandler = InteractionHandler::createWithParent(_rxORB, 0); + m_xInteractionHandler = InteractionHandler::createWithParent(_rxORB, nullptr); } catch( const Exception& ) { diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 00f48c517555..b873bb0401e3 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -61,15 +61,15 @@ namespace dbaui sal_uInt32 nControlFlags) :OGenericAdministrationPage(pParent, rId, rUIXMLDescription, _rCoreAttrs) - ,m_pOptionsLabel(NULL) - ,m_pOptions(NULL) - ,m_pCharsetLabel(NULL) - ,m_pCharset(NULL) - ,m_pAutoRetrievingEnabled(NULL) - ,m_pAutoIncrementLabel(NULL) - ,m_pAutoIncrement(NULL) - ,m_pAutoRetrievingLabel(NULL) - ,m_pAutoRetrieving(NULL) + ,m_pOptionsLabel(nullptr) + ,m_pOptions(nullptr) + ,m_pCharsetLabel(nullptr) + ,m_pCharset(nullptr) + ,m_pAutoRetrievingEnabled(nullptr) + ,m_pAutoIncrementLabel(nullptr) + ,m_pAutoIncrement(nullptr) + ,m_pAutoRetrievingLabel(nullptr) + ,m_pAutoRetrieving(nullptr) ,m_nControlFlags(nControlFlags) { @@ -224,7 +224,7 @@ namespace dbaui // get the DSN string (needed for the index dialog) const SfxStringItem* pUrlItem = _rSet.GetItem<SfxStringItem>(DSID_CONNECTURL); const DbuTypeCollectionItem* pTypesItem = _rSet.GetItem<DbuTypeCollectionItem>(DSID_TYPECOLLECTION); - ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : NULL; + ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : nullptr; if (pTypeCollection && pUrlItem && pUrlItem->GetValue().getLength()) m_sDsn = pTypeCollection->cutPrefix(pUrlItem->GetValue()); @@ -426,7 +426,7 @@ namespace dbaui const SfxStringItem* pUrlItem = _rCoreAttrs.GetItem<SfxStringItem>(DSID_CONNECTURL); const DbuTypeCollectionItem* pTypesItem = _rCoreAttrs.GetItem<DbuTypeCollectionItem>(DSID_TYPECOLLECTION); - ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : NULL; + ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : nullptr; if (pTypeCollection && pUrlItem && pUrlItem->GetValue().getLength() ) { m_sDefaultJdbcDriverName = pTypeCollection->getJavaDriverClass(pUrlItem->GetValue()); diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 9bb7810e4959..2a507262a3d1 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -110,7 +110,7 @@ namespace dbaui aError->Execute(); } - PostUserEvent(LINK(this, DirectSQLDialog, OnClose), NULL, true); + PostUserEvent(LINK(this, DirectSQLDialog, OnClose), nullptr, true); } sal_Int32 DirectSQLDialog::getHistorySize() const @@ -170,7 +170,7 @@ namespace dbaui if (!m_xConnection.is()) return "have no connection!"; - return NULL; + return nullptr; } #endif diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx index 0fc204c6b3d9..de3f074b0525 100644 --- a/dbaccess/source/ui/dlg/dsnItem.hxx +++ b/dbaccess/source/ui/dlg/dsnItem.hxx @@ -37,11 +37,11 @@ namespace dbaui public: TYPEINFO_OVERRIDE(); - DbuTypeCollectionItem(sal_Int16 nWhich = 0, ::dbaccess::ODsnTypeCollection* _pCollection = NULL); + DbuTypeCollectionItem(sal_Int16 nWhich = 0, ::dbaccess::ODsnTypeCollection* _pCollection = nullptr); DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource); virtual bool operator==(const SfxPoolItem& _rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const override; + virtual SfxPoolItem* Clone(SfxItemPool* _pPool = nullptr) const override; ::dbaccess::ODsnTypeCollection* getCollection() const { return m_pCollection; } }; diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 115f2b640567..a4a357345481 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -52,7 +52,7 @@ protected: #endif public: - ODatasourceSelectDialog( vcl::Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet = NULL ); + ODatasourceSelectDialog( vcl::Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet = nullptr ); virtual ~ODatasourceSelectDialog(); virtual void dispose() override; OUString GetSelected() const { return m_pDatasource->GetSelectEntry();} diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index a2681aeaa329..ffe6c1d3c4fa 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -54,12 +54,12 @@ namespace dbaui OGeneralPage::OGeneralPage( vcl::Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems ) :OGenericAdministrationPage( pParent, "PageGeneral", _rUIXMLDescription, _rItems ) ,m_eNotSupportedKnownType ( ::dbaccess::DST_UNKNOWN ) - ,m_pSpecialMessage ( NULL ) + ,m_pSpecialMessage ( nullptr ) ,m_eLastMessage ( smNone ) ,m_bDisplayingInvalid ( false ) ,m_bInitTypeList ( true ) - ,m_pDatasourceType ( NULL ) - ,m_pCollection ( NULL ) + ,m_pDatasourceType ( nullptr ) + ,m_pCollection ( nullptr ) { get( m_pDatasourceType, "datasourceType" ); get( m_pSpecialMessage, "specialMessage" ); @@ -489,14 +489,14 @@ namespace dbaui // OGeneralPageWizard OGeneralPageWizard::OGeneralPageWizard( vcl::Window* pParent, const SfxItemSet& _rItems ) :OGeneralPage( pParent, "dbaccess/ui/generalpagewizard.ui", _rItems ) - ,m_pRB_CreateDatabase ( NULL ) - ,m_pRB_OpenExistingDatabase ( NULL ) - ,m_pRB_ConnectDatabase ( NULL ) - ,m_pFT_EmbeddedDBLabel ( NULL ) - ,m_pEmbeddedDBType ( NULL ) - ,m_pFT_DocListLabel ( NULL ) - ,m_pLB_DocumentList ( NULL ) - ,m_pPB_OpenDatabase ( NULL ) + ,m_pRB_CreateDatabase ( nullptr ) + ,m_pRB_OpenExistingDatabase ( nullptr ) + ,m_pRB_ConnectDatabase ( nullptr ) + ,m_pFT_EmbeddedDBLabel ( nullptr ) + ,m_pEmbeddedDBType ( nullptr ) + ,m_pFT_DocListLabel ( nullptr ) + ,m_pLB_DocumentList ( nullptr ) + ,m_pPB_OpenDatabase ( nullptr ) ,m_eOriginalCreationMode ( eCreateNew ) ,m_bInitEmbeddedDBList ( true ) { diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 76cba671709a..02babdd93f9e 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -169,8 +169,8 @@ namespace dbaui :ModalDialog( _pParent, "IndexDesignDialog", "dbaccess/ui/indexdesigndialog.ui") ,m_xConnection(_rxConnection) ,m_aGeometrySettings(E_DIALOG, OUString("dbaccess.tabledesign.indexdialog")) - ,m_pIndexes(NULL) - ,m_pPreviousSelection(NULL) + ,m_pIndexes(nullptr) + ,m_pPreviousSelection(nullptr) ,m_bEditAgain(false) ,m_xContext(_rxContext) { @@ -267,7 +267,7 @@ namespace dbaui m_pActions->EnableItem(mnNewCmdId, !m_pIndexList->IsEditingActive()); SvTreeListEntry* pSelected = m_pIndexList->FirstSelected(); - bool bSelectedAnything = NULL != pSelected; + bool bSelectedAnything = nullptr != pSelected; if (pSelected) { @@ -295,7 +295,7 @@ namespace dbaui Indexes::iterator aEnd = m_pIndexes->end(); for (; aIndexLoop != aEnd; ++aIndexLoop) { - SvTreeListEntry* pNewEntry = NULL; + SvTreeListEntry* pNewEntry = nullptr; if (aIndexLoop->bPrimaryKey) pNewEntry = m_pIndexList->InsertEntry(aIndexLoop->sName, aPKeyIcon, aPKeyIcon); else @@ -314,7 +314,7 @@ namespace dbaui void DbaIndexDialog::dispose() { - setToolBox(NULL); + setToolBox(nullptr); delete m_pIndexes; m_pActions.clear(); m_pIndexList.clear(); @@ -473,7 +473,7 @@ namespace dbaui // if the removed entry was the selected on... if (m_pPreviousSelection == _pEntry) - m_pPreviousSelection = NULL; + m_pPreviousSelection = nullptr; // the Remove automatically selected another entry (if possible), but we disabled the calling of the handler // to prevent that we missed something... call the handler directly @@ -790,7 +790,7 @@ namespace dbaui } } - bool bHaveSelection = (NULL != m_pIndexList->FirstSelected()); + bool bHaveSelection = (nullptr != m_pIndexList->FirstSelected()); // disable/enable the detail controls m_pIndexDetails->Enable(bHaveSelection); diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 695ea3f47fc8..d66e76db7678 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -70,8 +70,8 @@ namespace dbaui IndexFieldsControl::IndexFieldsControl( vcl::Window* _pParent, WinBits nWinStyle) : EditBrowseBox(_pParent, EditBrowseBoxFlags::SMART_TAB_TRAVEL | EditBrowseBoxFlags::ACTIVATE_ON_BUTTONDOWN, nWinStyle, BROWSER_STANDARD_FLAGS) , m_aSeekRow(m_aFields.end()) - , m_pSortingCell(NULL) - , m_pFieldNameCell(NULL) + , m_pSortingCell(nullptr) + , m_pFieldNameCell(nullptr) , m_nMaxColumnsInIndex(0) , m_bAddIndexAppendix(false) { @@ -251,12 +251,12 @@ namespace dbaui CellController* IndexFieldsControl::GetController(long _nRow, sal_uInt16 _nColumnId) { if (!IsEnabled()) - return NULL; + return nullptr; IndexFields::const_iterator aRow; bool bNewField = !implGetFieldDesc(_nRow, aRow); - DbaMouseDownListBoxController* pReturn = NULL; + DbaMouseDownListBoxController* pReturn = nullptr; switch (_nColumnId) { case COLUMN_ID_ORDER: diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index e6308c7557a2..25e53dbdc149 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -76,7 +76,7 @@ bool OOdbcEnumeration::load(const sal_Char* _pLibPath) #ifdef HAVE_ODBC_SUPPORT // load the module m_pOdbcLib = osl_loadModule(m_sLibPath.pData, SAL_LOADMODULE_NOW); - return (NULL != m_pOdbcLib); + return (nullptr != m_pOdbcLib); #else return sal_False; #endif @@ -88,7 +88,7 @@ void OOdbcEnumeration::unload() if (isLoaded()) { osl_unloadModule(m_pOdbcLib); - m_pOdbcLib = NULL; + m_pOdbcLib = nullptr; } #endif } @@ -103,19 +103,19 @@ struct OdbcTypesImpl { #ifdef HAVE_ODBC_SUPPORT SQLHANDLE hEnvironment; - OdbcTypesImpl() : hEnvironment(0) { } + OdbcTypesImpl() : hEnvironment(nullptr) { } #else void* pDummy; #endif }; OOdbcEnumeration::OOdbcEnumeration() - :m_pOdbcLib(NULL) + :m_pOdbcLib(nullptr) #ifdef HAVE_ODBC_SUPPORT - ,m_pAllocHandle(NULL) - ,m_pFreeHandle(NULL) - ,m_pSetEnvAttr(NULL) - ,m_pDataSources(NULL) + ,m_pAllocHandle(nullptr) + ,m_pFreeHandle(nullptr) + ,m_pSetEnvAttr(nullptr) + ,m_pDataSources(nullptr) ,m_pImpl(new OdbcTypesImpl) #endif { @@ -138,7 +138,7 @@ OOdbcEnumeration::OOdbcEnumeration() if (!m_pAllocHandle || !m_pSetEnvAttr || !m_pDataSources || !m_pFreeHandle) { unload(); - m_pAllocHandle = m_pFreeHandle = m_pSetEnvAttr = m_pDataSources = NULL; + m_pAllocHandle = m_pFreeHandle = m_pSetEnvAttr = m_pDataSources = nullptr; } #endif } @@ -179,7 +179,7 @@ void OOdbcEnumeration::freeEnv() #ifdef HAVE_ODBC_SUPPORT if (m_pImpl->hEnvironment) NSQLFreeHandle(SQL_HANDLE_ENV, m_pImpl->hEnvironment); - m_pImpl->hEnvironment = 0; + m_pImpl->hEnvironment = nullptr; #endif } diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx index 3142f5cd9b8a..4d69bf1b5976 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -62,7 +62,7 @@ public: ~OOdbcEnumeration(); #ifdef HAVE_ODBC_SUPPORT - bool isLoaded() const { return NULL != m_pOdbcLib; } + bool isLoaded() const { return nullptr != m_pOdbcLib; } #else bool isLoaded() const { return false; } #endif diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx index 8b72335950d1..3bb698a7586f 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.hxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx @@ -38,7 +38,7 @@ namespace dbaui OptionalBoolItem( const OptionalBoolItem& _rSource ); virtual bool operator==( const SfxPoolItem& _rItem ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* _pPool = NULL ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* _pPool = nullptr ) const override; bool HasValue() const { return !!m_aValue; } void ClearValue() { m_aValue.reset(); } diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 46cab6256d30..c5105f940c4b 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -516,9 +516,9 @@ void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,bool _b aStr = comphelper::string::stripStart(aStr, ' '); // to make sure that we only set first three - ListBox* pColumnListControl = NULL; - ListBox* pPredicateListControl = NULL; - Edit* pPredicateValueControl = NULL; + ListBox* pColumnListControl = nullptr; + ListBox* pPredicateListControl = nullptr; + Edit* pPredicateValueControl = nullptr; switch( nIdx ) { case 0: @@ -770,7 +770,7 @@ void DlgFilterCrit::BuildWherePart() Sequence<Sequence<PropertyValue> >& _rValues = aFilter; if ( getCondition(*m_pLB_WHEREFIELD2,*m_pLB_WHERECOMP2,*m_pET_WHEREVALUE2,aValue) ) _rValues = aHaving; - PropertyValue* pPos = NULL; + PropertyValue* pPos = nullptr; if ( m_pLB_WHERECOND2->GetSelectEntryPos() ) { sal_Int32 nPos = _rValues.getLength(); @@ -794,7 +794,7 @@ void DlgFilterCrit::BuildWherePart() Sequence<Sequence<PropertyValue> >& _rValues = aFilter; if ( getCondition(*m_pLB_WHEREFIELD3,*m_pLB_WHERECOMP3,*m_pET_WHEREVALUE3,aValue) ) _rValues = aHaving; - PropertyValue* pPos = NULL; + PropertyValue* pPos = nullptr; if ( m_pLB_WHERECOND3->GetSelectEntryPos() ) { sal_Int32 nPos = _rValues.getLength(); diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 8ab9396e8c41..bae6b8dfe07e 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -434,7 +434,7 @@ void OSQLMessageBox::impl_positionControls() if ( m_pImpl->aDisplayInfo.empty() ) return; - const ExceptionDisplayInfo* pSecondInfo = NULL; + const ExceptionDisplayInfo* pSecondInfo = nullptr; const ExceptionDisplayInfo& rFirstInfo = *m_pImpl->aDisplayInfo.begin(); if ( m_pImpl->aDisplayInfo.size() > 1 ) diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 69a6d7714647..b49bd07b13e2 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -364,7 +364,7 @@ namespace dbaui m_pTablesList->Expand(pExpand); pExpand = m_pTablesList->FirstChild(pExpand); if (pExpand && SvTreeList::NextSibling(pExpand)) - pExpand = NULL; + pExpand = nullptr; } // update the toolbox according the current selection and check state @@ -453,8 +453,8 @@ namespace dbaui { bool bCatalogWildcard = false; bool bSchemaWildcard = false; - SvTreeListEntry* pSchema = NULL; - SvTreeListEntry* pCatalog = NULL; + SvTreeListEntry* pSchema = nullptr; + SvTreeListEntry* pCatalog = nullptr; if (m_pTablesList->GetCheckButtonState(pEntry) == SV_BUTTON_CHECKED && !m_pTablesList->GetModel()->HasChildren(pEntry)) { // checked and a leaf, which means it's no catalog, no schema, but a real table @@ -464,7 +464,7 @@ namespace dbaui pSchema = m_pTablesList->GetModel()->GetParent(pEntry); if (pAllObjectsEntry == pSchema) // do not want to have the root entry - pSchema = NULL; + pSchema = nullptr; if (pSchema) { // it's a real schema entry, not the "all objects" root @@ -473,7 +473,7 @@ namespace dbaui pCatalog = m_pTablesList->GetModel()->GetParent(pSchema); if (pAllObjectsEntry == pCatalog) // do not want to have the root entry - pCatalog = NULL; + pCatalog = nullptr; if (pCatalog) { // it's a real catalog entry, not the "all objects" root @@ -533,7 +533,7 @@ namespace dbaui SvTreeListEntry* OTableSubscriptionPage::implNextSibling(SvTreeListEntry* _pEntry) const { - SvTreeListEntry* pReturn = NULL; + SvTreeListEntry* pReturn = nullptr; if (_pEntry) { pReturn = SvTreeList::NextSibling(_pEntry); |