diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:16:14 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:27 +0100 |
| commit | 06c5c630201152964c19c47262a5a54fcb6cf6c2 (patch) | |
| tree | 909d2d883848f87711d723ddf354dba6f79d0748 | |
| parent | 88b5e5fd3a6f0d70caf66568c25a3e47e01c71e2 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: Ie178c474921c1695927a9b01a9972baf09fbb73d
94 files changed, 425 insertions, 425 deletions
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx index cac413488e92..a13ed5487cc5 100644 --- a/framework/inc/classes/fwktabwindow.hxx +++ b/framework/inc/classes/fwktabwindow.hxx @@ -83,10 +83,10 @@ struct TabEntry css::uno::Reference< css::awt::XContainerWindowEventHandler > m_xEventHdl; TabEntry() : - m_nIndex( -1 ), m_pPage( NULL ) {} + m_nIndex( -1 ), m_pPage( nullptr ) {} TabEntry( sal_Int32 nIndex, const OUString& sURL, const css::uno::Reference< css::awt::XContainerWindowEventHandler > & rEventHdl ) : - m_nIndex( nIndex ), m_pPage( NULL ), m_sPageURL( sURL ), m_xEventHdl( rEventHdl ) {} + m_nIndex( nIndex ), m_pPage( nullptr ), m_sPageURL( sURL ), m_xEventHdl( rEventHdl ) {} ~TabEntry() { m_pPage.disposeAndClear(); } }; diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx index 44273cd192d9..927b437b7b74 100644 --- a/framework/inc/macros/registration.hxx +++ b/framework/inc/macros/registration.hxx @@ -57,10 +57,10 @@ ________________________________________________________________________________ void* /*pRegistryKey*/ ) \ { \ /* Set default return value for this operation - if it failed. */ \ - void* pReturn = NULL; \ + void* pReturn = nullptr; \ if ( \ - ( pImplementationName != NULL ) && \ - ( pServiceManager != NULL ) \ + ( pImplementationName != nullptr ) && \ + ( pServiceManager != nullptr ) \ ) \ { \ /* Define variables which are used in following macros. */ \ diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx index f977c6b323d0..21dc77b53f61 100644 --- a/framework/inc/macros/xtypeprovider.hxx +++ b/framework/inc/macros/xtypeprovider.hxx @@ -69,13 +69,13 @@ ________________________________________________________________________________ /* And we don't must use a mutex at every call! */ \ /* For the first call; pTypeCollection is NULL - */ \ /* for the second call pTypeCollection is different from NULL! */ \ - static ::cppu::OTypeCollection* pTypeCollection = NULL; \ - if ( pTypeCollection == NULL ) \ + static ::cppu::OTypeCollection* pTypeCollection = nullptr; \ + if ( pTypeCollection == nullptr ) \ { \ /* Ready for multithreading; get global mutex for first call of this method only! see before */ \ ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \ /* Control these pointer again ... it can be, that another instance will be faster then these! */ \ - if ( pTypeCollection == NULL ) \ + if ( pTypeCollection == nullptr ) \ { \ /* Create a static typecollection ... */ \ /* Attention: "TYPES" will expand to "(...)"! */ \ @@ -98,13 +98,13 @@ ________________________________________________________________________________ /* And we don't must use a mutex at every call! */ \ /* For the first call; pTypeCollection is NULL - */ \ /* for the second call pTypeCollection is different from NULL! */ \ - static css::uno::Sequence< css::uno::Type >* pTypeCollection = NULL; \ - if ( pTypeCollection == NULL ) \ + static css::uno::Sequence< css::uno::Type >* pTypeCollection = nullptr; \ + if ( pTypeCollection == nullptr ) \ { \ /* Ready for multithreading; get global mutex for first call of this method only! see before */ \ ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \ /* Control these pointer again ... it can be, that another instance will be faster then these! */ \ - if ( pTypeCollection == NULL ) \ + if ( pTypeCollection == nullptr ) \ { \ /* Create two typecollections */ \ /* (cppuhelper support 12 items per collection only!) */ \ diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx index 5c96595b515a..30f9dfb6471a 100644 --- a/framework/inc/threadhelp/transactionguard.hxx +++ b/framework/inc/threadhelp/transactionguard.hxx @@ -56,13 +56,13 @@ class TransactionGuard : private boost::noncopyable @param "eMode" enable/disable throwing of exceptions for rejected calls @param "eReason" returns reason for rejected calls *//*-*****************************************************************************************************/ - inline TransactionGuard( TransactionManager& rManager, EExceptionMode eMode, ERejectReason* eReason = NULL ) + inline TransactionGuard( TransactionManager& rManager, EExceptionMode eMode, ERejectReason* eReason = nullptr ) : m_pManager( &rManager ) { // If exception mode is set to E_HARDEXCEPTIONS we don't need a buffer to return reason! // We handle it private. If a call is rejected, our manager throw some exceptions ... and the reason // could be ignorable ... - if( eReason == NULL ) + if( eReason == nullptr ) { ERejectReason eMyReason; m_pManager->registerTransaction( eMode, eMyReason ); @@ -92,10 +92,10 @@ class TransactionGuard : private boost::noncopyable *//*-*************************************************************************************************************/ inline void stop() { - if( m_pManager != NULL ) + if( m_pManager != nullptr ) { m_pManager->unregisterTransaction(); - m_pManager = NULL; + m_pManager = nullptr; } } diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx index bcaedb3ed6cc..a79d9c9b8c73 100644 --- a/framework/inc/xml/imagesconfiguration.hxx +++ b/framework/inc/xml/imagesconfiguration.hxx @@ -61,7 +61,7 @@ typedef boost::ptr_vector<ExternalImageItemDescriptor> ExternalImageItemListDesc struct ImageListItemDescriptor { ImageListItemDescriptor() : nMaskMode( ImageMaskMode_Color ), - pImageItemList( 0 ) {} + pImageItemList( nullptr ) {} ~ImageListItemDescriptor() { delete pImageItemList; } @@ -78,8 +78,8 @@ typedef boost::ptr_vector<ImageListItemDescriptor> ImageListDescriptor; struct ImageListsDescriptor { - ImageListsDescriptor() : pImageList( 0 ), - pExternalImageList( 0 ) {} + ImageListsDescriptor() : pImageList( nullptr ), + pExternalImageList( nullptr ) {} ~ImageListsDescriptor() { delete pImageList; delete pExternalImageList; } ImageListDescriptor* pImageList; diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index e5f05e979a72..3fb8331768ef 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -77,7 +77,7 @@ namespace framework XMLBasedAcceleratorConfiguration::XMLBasedAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext) : m_xContext (xContext ) , m_aPresetHandler(xContext ) - , m_pWriteCache (0 ) + , m_pWriteCache (nullptr ) { } @@ -320,7 +320,7 @@ sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isModified() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard g; - return (m_pWriteCache != 0); + return (m_pWriteCache != nullptr); } sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly() @@ -402,7 +402,7 @@ void XMLBasedAcceleratorConfiguration::impl_ts_load(const css::uno::Reference< c { // be aware of reentrance problems - use temp variable for calling delete ... :-) AcceleratorCache* pTemp = m_pWriteCache; - m_pWriteCache = 0; + m_pWriteCache = nullptr; delete pTemp; } } @@ -440,7 +440,7 @@ void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< c css::uno::Reference< css::uno::XComponentContext > xContext; { SolarMutexGuard g; - bChanged = (m_pWriteCache != 0); + bChanged = (m_pWriteCache != nullptr); if (bChanged) aCache.takeOver(*m_pWriteCache); else @@ -473,7 +473,7 @@ void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< c m_aReadCache.takeOver(*m_pWriteCache); // live with reentrance .-) AcceleratorCache* pTemp = m_pWriteCache; - m_pWriteCache = 0; + m_pWriteCache = nullptr; delete pTemp; } } @@ -517,8 +517,8 @@ OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext) : m_xContext (xContext ) - , m_pPrimaryWriteCache(0 ) - , m_pSecondaryWriteCache(0 ) + , m_pPrimaryWriteCache(nullptr ) + , m_pSecondaryWriteCache(nullptr ) { const OUString CFG_ENTRY_ACCELERATORS("org.openoffice.Office.Accelerators"); m_xCfg.set( @@ -820,7 +820,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload() { // be aware of reentrance problems - use temp variable for calling delete ... :-) AcceleratorCache* pTemp = m_pPrimaryWriteCache; - m_pPrimaryWriteCache = 0; + m_pPrimaryWriteCache = nullptr; delete pTemp; } m_xCfg->getByName(CFG_ENTRY_PRIMARY) >>= xAccess; @@ -832,7 +832,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload() { // be aware of reentrance problems - use temp variable for calling delete ... :-) AcceleratorCache* pTemp = m_pSecondaryWriteCache; - m_pSecondaryWriteCache = 0; + m_pSecondaryWriteCache = nullptr; delete pTemp; } m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess; @@ -891,14 +891,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R { SolarMutexGuard g; - if (m_pPrimaryWriteCache != 0) + if (m_pPrimaryWriteCache != nullptr) aCache.takeOver(*m_pPrimaryWriteCache); else aCache.takeOver(m_aPrimaryReadCache); AcceleratorCache::TKeyList lKeys; AcceleratorCache::TKeyList::const_iterator pIt; - if (m_pSecondaryWriteCache!=0) + if (m_pSecondaryWriteCache!=nullptr) { lKeys = m_pSecondaryWriteCache->getAllKeys(); for ( pIt=lKeys.begin(); pIt!=lKeys.end(); ++pIt ) @@ -1215,7 +1215,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(bool bPreferred, const css:: { m_aPrimaryReadCache.takeOver(*m_pPrimaryWriteCache); AcceleratorCache* pTemp = m_pPrimaryWriteCache; - m_pPrimaryWriteCache = 0; + m_pPrimaryWriteCache = nullptr; delete pTemp; } } @@ -1254,7 +1254,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(bool bPreferred, const css:: { m_aSecondaryReadCache.takeOver(*m_pSecondaryWriteCache); AcceleratorCache* pTemp = m_pSecondaryWriteCache; - m_pSecondaryWriteCache = 0; + m_pSecondaryWriteCache = nullptr; delete pTemp; } } diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index 2d67e8204589..a6c392507813 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -112,7 +112,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUStri // If we found an already open storage ... we must increase // its use count. Otherwhise it will may be closed to early :-) TPath2StorageInfo::iterator pCheck = m_lStorages.find(sCheckPath); - TStorageInfo* pInfo = 0; + TStorageInfo* pInfo = nullptr; if (pCheck != m_lStorages.end()) { pInfo = &(pCheck->second); diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx index 6292953bd53b..1055ed04e6aa 100644 --- a/framework/source/classes/fwktabwindow.cxx +++ b/framework/source/classes/fwktabwindow.cxx @@ -238,7 +238,7 @@ bool FwkTabWindow::RemoveEntry( sal_Int32 nIndex ) TabEntry* FwkTabWindow::FindEntry( sal_Int32 nIndex ) const { - TabEntry* pEntry = NULL; + TabEntry* pEntry = nullptr; TabEntryList::const_iterator pIt; for ( pIt = m_TabList.begin(); diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx index e65bb689df90..5e9dd275ddaf 100644 --- a/framework/source/classes/fwlresid.cxx +++ b/framework/source/classes/fwlresid.cxx @@ -29,7 +29,7 @@ namespace framework ResMgr* FwlResId::GetResManager() { - static ResMgr* pResMgr = NULL; + static ResMgr* pResMgr = nullptr; if ( !pResMgr ) { diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 1e3f31aa57a3..9df0745b9f7b 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -244,7 +244,7 @@ MenuManager::MenuManager( } Reference< XDispatch > aXDispatchRef; - m_aMenuItemHandlerVector.push_back( new MenuItemHandler( nItemId, NULL, aXDispatchRef )); + m_aMenuItemHandlerVector.push_back( new MenuItemHandler( nItemId, nullptr, aXDispatchRef )); } } @@ -294,14 +294,14 @@ MenuManager::MenuItemHandler* MenuManager::GetMenuItemHandler( sal_uInt16 nItemI return pItemHandler; } - return 0; + return nullptr; } void SAL_CALL MenuManager::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { OUString aFeatureURL = Event.FeatureURL.Complete; - MenuItemHandler* pStatusChangedMenu = NULL; + MenuItemHandler* pStatusChangedMenu = nullptr; { SolarMutexGuard g; @@ -403,7 +403,7 @@ void SAL_CALL MenuManager::disposing( const EventObject& Source ) throw ( Runtim else { // disposing called from menu item dispatcher, remove listener - MenuItemHandler* pMenuItemDisposing = NULL; + MenuItemHandler* pMenuItemDisposing = nullptr; { SolarMutexGuard g; @@ -451,7 +451,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) Reference< XDispatch > aXDispatchRef; MenuItemHandler* pNewMenuItemHandler = new MenuItemHandler( nPickItemId++, - NULL, + nullptr, aXDispatchRef ); for ( int j = 0; j < aPickListEntry.getLength(); j++ ) @@ -573,7 +573,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) OUString aCompactedSystemPath; aTipHelpText = aSystemPath; - oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL ); + oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, nullptr ); if ( !nError ) aMenuTitle = aCompactedSystemPath; else @@ -762,7 +762,7 @@ IMPL_LINK_TYPED( MenuManager, Activate, Menu *, pMenu, bool ) { MenuItemHandler* pMenuItemHandler = *p; if ( pMenuItemHandler && - pMenuItemHandler->pSubMenuManager == 0 && + pMenuItemHandler->pSubMenuManager == nullptr && !pMenuItemHandler->xMenuItemDispatch.is() ) { // There is no dispatch mechanism for the special window list menu items, diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 20fb3104bf1b..401bde5335f8 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -61,7 +61,7 @@ CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::uno::XComponent new vcl::EventPoster(LINK(this, CloseDispatcher, impl_asyncCallback))) , m_eOperation(E_CLOSE_DOC) , m_lStatusListener(m_mutex) - , m_pSysWindow(NULL) + , m_pSysWindow(nullptr) { uno::Reference<frame::XFrame> xTarget = static_impl_searchRightTargetFrame(xFrame, sTarget); m_xCloseFrame = xTarget; @@ -217,7 +217,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& } if ( bIsSynchron ) - impl_asyncCallback(0); + impl_asyncCallback(nullptr); else { SolarMutexGuard g; diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 2382c2ba1ea2..bed75e26a957 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -173,7 +173,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt // and they exist more than ones. We have no idea which our sub tasks is the right one ) { - return NULL; + return nullptr; } // I) handle special cases which not right for using findFrame() first diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 7c34d436b8aa..90c9e6333d7d 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -67,7 +67,7 @@ MenuDispatcher::MenuDispatcher( const uno::Reference< XComponentContext >& , m_aListenerContainer ( m_mutex ) , m_bAlreadyDisposed ( false ) , m_bActivateListener ( false ) - , m_pMenuManager ( NULL ) + , m_pMenuManager ( nullptr ) { // Safe impossible cases // We need valid information about our owner for work. @@ -152,7 +152,7 @@ void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) thro else if ( m_pMenuManager && aEvent.Action == css::frame::FrameAction_COMPONENT_DETACHING ) { if ( m_pMenuManager ) - impl_setMenuBar( NULL ); + impl_setMenuBar( nullptr ); } } @@ -188,7 +188,7 @@ void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce // Remove our menu from system window if it is still there! if ( m_pMenuManager ) - impl_setMenuBar( NULL ); + impl_setMenuBar( nullptr ); } } @@ -215,7 +215,7 @@ bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, bool bMenuFromResource if ( xFrame.is() ) { uno::Reference< css::awt::XWindow >xContainerWindow = xFrame->getContainerWindow(); - vcl::Window* pWindow = NULL; + vcl::Window* pWindow = nullptr; SolarMutexGuard aSolarGuard; { @@ -232,17 +232,17 @@ bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, bool bMenuFromResource { // remove old menu from our system window if it was set before if ( m_pMenuManager->GetMenu() == static_cast<Menu *>(pSysWindow->GetMenuBar()) ) - pSysWindow->SetMenuBar( NULL ); + pSysWindow->SetMenuBar( nullptr ); // remove listener before we destruct ourself, so we cannot be called back afterwards m_pMenuManager->RemoveListener(); (static_cast< css::uno::XInterface* >(static_cast<OWeakObject*>(m_pMenuManager)))->release(); - m_pMenuManager = 0; + m_pMenuManager = nullptr; } - if ( pMenuBar != NULL ) + if ( pMenuBar != nullptr ) { sal_uInt16 nPos = pMenuBar->GetItemPos( SLOTID_MDIWINDOWLIST ); if ( nPos != MENU_ITEM_NOTFOUND ) diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx index e4b7b0139f53..48cda46538c4 100644 --- a/framework/source/fwe/classes/actiontriggercontainer.cxx +++ b/framework/source/fwe/classes/actiontriggercontainer.cxx @@ -129,15 +129,15 @@ Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeExce // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL! - static ::cppu::OTypeCollection* pTypeCollection = NULL; + static ::cppu::OTypeCollection* pTypeCollection = nullptr; - if ( pTypeCollection == NULL ) + if ( pTypeCollection == nullptr ) { // Ready for multithreading; get global mutex for first call of this method only! see before osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ); // Control these pointer again ... it can be, that another instance will be faster then these! - if ( pTypeCollection == NULL ) + if ( pTypeCollection == nullptr ) { // Create a static typecollection ... static ::cppu::OTypeCollection aTypeCollection( diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx index ae27ab137b95..acfe55be90e2 100644 --- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx @@ -55,8 +55,8 @@ ActionTriggerPropertySet::ActionTriggerPropertySet() : OBroadcastHelper ( m_aMutex ) , OPropertySetHelper ( *(static_cast< OBroadcastHelper * >(this))) , OWeakObject () - , m_xBitmap ( 0 ) - , m_xActionTriggerContainer( 0 ) + , m_xBitmap ( nullptr ) + , m_xActionTriggerContainer( nullptr ) { } @@ -123,15 +123,15 @@ Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() throw ( RuntimeEx // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL! - static ::cppu::OTypeCollection* pTypeCollection = NULL; + static ::cppu::OTypeCollection* pTypeCollection = nullptr; - if ( pTypeCollection == NULL ) + if ( pTypeCollection == nullptr ) { // Ready for multithreading; get global mutex for first call of this method only! see before osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ); // Control these pointer again ... it can be, that another instance will be faster then these! - if ( pTypeCollection == NULL ) + if ( pTypeCollection == nullptr ) { // Create a static typecollection ... static ::cppu::OTypeCollection aTypeCollection( @@ -261,13 +261,13 @@ void SAL_CALL ActionTriggerPropertySet::getFastPropertyValue( // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfoHelper is NULL - for the second call pInfoHelper is different from NULL! - static OPropertyArrayHelper* pInfoHelper = NULL; + static OPropertyArrayHelper* pInfoHelper = nullptr; - if( pInfoHelper == NULL ) + if( pInfoHelper == nullptr ) { SolarMutexGuard aGuard; // Control this pointer again, another instance can be faster then these! - if( pInfoHelper == NULL ) + if( pInfoHelper == nullptr ) { // Define static member to give structure of properties to baseclass "OPropertySetHelper". // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. @@ -286,13 +286,13 @@ throw ( RuntimeException, std::exception ) // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfo is NULL - for the second call pInfo is different from NULL! - static Reference< XPropertySetInfo >* pInfo = NULL; + static Reference< XPropertySetInfo >* pInfo = nullptr; - if( pInfo == NULL ) + if( pInfo == nullptr ) { SolarMutexGuard aGuard; // Control this pointer again, another instance can be faster then these! - if( pInfo == NULL ) + if( pInfo == nullptr ) { // Create structure of propertysetinfo for baseclass "OPropertySetHelper". // (Use method "getInfoHelper()".) diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx index ae3726cd2402..be02ec2b1bc7 100644 --- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx @@ -116,15 +116,15 @@ Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() throw ( // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL! - static ::cppu::OTypeCollection* pTypeCollection = NULL; + static ::cppu::OTypeCollection* pTypeCollection = nullptr; - if ( pTypeCollection == NULL ) + if ( pTypeCollection == nullptr ) { // Ready for multithreading; get global mutex for first call of this method only! see before osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ); // Control these pointer again ... it can be, that another instance will be faster then these! - if ( pTypeCollection == NULL ) + if ( pTypeCollection == nullptr ) { // Create a static typecollection ... static ::cppu::OTypeCollection aTypeCollection( @@ -206,13 +206,13 @@ void SAL_CALL ActionTriggerSeparatorPropertySet::getFastPropertyValue( // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfoHelper is NULL - for the second call pInfoHelper is different from NULL! - static OPropertyArrayHelper* pInfoHelper = NULL; + static OPropertyArrayHelper* pInfoHelper = nullptr; - if( pInfoHelper == NULL ) + if( pInfoHelper == nullptr ) { SolarMutexGuard aGuard; // Control this pointer again, another instance can be faster then these! - if( pInfoHelper == NULL ) + if( pInfoHelper == nullptr ) { // Define static member to give structure of properties to baseclass "OPropertySetHelper". // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. @@ -231,13 +231,13 @@ throw ( RuntimeException, std::exception ) // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfo is NULL - for the second call pInfo is different from NULL! - static Reference< XPropertySetInfo >* pInfo = NULL; + static Reference< XPropertySetInfo >* pInfo = nullptr; - if( pInfo == NULL ) + if( pInfo == nullptr ) { SolarMutexGuard aGuard; // Control this pointer again, another instance can be faster then these! - if( pInfo == NULL ) + if( pInfo == nullptr ) { // Create structure of propertysetinfo for baseclass "OPropertySetHelper". // (Use method "getInfoHelper()".) diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index f63e52ebc7e9..c65da97c56d1 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -109,7 +109,7 @@ PopupMenu* AddonMenuManager::CreatePopupMenuType( MenuType eMenuType, const Refe else if ( eMenuType == ADDON_POPUPMENU ) return new AddonPopupMenu( rFrame ); else - return NULL; + return nullptr; } // Create the Add-Ons menu @@ -117,7 +117,7 @@ AddonMenu* AddonMenuManager::CreateAddonMenu( const Reference< XFrame >& rFrame, const Reference< XComponentContext >& rContext ) { AddonsOptions aOptions; - AddonMenu* pAddonMenu = NULL; + AddonMenu* pAddonMenu = nullptr; sal_uInt16 nUniqueMenuId = ADDONMENU_ITEMID_START; const Sequence< Sequence< PropertyValue > >& rAddonMenuEntries = aOptions.GetAddonsMenu(); @@ -131,7 +131,7 @@ AddonMenu* AddonMenuManager::CreateAddonMenu( const Reference< XFrame >& rFrame, if ( pAddonMenu->GetItemCount() == 0 ) { delete pAddonMenu; - pAddonMenu = NULL; + pAddonMenu = nullptr; } } @@ -297,7 +297,7 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent bInsertSeparator = true; else { - PopupMenu* pSubMenu = NULL; + PopupMenu* pSubMenu = nullptr; if ( aAddonSubMenu.getLength() > 0 ) { pSubMenu = AddonMenuManager::CreatePopupMenuType( nSubMenuType, rFrame ); @@ -307,7 +307,7 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent if ( pSubMenu->GetItemCount() == 0 ) { delete pSubMenu; - pSubMenu = NULL; + pSubMenu = nullptr; continue; } } diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 821f3f886a8d..b64cc898f984 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -411,7 +411,7 @@ void AddonsOptions_Impl::ReadConfigurationData() void AddonsOptions_Impl::Notify( const Sequence< OUString >& /*lPropertyNames*/ ) { - Application::PostUserEvent( LINK( 0, AddonsOptions, Notify ) ); + Application::PostUserEvent( LINK( nullptr, AddonsOptions, Notify ) ); } // public method @@ -1355,7 +1355,7 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const OUStrin Sequence< sal_Int8 > aImageDataSeq; OUString aImageURL; - ImageEntry* pEntry = NULL; + ImageEntry* pEntry = nullptr; // It is possible to use both forms (embedded image data and URLs to external bitmap files) at the // same time. Embedded image data has a higher priority. @@ -1498,7 +1498,7 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString& // DON'T DO IT IN YOUR HEADER! // see definition for further information -AddonsOptions_Impl* AddonsOptions::m_pDataContainer = NULL; +AddonsOptions_Impl* AddonsOptions::m_pDataContainer = nullptr; sal_Int32 AddonsOptions::m_nRefCount = 0; // constructor @@ -1510,7 +1510,7 @@ AddonsOptions::AddonsOptions() // Increase our refcount ... ++m_nRefCount; // ... and initialize our data container only if it not already exist! - if( m_pDataContainer == NULL ) + if( m_pDataContainer == nullptr ) { m_pDataContainer = new AddonsOptions_Impl; } @@ -1529,7 +1529,7 @@ AddonsOptions::~AddonsOptions() if( m_nRefCount <= 0 ) { delete m_pDataContainer; - m_pDataContainer = NULL; + m_pDataContainer = nullptr; } } @@ -1632,15 +1632,15 @@ Image AddonsOptions::GetImageFromURL( const OUString& aURL, bool bBig ) const Mutex& AddonsOptions::GetOwnStaticMutex() { // Initialize static mutex only for one time! - static Mutex* pMutex = NULL; + static Mutex* pMutex = nullptr; // If these method first called (Mutex not already exist!) ... - if( pMutex == NULL ) + if( pMutex == nullptr ) { // ... we must create a new one. Protect follow code with the global mutex - // It must be - we create a static variable! MutexGuard aGuard( Mutex::getGlobalMutex() ); // We must check our pointer again - because it can be that another instance of our class will be faster than these! - if( pMutex == NULL ) + if( pMutex == nullptr ) { // Create the new mutex and set it for return on static variable. static Mutex aMutex; diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx index f90289227110..53a7fc7dfc6a 100644 --- a/framework/source/fwe/classes/fwkresid.cxx +++ b/framework/source/fwe/classes/fwkresid.cxx @@ -29,7 +29,7 @@ namespace framework ResMgr* FwkResId::GetResManager() { - static ResMgr* pResMgr = NULL; + static ResMgr* pResMgr = nullptr; if ( !pResMgr ) { diff --git a/framework/source/fwe/classes/menuextensionsupplier.cxx b/framework/source/fwe/classes/menuextensionsupplier.cxx index b1dafcd0f58a..438696106e60 100644 --- a/framework/source/fwe/classes/menuextensionsupplier.cxx +++ b/framework/source/fwe/classes/menuextensionsupplier.cxx @@ -20,7 +20,7 @@ #include <framework/menuextensionsupplier.hxx> #include <osl/mutex.hxx> -static pfunc_setMenuExtensionSupplier pMenuExtensionSupplierFunc = NULL; +static pfunc_setMenuExtensionSupplier pMenuExtensionSupplierFunc = nullptr; namespace framework { @@ -29,7 +29,7 @@ MenuExtensionItem SAL_CALL GetMenuExtension() { MenuExtensionItem aItem; - pfunc_setMenuExtensionSupplier pLocalMenuExtensionSupplierFunc( 0 ); + pfunc_setMenuExtensionSupplier pLocalMenuExtensionSupplierFunc( nullptr ); { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index 1ca2215404c3..87fd71595ad1 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -250,15 +250,15 @@ Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( Runtime // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL! - static ::cppu::OTypeCollection* pTypeCollection = NULL; + static ::cppu::OTypeCollection* pTypeCollection = nullptr; - if ( pTypeCollection == NULL ) + if ( pTypeCollection == nullptr ) { // Ready for multithreading; get global mutex for first call of this method only! see before osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ); // Control these pointer again ... it can be, that another instance will be faster then these! - if ( pTypeCollection == NULL ) + if ( pTypeCollection == nullptr ) { // Create a static typecollection ... static ::cppu::OTypeCollection aTypeCollection( diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx index cc127bb3ca0a..6ec7463e8eff 100644 --- a/framework/source/fwe/classes/sfxhelperfunctions.cxx +++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx @@ -23,12 +23,12 @@ #include <tools/diagnose_ex.h> -static pfunc_setToolBoxControllerCreator pToolBoxControllerCreator = NULL; -static pfunc_setStatusBarControllerCreator pStatusBarControllerCreator = NULL; -static pfunc_getRefreshToolbars pRefreshToolbars = NULL; -static pfunc_createDockingWindow pCreateDockingWindow = NULL; -static pfunc_isDockingWindowVisible pIsDockingWindowVisible = NULL; -static pfunc_activateToolPanel pActivateToolPanel = NULL; +static pfunc_setToolBoxControllerCreator pToolBoxControllerCreator = nullptr; +static pfunc_setStatusBarControllerCreator pStatusBarControllerCreator = nullptr; +static pfunc_getRefreshToolbars pRefreshToolbars = nullptr; +static pfunc_createDockingWindow pCreateDockingWindow = nullptr; +static pfunc_isDockingWindowVisible pIsDockingWindowVisible = nullptr; +static pfunc_activateToolPanel pActivateToolPanel = nullptr; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -46,7 +46,7 @@ pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_se svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL ) { - pfunc_setToolBoxControllerCreator pFactory = NULL; + pfunc_setToolBoxControllerCreator pFactory = nullptr; { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pFactory = pToolBoxControllerCreator; @@ -55,7 +55,7 @@ svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFram if ( pFactory ) return (*pFactory)( rFrame, pToolbox, nID, aCommandURL ); else - return NULL; + return nullptr; } pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator ) @@ -68,7 +68,7 @@ pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfun svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const OUString& aCommandURL ) { - pfunc_setStatusBarControllerCreator pFactory = NULL; + pfunc_setStatusBarControllerCreator pFactory = nullptr; { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pFactory = pStatusBarControllerCreator; @@ -77,7 +77,7 @@ svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< X if ( pFactory ) return (*pFactory)( rFrame, pStatusBar, nID, aCommandURL ); else - return NULL; + return nullptr; } pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pNewRefreshToolbarsFunc ) @@ -91,7 +91,7 @@ pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars p void SAL_CALL RefreshToolbars( css::uno::Reference< css::frame::XFrame >& rFrame ) { - pfunc_getRefreshToolbars pCallback = NULL; + pfunc_getRefreshToolbars pCallback = nullptr; { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pCallback = pRefreshToolbars; @@ -112,7 +112,7 @@ pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingW void SAL_CALL CreateDockingWindow( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceURL ) { - pfunc_createDockingWindow pFactory = NULL; + pfunc_createDockingWindow pFactory = nullptr; { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pFactory = pCreateDockingWindow; @@ -133,7 +133,7 @@ pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDocking bool SAL_CALL IsDockingWindowVisible( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rResourceURL ) { - pfunc_isDockingWindowVisible pCall = NULL; + pfunc_isDockingWindowVisible pCall = nullptr; { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pCall = pIsDockingWindowVisible; @@ -155,7 +155,7 @@ pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i void SAL_CALL ActivateToolPanel( const css::uno::Reference< css::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL ) { - pfunc_activateToolPanel pActivator = NULL; + pfunc_activateToolPanel pActivator = nullptr; { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pActivator = pActivateToolPanel; diff --git a/framework/source/fwe/helper/imageproducer.cxx b/framework/source/fwe/helper/imageproducer.cxx index 197456a3acae..3c70b2256258 100644 --- a/framework/source/fwe/helper/imageproducer.cxx +++ b/framework/source/fwe/helper/imageproducer.cxx @@ -22,7 +22,7 @@ namespace framework { -static pfunc_getImage _pGetImageFunc = NULL; +static pfunc_getImage _pGetImageFunc = nullptr; pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc ) { diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx index 299aed4fd565..91a7e44ba4da 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -597,7 +597,7 @@ namespace framework const bool bHasRedoActions = ( rUndoManager.GetRedoActionCount( IUndoManager::TopLevel ) > 0 ); // prepare notification - void ( SAL_CALL XUndoManagerListener::*notificationMethod )( const UndoManagerEvent& ) = NULL; + void ( SAL_CALL XUndoManagerListener::*notificationMethod )( const UndoManagerEvent& ) = nullptr; UndoManagerEvent aContextEvent( buildEvent( OUString() ) ); const EventObject aClearedEvent( getXUndoManager() ); diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx index a2c079da6e0c..818fdfe2122a 100644 --- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx +++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx @@ -53,7 +53,7 @@ void PreventDuplicateInteraction::useDefaultUUIHandler() aLock.clear(); // <- SAFE - css::uno::Reference< css::task::XInteractionHandler > xHandler( css::task::InteractionHandler::createWithParent( m_xContext, 0 ), css::uno::UNO_QUERY_THROW ); + css::uno::Reference< css::task::XInteractionHandler > xHandler( css::task::InteractionHandler::createWithParent( m_xContext, nullptr ), css::uno::UNO_QUERY_THROW ); // SAFE -> aLock.reset(); diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index 417bb05d077f..1cec54b2b557 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -109,7 +109,7 @@ PopupMenu* MenuConfiguration::CreateBookmarkMenu(css::uno::Reference<css::frame: else if ( aURL == BOOKMARK_WIZARDMENU ) return new BmkMenu( rFrame, BmkMenu::BMK_WIZARDMENU ); else - return NULL; + return nullptr; } void MenuConfiguration::StoreMenuBarConfigurationToXML( diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index fc27cf93632f..e5db95fd3611 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -148,8 +148,8 @@ static void ExtractMenuParameters( const Sequence< PropertyValue >& rProp, // Base class implementation ReadMenuDocumentHandlerBase::ReadMenuDocumentHandlerBase() : - m_xLocator( 0 ), - m_xReader( 0 ), + m_xLocator( nullptr ), + m_xReader( nullptr ), m_aType( ITEM_DESCRIPTOR_TYPE ), m_aLabel( ITEM_DESCRIPTOR_LABEL ), m_aContainer( ITEM_DESCRIPTOR_CONTAINER ), diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx index 759807707b2c..4971462efdb6 100644 --- a/framework/source/fwe/xml/saxnamespacefilter.cxx +++ b/framework/source/fwe/xml/saxnamespacefilter.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star::uno; namespace framework{ SaxNamespaceFilter::SaxNamespaceFilter( Reference< XDocumentHandler >& rSax1DocumentHandler ) : - m_xLocator( 0 ), + m_xLocator( nullptr ), xDocumentHandler( rSax1DocumentHandler ), m_nDepth( 0 ), m_aXMLAttributeNamespace( "xmlns" ), diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx index 46a42662351e..dde6ceba0886 100644 --- a/framework/source/fwi/classes/protocolhandlercache.cxx +++ b/framework/source/fwi/classes/protocolhandlercache.cxx @@ -68,10 +68,10 @@ PatternHash::iterator PatternHash::findPatternKey( const OUString& sURL ) That means it use two static member list to hold all necessary information and a ref count mechanism to create/destroy it on demand. */ -HandlerHash* HandlerCache::m_pHandler = NULL; -PatternHash* HandlerCache::m_pPattern = NULL; +HandlerHash* HandlerCache::m_pHandler = nullptr; +PatternHash* HandlerCache::m_pPattern = nullptr; sal_Int32 HandlerCache::m_nRefCount = 0; -HandlerCFGAccess* HandlerCache::m_pConfig = NULL; +HandlerCFGAccess* HandlerCache::m_pConfig = nullptr; /** @short ctor of the cache of all registered protocol handler @@ -107,16 +107,16 @@ HandlerCache::~HandlerCache() if( m_nRefCount==1) { - m_pConfig->setCache(NULL); + m_pConfig->setCache(nullptr); m_pHandler->free(); m_pPattern->free(); delete m_pConfig; delete m_pHandler; delete m_pPattern; - m_pConfig = NULL; - m_pHandler= NULL; - m_pPattern= NULL; + m_pConfig = nullptr; + m_pHandler= nullptr; + m_pPattern= nullptr; } --m_nRefCount; @@ -180,7 +180,7 @@ void HandlerCache::takeOver(HandlerHash* pHandler, PatternHash* pPattern) */ HandlerCFGAccess::HandlerCFGAccess( const OUString& sPackage ) : ConfigItem(sPackage) - , m_pCache(0) + , m_pCache(nullptr) { css::uno::Sequence< OUString > lListenPaths(1); lListenPaths[0] = SETNAME_HANDLER; diff --git a/framework/source/fwi/helper/networkdomain.cxx b/framework/source/fwi/helper/networkdomain.cxx index c52c2ec44bc4..bf3f643f8a27 100644 --- a/framework/source/fwi/helper/networkdomain.cxx +++ b/framework/source/fwi/helper/networkdomain.cxx @@ -130,7 +130,7 @@ static rtl_uString *getDomainName() static rtl_uString *getDomainName() { /* Initialize and assume failure */ - rtl_uString *ustrDomainName = NULL; + rtl_uString *ustrDomainName = nullptr; char buffer[256]; // actually the man page says 65 bytes should be enough diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 28ad0f1771ea..dfdeb6eeca5c 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -151,7 +151,7 @@ Reference< XIndexAccess > ConstItemContainer::deepCopyContainer( const Reference if ( rSubContainer.is() ) { ItemContainer* pSource = ItemContainer::GetImplementation( rSubContainer ); - ConstItemContainer* pSubContainer( 0 ); + ConstItemContainer* pSubContainer( nullptr ); if ( pSource ) pSubContainer = new ConstItemContainer( *pSource ); else @@ -186,7 +186,7 @@ ConstItemContainer* ConstItemContainer::GetImplementation( const css::uno::Refer { css::uno::Reference< css::lang::XUnoTunnel > xUT( rxIFace, css::uno::UNO_QUERY ); return xUT.is() ? reinterpret_cast< ConstItemContainer* >(sal::static_int_cast< sal_IntPtr >( - xUT->getSomething( ConstItemContainer::GetUnoTunnelId() ))) : NULL; + xUT->getSomething( ConstItemContainer::GetUnoTunnelId() ))) : nullptr; } // XElementAccess @@ -219,14 +219,14 @@ throw (css::uno::RuntimeException, std::exception) // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfo is NULL - for the second call pInfo is different from NULL! - static Reference< XPropertySetInfo >* pInfo = NULL; + static Reference< XPropertySetInfo >* pInfo = nullptr; - if( pInfo == NULL ) + if( pInfo == nullptr ) { // Ready for multithreading osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ); // Control this pointer again, another instance can be faster then these! - if( pInfo == NULL ) + if( pInfo == nullptr ) { // Create structure of propertysetinfo for baseclass "OPropertySetHelper". // (Use method "getInfoHelper()".) @@ -295,15 +295,15 @@ throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfoHelper is NULL - for the second call pInfoHelper is different from NULL! - static ::cppu::OPropertyArrayHelper* pInfoHelper = NULL; + static ::cppu::OPropertyArrayHelper* pInfoHelper = nullptr; - if( pInfoHelper == NULL ) + if( pInfoHelper == nullptr ) { // Ready for multithreading osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ); // Control this pointer again, another instance can be faster then these! - if( pInfoHelper == NULL ) + if( pInfoHelper == nullptr ) { // Define static member to give structure of properties to baseclass "OPropertySetHelper". // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx index 2abde0fd4e07..239f4027acba 100644 --- a/framework/source/fwi/uielement/itemcontainer.cxx +++ b/framework/source/fwi/uielement/itemcontainer.cxx @@ -118,7 +118,7 @@ Reference< XIndexAccess > ItemContainer::deepCopyContainer( const Reference< XIn if ( rSubContainer.is() ) { ConstItemContainer* pSource = ConstItemContainer::GetImplementation( rSubContainer ); - ItemContainer* pSubContainer( 0 ); + ItemContainer* pSubContainer( nullptr ); if ( pSource ) pSubContainer = new ItemContainer( *pSource, rMutex ); else @@ -143,7 +143,7 @@ ItemContainer* ItemContainer::GetImplementation( const css::uno::Reference< css: { css::uno::Reference< css::lang::XUnoTunnel > xUT( rxIFace, css::uno::UNO_QUERY ); return xUT.is() ? reinterpret_cast< ItemContainer* >(sal::static_int_cast< sal_IntPtr >( - xUT->getSomething( ItemContainer::GetUnoTunnelId() ))) : NULL; + xUT->getSomething( ItemContainer::GetUnoTunnelId() ))) : nullptr; } // XElementAccess diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index 93eb5d140e25..1ce57fb0d02d 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -128,7 +128,7 @@ Reference< XIndexAccess > RootItemContainer::deepCopyContainer( const Reference< if ( rSubContainer.is() ) { ConstItemContainer* pSource = ConstItemContainer::GetImplementation( rSubContainer ); - ItemContainer* pSubContainer( 0 ); + ItemContainer* pSubContainer( nullptr ); if ( pSource ) pSubContainer = new ItemContainer( *pSource, m_aShareMutex ); else @@ -161,7 +161,7 @@ RootItemContainer* RootItemContainer::GetImplementation( const css::uno::Referen { css::uno::Reference< css::lang::XUnoTunnel > xUT( rxIFace, css::uno::UNO_QUERY ); return xUT.is() ? reinterpret_cast< RootItemContainer* >(sal::static_int_cast< sal_IntPtr >( - xUT->getSomething( RootItemContainer::GetUnoTunnelId() ))) : NULL; + xUT->getSomething( RootItemContainer::GetUnoTunnelId() ))) : nullptr; } // XElementAccess @@ -307,15 +307,15 @@ void SAL_CALL RootItemContainer::getFastPropertyValue( css::uno::Any& aValue , // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfoHelper is NULL - for the second call pInfoHelper is different from NULL! - static ::cppu::OPropertyArrayHelper* pInfoHelper = NULL; + static ::cppu::OPropertyArrayHelper* pInfoHelper = nullptr; - if( pInfoHelper == NULL ) + if( pInfoHelper == nullptr ) { // Ready for multithreading osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ); // Control this pointer again, another instance can be faster then these! - if( pInfoHelper == NULL ) + if( pInfoHelper == nullptr ) { // Define static member to give structure of properties to baseclass "OPropertySetHelper". // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. @@ -334,14 +334,14 @@ throw (css::uno::RuntimeException, std::exception) // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfo is NULL - for the second call pInfo is different from NULL! - static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = NULL; + static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = nullptr; - if( pInfo == NULL ) + if( pInfo == nullptr ) { // Ready for multithreading osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ); // Control this pointer again, another instance can be faster then these! - if( pInfo == NULL ) + if( pInfo == nullptr ) { // Create structure of propertysetinfo for baseclass "OPropertySetHelper". // (Use method "getInfoHelper()".) diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index c644fde29d3c..7cf1e8a0ee6a 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -294,7 +294,7 @@ void OFrames::impl_resetObject() // Destroy this to reset this object. m_xOwner.clear(); // Reset pointer to shared container to! - m_pFrameContainer = NULL; + m_pFrameContainer = nullptr; } void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFrame > >& seqDestination , @@ -351,7 +351,7 @@ void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFram bool OFrames::impldbg_checkParameter_OFramesCtor( const css::uno::Reference< XFrame >& xOwner , FrameContainer* pFrameContainer ) { - return xOwner.is() && pFrameContainer != 0; + return xOwner.is() && pFrameContainer != nullptr; } // Its only allowed to add valid references to container. diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx index 95da84c75fda..0952b3161cfa 100644 --- a/framework/source/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -378,15 +378,15 @@ void SAL_CALL UIConfigElementWrapperBase::getFastPropertyValue( css::uno::Any& a // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfoHelper is NULL - for the second call pInfoHelper is different from NULL! - static ::cppu::OPropertyArrayHelper* pInfoHelper = NULL; + static ::cppu::OPropertyArrayHelper* pInfoHelper = nullptr; - if( pInfoHelper == NULL ) + if( pInfoHelper == nullptr ) { // Ready for multithreading osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ); // Control this pointer again, another instance can be faster then these! - if( pInfoHelper == NULL ) + if( pInfoHelper == nullptr ) { // Define static member to give structure of properties to baseclass "OPropertySetHelper". // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. @@ -404,14 +404,14 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL UIConfigElementWrap // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfo is NULL - for the second call pInfo is different from NULL! - static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = NULL; + static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = nullptr; - if( pInfo == NULL ) + if( pInfo == nullptr ) { // Ready for multithreading osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ); // Control this pointer again, another instance can be faster then these! - if( pInfo == NULL ) + if( pInfo == nullptr ) { // Create structure of propertysetinfo for baseclass "OPropertySetHelper". // (Use method "getInfoHelper()".) diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx index adcf2a85392b..055a405caf2c 100644 --- a/framework/source/helper/uielementwrapperbase.cxx +++ b/framework/source/helper/uielementwrapperbase.cxx @@ -172,15 +172,15 @@ void SAL_CALL UIElementWrapperBase::getFastPropertyValue( css::uno::Any& aValue // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfoHelper is NULL - for the second call pInfoHelper is different from NULL! - static ::cppu::OPropertyArrayHelper* pInfoHelper = NULL; + static ::cppu::OPropertyArrayHelper* pInfoHelper = nullptr; - if( pInfoHelper == NULL ) + if( pInfoHelper == nullptr ) { // Ready for multithreading osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ); // Control this pointer again, another instance can be faster then these! - if( pInfoHelper == NULL ) + if( pInfoHelper == nullptr ) { // Define static member to give structure of properties to baseclass "OPropertySetHelper". // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. @@ -198,14 +198,14 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL UIElementWrapperBas // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfo is NULL - for the second call pInfo is different from NULL! - static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = NULL; + static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = nullptr; - if( pInfo == NULL ) + if( pInfo == nullptr ) { // Ready for multithreading osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ); // Control this pointer again, another instance can be faster then these! - if( pInfo == NULL ) + if( pInfo == nullptr ) { // Create structure of propertysetinfo for baseclass "OPropertySetHelper". // (Use method "getInfoHelper()".) diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index b1ed0196809f..463cba642206 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -26,7 +26,7 @@ namespace framework { VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::awt::XWindow >& xParentWindow) : m_xParentWindow (xParentWindow ) - , m_pStatusBar (0 ) + , m_pStatusBar (nullptr ) , m_nRange (0 ) , m_nValue (0 ) { diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index 79c976e69433..d1e75f1b159b 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -142,7 +142,7 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::bea // Note: The help window brings itself to front ... Help* pHelp = Application::GetHelp(); if (pHelp) - pHelp->Start(sModuleDependendHelpURL, 0); + pHelp->Start(sModuleDependendHelpURL, nullptr); } } diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx index 9c955bb14b16..b415cedef409 100644 --- a/framework/source/jobs/shelljob.cxx +++ b/framework/source/jobs/shelljob.cxx @@ -141,15 +141,15 @@ bool ShellJob::impl_execute(const OUString& sCommand const css::uno::Sequence< OUString >& lArguments , bool bCheckExitCode) { - ::rtl_uString** pArgs = NULL; + ::rtl_uString** pArgs = nullptr; const ::sal_Int32 nArgs = lArguments.getLength (); oslProcessOption nOptions = osl_Process_WAIT; - oslProcess hProcess(0); + oslProcess hProcess(nullptr); if (nArgs > 0) pArgs = reinterpret_cast< ::rtl_uString** >(const_cast< OUString* >(lArguments.getConstArray())); - oslProcessError eError = osl_executeProcess(sCommand.pData, pArgs, nArgs, nOptions, NULL, NULL, NULL, 0, &hProcess); + oslProcessError eError = osl_executeProcess(sCommand.pData, pArgs, nArgs, nOptions, nullptr, nullptr, nullptr, 0, &hProcess); // executable not found or couldnt be started if (eError != osl_Process_E_None) diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index 11b7e20fe490..90e495644c7a 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -101,7 +101,7 @@ OUString retrieveToolbarNameFromHelpURL( vcl::Window* pWindow ) ToolBox* getToolboxPtr( vcl::Window* pWindow ) { - ToolBox* pToolbox(NULL); + ToolBox* pToolbox(nullptr); if ( pWindow->GetType() == WINDOW_TOOLBOX ) pToolbox = dynamic_cast<ToolBox*>( pWindow ); return pToolbox; @@ -125,7 +125,7 @@ SystemWindow* getTopSystemWindow( const uno::Reference< awt::XWindow >& xWindow if ( pWindow ) return static_cast<SystemWindow *>(pWindow); else - return 0; + return nullptr; } void setZeroRectangle( ::Rectangle& rRect ) diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index d7928383e189..fe10f2e52469 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -125,14 +125,14 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) : , m_bGlobalSettings( false ) , m_bPreserveContentSize( false ) , m_bMenuBarCloseButton( false ) - , m_pInplaceMenuBar( NULL ) + , m_pInplaceMenuBar( nullptr ) , m_xModuleManager( ModuleManager::create( xContext )) , m_xUIElementFactoryManager( ui::theUIElementFactoryManager::get(xContext) ) , m_xPersistentWindowStateSupplier( ui::theWindowStateConfiguration::get( xContext ) ) - , m_pGlobalSettings( 0 ) + , m_pGlobalSettings( nullptr ) , m_aListenerContainer( m_aMutex ) - , m_pToolbarManager( 0 ) - , m_xToolbarManager( 0 ) + , m_pToolbarManager( nullptr ) + , m_xToolbarManager( nullptr ) { // Initialize statusbar member const sal_Bool bRefreshVisibility = sal_False; @@ -159,7 +159,7 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) : LayoutManager::~LayoutManager() { m_aAsyncLayoutTimer.Stop(); - setDockingAreaAcceptor(NULL); + setDockingAreaAcceptor(nullptr); delete m_pGlobalSettings; } @@ -176,7 +176,7 @@ void LayoutManager::impl_clearUpMenuBar() SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow ); if ( pSysWindow ) { - MenuBar* pSetMenuBar = 0; + MenuBar* pSetMenuBar = nullptr; if ( m_xInplaceMenuBar.is() ) pSetMenuBar = static_cast<MenuBar *>(m_pInplaceMenuBar->GetMenuBar()); else @@ -205,12 +205,12 @@ void LayoutManager::impl_clearUpMenuBar() MenuBar* pTopMenuBar = pSysWindow->GetMenuBar(); if ( pSetMenuBar == pTopMenuBar ) - pSysWindow->SetMenuBar( 0 ); + pSysWindow->SetMenuBar( nullptr ); } } // reset inplace menubar manager - m_pInplaceMenuBar = 0; + m_pInplaceMenuBar = nullptr; if ( m_xInplaceMenuBar.is() ) { m_xInplaceMenuBar->dispose(); @@ -495,8 +495,8 @@ bool LayoutManager::readWindowStateData( const OUString& aName, UIElement& rElem { aWriteLock.reset(); bool bGlobalSettings( bInGlobalSettings ); - GlobalSettings* pGlobalSettings( 0 ); - if ( rGlobalSettings == 0 ) + GlobalSettings* pGlobalSettings( nullptr ); + if ( rGlobalSettings == nullptr ) { rGlobalSettings = new GlobalSettings( rComponentContext ); bGetSettingsState = true; @@ -704,7 +704,7 @@ void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UI ::Size LayoutManager::implts_getContainerWindowOutputSize() { ::Size aContainerWinSize; - vcl::Window* pContainerWindow( 0 ); + vcl::Window* pContainerWindow( nullptr ); // Retrieve output size from container Window SolarMutexGuard aGuard; @@ -769,7 +769,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( bool bSetVisible ) { SolarMutexGuard aGuard; - MenuBar* pMenuBar( 0 ); + MenuBar* pMenuBar( nullptr ); if ( xInplaceMenuBar.is() ) pMenuBar = static_cast<MenuBar *>(pInplaceMenuBar->GetMenuBar()); else @@ -791,7 +791,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( bool bSetVisible ) } } else - pSysWindow->SetMenuBar( 0 ); + pSysWindow->SetMenuBar( nullptr ); } } @@ -885,7 +885,7 @@ void LayoutManager::implts_createProgressBar() aWriteLock.clear(); bool bRecycled = xProgressBarBackup.is(); - ProgressBarWrapper* pWrapper = 0; + ProgressBarWrapper* pWrapper = nullptr; if ( bRecycled ) pWrapper = static_cast<ProgressBarWrapper*>(xProgressBarBackup.get()); else if ( xProgressBar.is() ) @@ -1155,7 +1155,7 @@ throw (uno::RuntimeException, std::exception) SolarMutexGuard aGuard; // Reset old inplace menubar! - m_pInplaceMenuBar = 0; + m_pInplaceMenuBar = nullptr; if ( m_xInplaceMenuBar.is() ) m_xInplaceMenuBar->dispose(); m_xInplaceMenuBar.clear(); @@ -1201,12 +1201,12 @@ throw (uno::RuntimeException) if ( pMenuBarWrapper ) pSysWindow->SetMenuBar(static_cast<MenuBar *>(pMenuBarWrapper->GetMenuBarManager()->GetMenuBar())); else - pSysWindow->SetMenuBar(0); + pSysWindow->SetMenuBar(nullptr); } } // Remove inplace menu bar - m_pInplaceMenuBar = 0; + m_pInplaceMenuBar = nullptr; if ( m_xInplaceMenuBar.is() ) m_xInplaceMenuBar->dispose(); m_xInplaceMenuBar.clear(); @@ -1456,7 +1456,7 @@ throw (RuntimeException, std::exception) parseResourceURL( aName, aElementType, aElementName ); - if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ) && m_pToolbarManager != NULL ) + if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ) && m_pToolbarManager != nullptr ) { bNotify = m_pToolbarManager->createToolbar( aName ); bMustBeLayouted = m_pToolbarManager->isLayoutDirty(); @@ -1595,7 +1595,7 @@ throw (RuntimeException, std::exception) bMustBeLayouted = true; bNotify = true; } - else if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ) && m_pToolbarManager != NULL ) + else if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ) && m_pToolbarManager != nullptr ) { aWriteLock.clear(); bNotify = m_pToolbarManager->destroyToolbar( aName ); @@ -2570,7 +2570,7 @@ bool LayoutManager::implts_resetMenuBar() bool bMenuVisible( m_bMenuVisible ); Reference< awt::XWindow > xContainerWindow( m_xContainerWindow ); - MenuBar* pSetMenuBar = 0; + MenuBar* pSetMenuBar = nullptr; if ( m_xInplaceMenuBar.is() ) pSetMenuBar = static_cast<MenuBar *>(m_pInplaceMenuBar->GetMenuBar()); else @@ -2632,7 +2632,7 @@ void LayoutManager::implts_notifyListeners(short nEvent, const uno::Any& rInfoPa { lang::EventObject aSource( static_cast< ::cppu::OWeakObject*>(this) ); ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<frame::XLayoutManagerListener>::get()); - if (pContainer!=NULL) + if (pContainer!=nullptr) { ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); while (pIterator.hasMoreElements()) @@ -2816,7 +2816,7 @@ throw( RuntimeException, std::exception ) m_xMenuBar.clear(); if ( m_xInplaceMenuBar.is() ) { - m_pInplaceMenuBar = 0; + m_pInplaceMenuBar = nullptr; m_xInplaceMenuBar->dispose(); } m_xInplaceMenuBar.clear(); @@ -2824,7 +2824,7 @@ throw( RuntimeException, std::exception ) m_xContainerTopWindow.clear(); // forward disposing call to toolbar manager - if ( m_pToolbarManager != NULL ) + if ( m_pToolbarManager != nullptr ) m_pToolbarManager->disposing(rEvent); if ( m_xModuleCfgMgr.is() ) @@ -2857,7 +2857,7 @@ throw( RuntimeException, std::exception ) m_xModuleCfgMgr.clear(); m_xFrame.clear(); delete m_pGlobalSettings; - m_pGlobalSettings = 0; + m_pGlobalSettings = nullptr; bDisposeAndClear = true; } @@ -2874,7 +2874,7 @@ throw( RuntimeException, std::exception ) m_xMenuBar.clear(); if ( m_xInplaceMenuBar.is() ) { - m_pInplaceMenuBar = 0; + m_pInplaceMenuBar = nullptr; m_xInplaceMenuBar->dispose(); } m_xInplaceMenuBar.clear(); @@ -3014,7 +3014,7 @@ void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event { SystemWindow* pSysWindow = getTopSystemWindow( xContainerWindow ); if ( pSysWindow && !m_bInplaceMenuSet ) - pSysWindow->SetMenuBar( 0 ); + pSysWindow->SetMenuBar( nullptr ); Reference< XComponent > xComp( xMenuBar, UNO_QUERY ); if ( xComp.is() ) @@ -3169,13 +3169,13 @@ namespace uno::Reference< beans::XPropertySetInfo > SAL_CALL LayoutManager::getPropertySetInfo() throw (uno::RuntimeException, std::exception) { - static uno::Reference< beans::XPropertySetInfo >* pInfo = NULL; + static uno::Reference< beans::XPropertySetInfo >* pInfo = nullptr; - if( pInfo == NULL ) + if( pInfo == nullptr ) { osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ); - if( pInfo == NULL ) + if( pInfo == nullptr ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); pInfo = &xInfo; diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 1bf595367766..54dae84be9e0 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -59,8 +59,8 @@ ToolbarLayoutManager::ToolbarLayoutManager( m_pParentLayouter( pParentLayouter ), m_eDockOperation( DOCKOP_ON_COLROW ), m_ePreviewDetection( PREVIEWFRAME_UNKNOWN ), - m_pAddonOptions( 0 ), - m_pGlobalSettings( 0 ), + m_pAddonOptions( nullptr ), + m_pGlobalSettings( nullptr ), m_bComponentAttached( false ), m_bLayoutDirty( false ), m_bStoreWindowState( false ), @@ -818,8 +818,8 @@ bool ToolbarLayoutManager::dockToolbar( const OUString& rResourceURL, ui::Dockin if ( !xDockWindow->isFloating() ) { - vcl::Window* pWindow( 0 ); - ToolBox* pToolBox( 0 ); + vcl::Window* pWindow( nullptr ); + ToolBox* pToolBox( nullptr ); { SolarMutexGuard aGuard; @@ -1406,8 +1406,8 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno uno::Reference< awt::XDockableWindow > xDockWindow( rDockWindow ); uno::Reference< awt::XWindow2 > xWindow( xDockWindow, uno::UNO_QUERY ); - vcl::Window* pWindow( 0 ); - ToolBox* pToolBox( 0 ); + vcl::Window* pWindow( nullptr ); + ToolBox* pToolBox( nullptr ); if ( xDockWindow.is() && xWindow.is() ) { @@ -2249,7 +2249,7 @@ void ToolbarLayoutManager::implts_findNextDockingPos( ui::DockingArea DockingAre DockingArea = ui::DockingArea_DOCKINGAREA_TOP; uno::Reference< awt::XWindow > xDockingWindow( m_xDockAreaWindows[DockingArea] ); ::Size aDockingWinSize; - vcl::Window* pDockingWindow( 0 ); + vcl::Window* pDockingWindow( nullptr ); aReadLock.clear(); { @@ -2593,7 +2593,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( SolarMutexResettableGuard aReadLock; uno::Reference< awt::XWindow2 > xContainerWindow( m_xContainerWindow ); ::Size aContainerWinSize; - vcl::Window* pContainerWindow( 0 ); + vcl::Window* pContainerWindow( nullptr ); ::Rectangle aDockingAreaOffsets( m_aDockingAreaOffsets ); aReadLock.clear(); @@ -2610,8 +2610,8 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( aContainerWinSize = pContainerWindow->GetOutputSizePixel(); } - vcl::Window* pDockingAreaWindow( 0 ); - ToolBox* pToolBox( 0 ); + vcl::Window* pDockingAreaWindow( nullptr ); + ToolBox* pToolBox( nullptr ); uno::Reference< awt::XWindow > xWindow( rUIElement.m_xUIElement->getRealInterface(), uno::UNO_QUERY ); uno::Reference< awt::XWindow > xDockingAreaWindow; ::Rectangle aTrackingRect( rTrackingRect ); @@ -3068,7 +3068,7 @@ framework::ToolbarLayoutManager::DockingOperation ToolbarLayoutManager::implts_d aReadGuard.clear(); sal_Int32 nDockPosY( 0 ); - vcl::Window* pDockingAreaWindow( 0 ); + vcl::Window* pDockingAreaWindow( nullptr ); { SolarMutexGuard aGuard; pDockingAreaWindow = VCLUnoHelper::GetWindow( xDockingAreaWindow ); @@ -3262,7 +3262,7 @@ throw (uno::RuntimeException, std::exception) uno::Reference< awt::XWindow2 > xWindow( e.Source, uno::UNO_QUERY ); aReadGuard.clear(); - vcl::Window* pContainerWindow( 0 ); + vcl::Window* pContainerWindow( nullptr ); ::Point aMousePos; { SolarMutexGuard aGuard; @@ -3382,7 +3382,7 @@ throw (uno::RuntimeException, std::exception) // Determine if we have a toolbar and set alignment according to the docking area! vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); - ToolBox* pToolBox = 0; + ToolBox* pToolBox = nullptr; if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) pToolBox = static_cast<ToolBox *>(pWindow); @@ -3535,7 +3535,7 @@ throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; vcl::Window* pWindow = VCLUnoHelper::GetWindow( uno::Reference< awt::XWindow >( e.Source, uno::UNO_QUERY )); - ToolBox* pToolBox = 0; + ToolBox* pToolBox = nullptr; if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) pToolBox = static_cast<ToolBox *>(pWindow); @@ -3628,8 +3628,8 @@ throw (uno::RuntimeException, std::exception) aUIDockingElement = m_aDockUIElement; aReadLock.clear(); - vcl::Window* pWindow( 0 ); - ToolBox* pToolBox( 0 ); + vcl::Window* pWindow( nullptr ); + ToolBox* pToolBox( nullptr ); uno::Reference< awt::XWindow2 > xWindow; { diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 57e572e78335..1168f04df6d2 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -301,7 +301,7 @@ void LoadEnv::initializeUIDefaults( const css::uno::Reference< css::uno::XCompon nUpdateMode = css::document::UpdateDocMode::ACCORDING_TO_CONFIG; try { - xInteractionHandler.set( css::task::InteractionHandler::createWithParent( i_rxContext, 0 ), css::uno::UNO_QUERY_THROW ); + xInteractionHandler.set( css::task::InteractionHandler::createWithParent( i_rxContext, nullptr ), css::uno::UNO_QUERY_THROW ); } catch(const css::uno::RuntimeException&) {throw;} catch(const css::uno::Exception& ) { } @@ -313,7 +313,7 @@ void LoadEnv::initializeUIDefaults( const css::uno::Reference< css::uno::XCompon nUpdateMode = css::document::UpdateDocMode::NO_UPDATE; rtl::Reference<QuietInteraction> pQuietInteraction = new QuietInteraction(); xInteractionHandler = pQuietInteraction.get(); - if ( o_ppQuietInteraction != NULL ) + if ( o_ppQuietInteraction != nullptr ) { *o_ppQuietInteraction = pQuietInteraction; } diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 51dd50f2232d..e15621dcb285 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -72,7 +72,7 @@ Sequence< Any > make_seq_out_of_struct( throw RuntimeException( type.getTypeName() + "is no struct or exception!" ); } - typelib_TypeDescription * pTD = 0; + typelib_TypeDescription * pTD = nullptr; TYPELIB_DANGER_GET( &pTD, type.getTypeLibType() ); OSL_ASSERT( pTD ); if (! pTD) diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx index 848959392c28..e98b6ee6ccec 100644 --- a/framework/source/recording/dispatchrecordersupplier.cxx +++ b/framework/source/recording/dispatchrecordersupplier.cxx @@ -51,7 +51,7 @@ DEFINE_INIT_SERVICE( it's not necessary to do anything here. */ DispatchRecorderSupplier::DispatchRecorderSupplier( const css::uno::Reference< css::lang::XMultiServiceFactory >& ) - : m_xDispatchRecorder( NULL ) + : m_xDispatchRecorder( nullptr ) { } @@ -63,7 +63,7 @@ DispatchRecorderSupplier::DispatchRecorderSupplier( const css::uno::Reference< c */ DispatchRecorderSupplier::~DispatchRecorderSupplier() { - m_xDispatchRecorder = NULL; + m_xDispatchRecorder = nullptr; } /** diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx index 3e8f39487d3d..27e2e088fc1d 100644 --- a/framework/source/services/ContextChangeEventMultiplexer.cxx +++ b/framework/source/services/ContextChangeEventMultiplexer.cxx @@ -167,7 +167,7 @@ void SAL_CALL ContextChangeEventMultiplexer::addContextChangeEventListener ( 0); FocusDescriptor* pFocusDescriptor = GetFocusDescriptor(rxEventFocus, true); - if (pFocusDescriptor != NULL) + if (pFocusDescriptor != nullptr) { ListenerContainer& rContainer (pFocusDescriptor->maListeners); if (::std::find(rContainer.begin(), rContainer.end(), rxListener) == rContainer.end()) @@ -182,10 +182,10 @@ void SAL_CALL ContextChangeEventMultiplexer::addContextChangeEventListener ( // Send out an initial event that informs the new listener about // the current context. - if (rxEventFocus.is() && pFocusDescriptor!=NULL) + if (rxEventFocus.is() && pFocusDescriptor!=nullptr) { css::ui::ContextChangeEventObject aEvent ( - NULL, + nullptr, pFocusDescriptor->msCurrentApplicationName, pFocusDescriptor->msCurrentContextName); rxListener->notifyContextChangeEvent(aEvent); @@ -203,7 +203,7 @@ void SAL_CALL ContextChangeEventMultiplexer::removeContextChangeEventListener ( static_cast<XWeak*>(this), 0); FocusDescriptor* pFocusDescriptor = GetFocusDescriptor(rxEventFocus, false); - if (pFocusDescriptor != NULL) + if (pFocusDescriptor != nullptr) { ListenerContainer& rContainer (pFocusDescriptor->maListeners); const ListenerContainer::iterator iListener ( @@ -255,7 +255,7 @@ void SAL_CALL ContextChangeEventMultiplexer::broadcastContextChangeEvent ( if (rxEventFocus.is()) { FocusDescriptor* pFocusDescriptor = GetFocusDescriptor(rxEventFocus, true); - if (pFocusDescriptor != NULL) + if (pFocusDescriptor != nullptr) { pFocusDescriptor->msCurrentApplicationName = rEventObject.ApplicationName; pFocusDescriptor->msCurrentContextName = rEventObject.ContextName; @@ -264,7 +264,7 @@ void SAL_CALL ContextChangeEventMultiplexer::broadcastContextChangeEvent ( BroadcastEventToSingleContainer(rEventObject, rxEventFocus); if (rxEventFocus.is()) - BroadcastEventToSingleContainer(rEventObject, NULL); + BroadcastEventToSingleContainer(rEventObject, nullptr); } void ContextChangeEventMultiplexer::BroadcastEventToSingleContainer ( @@ -272,7 +272,7 @@ void ContextChangeEventMultiplexer::BroadcastEventToSingleContainer ( const cssu::Reference<cssu::XInterface>& rxEventFocus) { FocusDescriptor* pFocusDescriptor = GetFocusDescriptor(rxEventFocus, false); - if (pFocusDescriptor != NULL) + if (pFocusDescriptor != nullptr) { // Create a copy of the listener container to avoid problems // when one of the called listeners calls add... or remove... @@ -309,7 +309,7 @@ ContextChangeEventMultiplexer::FocusDescriptor* ContextChangeEventMultiplexer::G if (iDescriptor != maListeners.end()) return &iDescriptor->second; else - return NULL; + return nullptr; } OUString SAL_CALL ContextChangeEventMultiplexer::getImplementationName() diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 0acace7f88f4..bcd55bc417d7 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -746,7 +746,7 @@ private: */ AutoRecovery::ETimerType implts_saveDocs( bool bAllowUserIdleLoop, bool bRemoveLockFiles, - const DispatchParams* pParams = 0); + const DispatchParams* pParams = nullptr); /** @short save one of the current documents to a specific backup directory. @@ -1397,7 +1397,7 @@ void SAL_CALL AutoRecovery::dispatch(const css::util::URL& void AutoRecovery::ListenerInformer::start() { m_rRecovery.implts_informListener(m_eJob, - AutoRecovery::implst_createFeatureStateEvent(m_eJob, OPERATION_START, NULL)); + AutoRecovery::implst_createFeatureStateEvent(m_eJob, OPERATION_START, nullptr)); } void AutoRecovery::ListenerInformer::stop() @@ -1405,7 +1405,7 @@ void AutoRecovery::ListenerInformer::stop() if (m_bStopped) return; m_rRecovery.implts_informListener(m_eJob, - AutoRecovery::implst_createFeatureStateEvent(m_eJob, OPERATION_STOP, NULL)); + AutoRecovery::implst_createFeatureStateEvent(m_eJob, OPERATION_STOP, nullptr)); m_bStopped = true; } @@ -2381,7 +2381,7 @@ IMPL_LINK_NOARG_TYPED(AutoRecovery, implts_timerExpired, Timer *, void) } /* SAFE */ implts_informListener(AutoRecovery::E_AUTO_SAVE, - AutoRecovery::implst_createFeatureStateEvent(AutoRecovery::E_AUTO_SAVE, OPERATION_START, NULL)); + AutoRecovery::implst_createFeatureStateEvent(AutoRecovery::E_AUTO_SAVE, OPERATION_START, nullptr)); // force save of all currently open documents // The called method returns an info, if and how this @@ -2404,7 +2404,7 @@ IMPL_LINK_NOARG_TYPED(AutoRecovery, implts_timerExpired, Timer *, void) } implts_informListener(AutoRecovery::E_AUTO_SAVE, - AutoRecovery::implst_createFeatureStateEvent(AutoRecovery::E_AUTO_SAVE, OPERATION_STOP, NULL)); + AutoRecovery::implst_createFeatureStateEvent(AutoRecovery::E_AUTO_SAVE, OPERATION_STOP, nullptr)); // restart timer - because it was disabled before ... /* SAFE */ { @@ -3315,7 +3315,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa else continue; // TODO ERROR! - LoadEnv::initializeUIDefaults( m_xContext, lDescriptor, true, NULL ); + LoadEnv::initializeUIDefaults( m_xContext, lDescriptor, true, nullptr ); // } /* SAFE */ g.clear(); @@ -3556,12 +3556,12 @@ void AutoRecovery::implts_informListener( sal_Int32 eJ const css::frame::FeatureStateEvent& aEvent) { // Helper shares mutex with us -> threadsafe! - ::cppu::OInterfaceContainerHelper* pListenerForURL = 0; + ::cppu::OInterfaceContainerHelper* pListenerForURL = nullptr; OUString sJob = AutoRecovery::implst_getJobDescription(eJob); // inform listener, which are registered for any URLs(!) pListenerForURL = m_lListener.getContainer(sJob); - if(pListenerForURL != 0) + if(pListenerForURL != nullptr) { ::cppu::OInterfaceIteratorHelper pIt(*pListenerForURL); while(pIt.hasMoreElements()) @@ -4057,7 +4057,7 @@ const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescripto ::cppu::IPropertyArrayHelper& SAL_CALL AutoRecovery::getInfoHelper() { - static ::cppu::OPropertyArrayHelper* pInfoHelper = 0; + static ::cppu::OPropertyArrayHelper* pInfoHelper = nullptr; if(!pInfoHelper) { SolarMutexGuard g; @@ -4074,7 +4074,7 @@ const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescripto css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL AutoRecovery::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) { - static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = 0; + static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = nullptr; if(!pInfo) { SolarMutexGuard g; diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index bf1ce7812389..948e91e6e522 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -593,7 +593,7 @@ But; Don't forget - you will be the owner of returned object and must release it css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getTasks() throw( css::uno::RuntimeException, std::exception ) { SAL_INFO("fwk", "Desktop::getTasks(): Use of obsolete interface XTaskSupplier"); - return NULL; + return nullptr; } /*-************************************************************************************************************ @@ -615,7 +615,7 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getT css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask() throw( css::uno::RuntimeException, std::exception ) { SAL_INFO("fwk", "Desktop::getActiveTask(): Use of obsolete interface XTaskSupplier"); - return NULL; + return nullptr; } /*-************************************************************************************************************ @@ -910,7 +910,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS // and they exist more than ones. We have no idea which our sub tasks is the right one ) { - return NULL; + return nullptr; } // I) check for special defined targets first which must be handled exclusive. @@ -1440,14 +1440,14 @@ void SAL_CALL Desktop::getFastPropertyValue( css::uno::Any& aValue , // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfoHelper is NULL - for the second call pInfoHelper is different from NULL! - static ::cppu::OPropertyArrayHelper* pInfoHelper = NULL; + static ::cppu::OPropertyArrayHelper* pInfoHelper = nullptr; - if( pInfoHelper == NULL ) + if( pInfoHelper == nullptr ) { SolarMutexGuard aGuard; // Control this pointer again, another instance can be faster then these! - if( pInfoHelper == NULL ) + if( pInfoHelper == nullptr ) { // Define static member to give structure of properties to baseclass "OPropertySetHelper". // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. @@ -1484,14 +1484,14 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropert // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfo is NULL - for the second call pInfo is different from NULL! - static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = NULL; + static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = nullptr; - if( pInfo == NULL ) + if( pInfo == nullptr ) { SolarMutexGuard aGuard; // Control this pointer again, another instance can be faster then these! - if( pInfo == NULL ) + if( pInfo == nullptr ) { // Create structure of propertysetinfo for baseclass "OPropertySetHelper". // (Use method "getInfoHelper()".) diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 53d4fdeffc73..f68f2d39d8e1 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -508,7 +508,7 @@ Frame::Frame( const css::uno::Reference< css::uno::XComponentContext >& xContext , m_bSelfClose ( false ) // Important! , m_bIsHidden ( true ) , m_xTitleHelper ( ) - , m_pWindowCommandDispatch ( 0 ) + , m_pWindowCommandDispatch ( nullptr ) , m_aChildFrameContainer ( ) { } @@ -1006,7 +1006,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr (sTargetFrameName==SPECIALTARGET_MENUBAR ) // valid for dispatches - not for findFrame()! ) { - return NULL; + return nullptr; } // I) check for special defined targets first which must be handled exclusive. @@ -1535,7 +1535,7 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X // We hold it alive for next calls by using xOldController! /* SAFE {*/ SolarMutexClearableGuard aWriteLock; - m_xController = NULL; + m_xController = nullptr; aWriteLock.clear(); /* } SAFE */ @@ -1549,7 +1549,7 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X catch(const css::lang::DisposedException&) {} } - xOldController = NULL; + xOldController = nullptr; } // Now it's time to release the component window. @@ -1564,7 +1564,7 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X { /* SAFE { */ SolarMutexClearableGuard aWriteLock; - m_xComponentWindow = NULL; + m_xComponentWindow = nullptr; aWriteLock.clear(); /* } SAFE */ @@ -1579,7 +1579,7 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X { } } - xOldComponentWindow = NULL; + xOldComponentWindow = nullptr; } // Now it's time to set the new component ... @@ -1746,7 +1746,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::Close // Note: container is threadsafe himself. css::lang::EventObject aSource (static_cast< ::cppu::OWeakObject*>(this)); ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<css::util::XCloseListener>::get()); - if (pContainer!=NULL) + if (pContainer!=nullptr) { ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); while (pIterator.hasMoreElements()) @@ -1775,12 +1775,12 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::Close throw css::util::CloseVetoException("Frame in use for loading document ...",static_cast< ::cppu::OWeakObject*>(this)); } - if ( ! setComponent(NULL,NULL) ) + if ( ! setComponent(nullptr,nullptr) ) throw css::util::CloseVetoException("Component couldn't be deattached ...",static_cast< ::cppu::OWeakObject*>(this)); // If closing is allowed... inform all listeners and dispose this frame! pContainer = m_aListenerContainer.getContainer( cppu::UnoType<css::util::XCloseListener>::get()); - if (pContainer!=NULL) + if (pContainer!=nullptr) { ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); while (pIterator.hasMoreElements()) @@ -1900,7 +1900,7 @@ void SAL_CALL Frame::removeTitleChangeListener( const css::uno::Reference< css:: css::uno::Reference<css::container::XNameContainer> SAL_CALL Frame::getUserDefinedAttributes() throw (css::uno::RuntimeException, std::exception) { // optional attribute - return 0; + return nullptr; } css::uno::Reference<css::frame::XDispatchRecorderSupplier> SAL_CALL Frame::getDispatchRecorderSupplier() throw (css::uno::RuntimeException, std::exception) @@ -2838,7 +2838,7 @@ void Frame::implts_sendFrameActionEvent( const css::frame::FrameAction& aAction // ( OInterfaceContainerHelper is synchronized with m_aListenerContainer! ) ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<css::frame::XFrameActionListener>::get()); - if( pContainer != NULL ) + if( pContainer != nullptr ) { // Build action event. css::frame::FrameActionEvent aFrameActionEvent( static_cast< ::cppu::OWeakObject* >(this), this, aAction ); @@ -2964,7 +2964,7 @@ void Frame::implts_setIconOnWindow() SolarMutexGuard aSolarGuard; vcl::Window* pWindow = (VCLUnoHelper::GetWindow( xContainerWindow )); if( - ( pWindow != NULL ) && + ( pWindow != nullptr ) && ( pWindow->GetType() == WINDOW_WORKWINDOW ) ) { diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index fadcaf5321b4..91160df00f86 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -459,7 +459,7 @@ PathSettings::PathSettings( const css::uno::Reference< css::uno::XComponentConte : PathSettings_BASE(m_aMutex) , ::cppu::OPropertySetHelper(cppu::WeakComponentImplHelperBase::rBHelper) , m_xContext (xContext) - , m_pPropHelp(0 ) + , m_pPropHelp(nullptr ) , m_bIgnoreEvents(false) { } @@ -484,7 +484,7 @@ void SAL_CALL PathSettings::disposing() m_xCfgNewListener.clear(); delete m_pPropHelp; - m_pPropHelp = 0; + m_pPropHelp = nullptr; } css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& _rType ) @@ -739,8 +739,8 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath // SAFE -> osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); - PathSettings::PathInfo* pPathOld = 0; - PathSettings::PathInfo* pPathNew = 0; + PathSettings::PathInfo* pPathOld = nullptr; + PathSettings::PathInfo* pPathNew = nullptr; PathSettings::EChangeOp eOp = PathSettings::E_UNDEFINED; PathSettings::PathInfo aPath; @@ -797,7 +797,7 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath { if (bNotifyListener) { - pPathOld = 0; + pPathOld = nullptr; pPathNew = &aPath; impl_notifyPropListener(eOp, sPath, pPathOld, pPathNew); } @@ -824,7 +824,7 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath if (bNotifyListener) { pPathOld = &(pPath->second); - pPathNew = 0; + pPathNew = nullptr; impl_notifyPropListener(eOp, sPath, pPathOld, pPathNew); } m_lPaths.erase(pPath); @@ -1113,7 +1113,7 @@ void PathSettings::impl_rebuildPropertyDescriptor() ++pIt ) { const PathSettings::PathInfo& rPath = pIt->second; - css::beans::Property* pProp = 0; + css::beans::Property* pProp = nullptr; pProp = &(m_lPropDesc[i]); pProp->Name = rPath.sPathName; @@ -1351,7 +1351,7 @@ PathSettings::PathInfo* PathSettings::impl_getPathAccess(sal_Int32 nHandle) osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); if (nHandle > (m_lPropDesc.getLength()-1)) - return 0; + return nullptr; const css::beans::Property& rProp = m_lPropDesc[nHandle]; OUString sProp = impl_extractBaseFromPropName(rProp.Name); @@ -1360,7 +1360,7 @@ PathSettings::PathInfo* PathSettings::impl_getPathAccess(sal_Int32 nHandle) if (rPath != m_lPaths.end()) return &(rPath->second); - return 0; + return nullptr; // <- SAFE } @@ -1370,7 +1370,7 @@ const PathSettings::PathInfo* PathSettings::impl_getPathAccessConst(sal_Int32 nH osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); if (nHandle > (m_lPropDesc.getLength()-1)) - return 0; + return nullptr; const css::beans::Property& rProp = m_lPropDesc[nHandle]; OUString sProp = impl_extractBaseFromPropName(rProp.Name); @@ -1379,7 +1379,7 @@ const PathSettings::PathInfo* PathSettings::impl_getPathAccessConst(sal_Int32 nH if (rPath != m_lPaths.end()) return &(rPath->second); - return 0; + return nullptr; // <- SAFE } diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 62f7b1c805f4..14007a6346bd 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -53,14 +53,14 @@ struct TTabPageInfo TTabPageInfo() : m_nIndex ( -1 ) , m_bCreated (false) - , m_pPage ( NULL ) + , m_pPage ( nullptr ) , m_lProperties ( ) {} TTabPageInfo(::sal_Int32 nID) : m_nIndex ( nID ) , m_bCreated (false) - , m_pPage ( NULL ) + , m_pPage ( nullptr ) , m_lProperties ( ) {} @@ -203,7 +203,7 @@ TabWindowService::TabWindowService() // Init member , m_xTabWin ( ) - , m_pTabWin ( NULL ) + , m_pTabWin ( nullptr ) , m_lTabPageInfos ( ) , m_lListener ( m_aMutex ) , m_nPageIndexCounter ( 1 ) @@ -429,7 +429,7 @@ IMPL_LINK_TYPED( TabWindowService, EventListener, VclWindowEvent&, rEvent, void m_lListener.disposeAndClear (aEvent); m_pTabWin->RemoveEventListener( LINK( this, TabWindowService, EventListener ) ); - m_pTabWin = NULL; + m_pTabWin = nullptr; m_xTabWin.clear(); return; @@ -508,7 +508,7 @@ TTabPageInfoHash::iterator TabWindowService::impl_getTabPageInfo(::sal_Int32 nID // TabWindowService FwkTabWindow* TabWindowService::mem_TabWin () { - FwkTabWindow* pWin = NULL; + FwkTabWindow* pWin = nullptr; if ( ! m_xTabWin.is ()) { diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index cd541f0e17d8..74172fe1d74b 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -144,7 +144,7 @@ TabControl* TabWindow::impl_GetTabControl( const css::uno::Reference< css::awt:: if ( pWindow ) return static_cast<TabControl *>(pWindow); else - return NULL; + return nullptr; } void TabWindow::impl_SetTitle( const OUString& rTitle ) @@ -163,7 +163,7 @@ void TabWindow::implts_SendNotification( Notification eNotify, sal_Int32 ID ) co { ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<css::awt::XTabListener>::get()); - if (pContainer!=NULL) + if (pContainer!=nullptr) { ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); while (pIterator.hasMoreElements()) @@ -200,7 +200,7 @@ void TabWindow::implts_SendNotification( Notification eNotify, sal_Int32 ID, con { ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<css::awt::XTabListener>::get()); - if (pContainer!=NULL) + if (pContainer!=nullptr) { ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); while (pIterator.hasMoreElements()) @@ -846,15 +846,15 @@ void SAL_CALL TabWindow::getFastPropertyValue( css::uno::Any& aValue , // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfoHelper is NULL - for the second call pInfoHelper is different from NULL! - static ::cppu::OPropertyArrayHelper* pInfoHelper = NULL; + static ::cppu::OPropertyArrayHelper* pInfoHelper = nullptr; - if( pInfoHelper == NULL ) + if( pInfoHelper == nullptr ) { // Ready for multithreading osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ); // Control this pointer again, another instance can be faster then these! - if( pInfoHelper == NULL ) + if( pInfoHelper == nullptr ) { // Define static member to give structure of properties to baseclass "OPropertySetHelper". // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. @@ -873,14 +873,14 @@ throw ( css::uno::RuntimeException, std::exception ) // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! // For the first call; pInfo is NULL - for the second call pInfo is different from NULL! - static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = NULL; + static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = nullptr; - if( pInfo == NULL ) + if( pInfo == nullptr ) { // Ready for multithreading osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ); // Control this pointer again, another instance can be faster then these! - if( pInfo == NULL ) + if( pInfo == nullptr ) { // Create structure of propertysetinfo for baseclass "OPropertySetHelper". // (Use method "getInfoHelper()".) diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index b13a66edca5a..e9076b042e97 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -257,7 +257,7 @@ bool GlobalSettings_Access::impl_initConfigAccess() // global class struct mutexGlobalSettings : public rtl::Static< osl::Mutex, mutexGlobalSettings > {}; -static GlobalSettings_Access* pStaticSettings = 0; +static GlobalSettings_Access* pStaticSettings = nullptr; static GlobalSettings_Access* GetGlobalSettings( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) { diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index d2117ae625bb..94fb2ed7fbad 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -87,7 +87,7 @@ static const char* BITMAP_FILE_NAMES[] = namespace framework { - static GlobalImageList* pGlobalImageList = 0; + static GlobalImageList* pGlobalImageList = nullptr; static const char* ImageType_Prefixes[ImageType_COUNT] = { "cmd/sc_", @@ -111,7 +111,7 @@ static GlobalImageList* getGlobalImageList( const uno::Reference< uno::XComponen { osl::MutexGuard guard( getGlobalImageListMutex() ); - if ( pGlobalImageList == 0 ) + if ( pGlobalImageList == nullptr ) pGlobalImageList = new GlobalImageList( rxContext ); return pGlobalImageList; @@ -153,7 +153,7 @@ CmdImageList::CmdImageList( const uno::Reference< uno::XComponentContext >& rxCo m_sIconTheme( SvtMiscOptions().GetIconTheme() ) { for ( sal_Int32 n=0; n < ImageType_COUNT; n++ ) - m_pImageList[n] = 0; + m_pImageList[n] = nullptr; } CmdImageList::~CmdImageList() @@ -261,7 +261,7 @@ ImageList* CmdImageList::impl_getImageList( sal_Int16 nImageType ) { m_sIconTheme = rIconTheme; for ( sal_Int32 n=0; n < ImageType_COUNT; n++ ) - delete m_pImageList[n], m_pImageList[n] = NULL; + delete m_pImageList[n], m_pImageList[n] = nullptr; } if ( !m_pImageList[nImageType] ) @@ -312,7 +312,7 @@ GlobalImageList::~GlobalImageList() { osl::MutexGuard guard( getGlobalImageListMutex() ); // remove global pointer as we destroy the object now - pGlobalImageList = 0; + pGlobalImageList = nullptr; } Image GlobalImageList::getImageFromCommandURL( sal_Int16 nImageType, const OUString& rCommandURL ) @@ -437,7 +437,7 @@ bool ImageManagerImpl::implts_loadUserImages( ImagesConfiguration::LoadImages( m_xContext, xInputStream, aUserImageListInfo ); - if (( aUserImageListInfo.pImageList != 0 ) && + if (( aUserImageListInfo.pImageList != nullptr ) && ( !aUserImageListInfo.pImageList->empty() )) { ImageListItemDescriptor* pList = &aUserImageListInfo.pImageList->front(); @@ -622,7 +622,7 @@ CmdImageList* ImageManagerImpl::implts_getDefaultImageList() ImageManagerImpl::ImageManagerImpl( const uno::Reference< uno::XComponentContext >& rxContext,::cppu::OWeakObject* pOwner,bool _bUseGlobal ) : m_xContext( rxContext ) , m_pOwner(pOwner) - , m_pDefaultImageList( 0 ) + , m_pDefaultImageList( nullptr ) , m_aXMLPostfix( ".xml" ) , m_aResourceString( ModuleImageList ) , m_aListenerContainer( m_mutex ) @@ -635,7 +635,7 @@ ImageManagerImpl::ImageManagerImpl( const uno::Reference< uno::XComponentContext { for ( sal_Int32 n=0; n < ImageType_COUNT; n++ ) { - m_pUserImageList[n] = 0; + m_pUserImageList[n] = nullptr; m_bUserImageListModified[n] = false; } } @@ -664,10 +664,10 @@ void ImageManagerImpl::dispose() for ( sal_Int32 n=0; n < ImageType_COUNT; n++ ) { delete m_pUserImageList[n]; - m_pUserImageList[n] = 0; + m_pUserImageList[n] = nullptr; } delete m_pDefaultImageList; - m_pDefaultImageList = 0; + m_pDefaultImageList = nullptr; } } @@ -861,7 +861,7 @@ throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ) sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType ); rtl::Reference< GlobalImageList > rGlobalImageList; - CmdImageList* pDefaultImageList = NULL; + CmdImageList* pDefaultImageList = nullptr; if ( m_bUseGlobal ) { rGlobalImageList = implts_getGlobalImageList(); @@ -898,8 +898,8 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { - CmdToXGraphicNameAccess* pInsertedImages( 0 ); - CmdToXGraphicNameAccess* pReplacedImages( 0 ); + CmdToXGraphicNameAccess* pInsertedImages( nullptr ); + CmdToXGraphicNameAccess* pReplacedImages( nullptr ); { SolarMutexGuard g; @@ -942,7 +942,7 @@ throw (css::lang::IllegalArgumentException, } } - if (( pInsertedImages != 0 ) || ( pReplacedImages != 0 )) + if (( pInsertedImages != nullptr ) || ( pReplacedImages != nullptr )) { m_bModified = true; m_bUserImageListModified[nIndex] = true; @@ -951,7 +951,7 @@ throw (css::lang::IllegalArgumentException, uno::Reference< uno::XInterface > xOwner(static_cast< OWeakObject* >(m_pOwner)); // Notify listeners - if ( pInsertedImages != 0 ) + if ( pInsertedImages != nullptr ) { ConfigurationEvent aInsertEvent; aInsertEvent.aInfo <<= nImageType; @@ -962,7 +962,7 @@ throw (css::lang::IllegalArgumentException, static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY )); implts_notifyContainerListener( aInsertEvent, NotifyOp_Insert ); } - if ( pReplacedImages != 0 ) + if ( pReplacedImages != nullptr ) { ConfigurationEvent aReplaceEvent; aReplaceEvent.aInfo <<= nImageType; @@ -981,8 +981,8 @@ throw ( css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException) { - CmdToXGraphicNameAccess* pRemovedImages( 0 ); - CmdToXGraphicNameAccess* pReplacedImages( 0 ); + CmdToXGraphicNameAccess* pRemovedImages( nullptr ); + CmdToXGraphicNameAccess* pReplacedImages( nullptr ); { SolarMutexGuard g; @@ -999,7 +999,7 @@ throw ( css::lang::IllegalArgumentException, sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType ); rtl::Reference< GlobalImageList > rGlobalImageList; - CmdImageList* pDefaultImageList = NULL; + CmdImageList* pDefaultImageList = nullptr; if ( m_bUseGlobal ) { rGlobalImageList = implts_getGlobalImageList(); @@ -1046,7 +1046,7 @@ throw ( css::lang::IllegalArgumentException, } } - if (( pReplacedImages != 0 ) || ( pRemovedImages != 0 )) + if (( pReplacedImages != nullptr ) || ( pRemovedImages != nullptr )) { m_bModified = true; m_bUserImageListModified[nIndex] = true; @@ -1055,7 +1055,7 @@ throw ( css::lang::IllegalArgumentException, // Notify listeners uno::Reference< uno::XInterface > xOwner(static_cast< OWeakObject* >(m_pOwner)); - if ( pRemovedImages != 0 ) + if ( pRemovedImages != nullptr ) { ConfigurationEvent aRemoveEvent; aRemoveEvent.aInfo = uno::makeAny( nImageType ); @@ -1066,7 +1066,7 @@ throw ( css::lang::IllegalArgumentException, static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY )); implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove ); } - if ( pReplacedImages != 0 ) + if ( pReplacedImages != nullptr ) { ConfigurationEvent aReplaceEvent; aReplaceEvent.aInfo = uno::makeAny( nImageType ); @@ -1124,9 +1124,9 @@ void ImageManagerImpl::reload() pImageList = implts_getUserImageList( (ImageType)i ); pImageList->GetImageNames( aNewUserCmdImageSet ); - CmdToXGraphicNameAccess* pInsertedImages( 0 ); - CmdToXGraphicNameAccess* pReplacedImages( 0 ); - CmdToXGraphicNameAccess* pRemovedImages( 0 ); + CmdToXGraphicNameAccess* pInsertedImages( nullptr ); + CmdToXGraphicNameAccess* pReplacedImages( nullptr ); + CmdToXGraphicNameAccess* pRemovedImages( nullptr ); const sal_uInt32 nNewCount = aNewUserCmdImageSet.size(); for ( j = 0; j < nNewCount; j++ ) @@ -1153,7 +1153,7 @@ void ImageManagerImpl::reload() // through this reload operation. // We have to search the module and global image list! rtl::Reference< GlobalImageList > rGlobalImageList; - CmdImageList* pDefaultImageList = NULL; + CmdImageList* pDefaultImageList = nullptr; if ( m_bUseGlobal ) { rGlobalImageList = implts_getGlobalImageList(); @@ -1201,7 +1201,7 @@ void ImageManagerImpl::reload() // Now notify our listeners. Unlock mutex to prevent deadlocks uno::Reference< uno::XInterface > xOwner(static_cast< OWeakObject* >(m_pOwner)); - if ( pInsertedImages != 0 ) + if ( pInsertedImages != nullptr ) { ConfigurationEvent aInsertEvent; aInsertEvent.aInfo = uno::makeAny( i ); @@ -1212,7 +1212,7 @@ void ImageManagerImpl::reload() static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY )); implts_notifyContainerListener( aInsertEvent, NotifyOp_Insert ); } - if ( pReplacedImages != 0 ) + if ( pReplacedImages != nullptr ) { ConfigurationEvent aReplaceEvent; aReplaceEvent.aInfo = uno::makeAny( i ); @@ -1224,7 +1224,7 @@ void ImageManagerImpl::reload() static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY )); implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace ); } - if ( pRemovedImages != 0 ) + if ( pRemovedImages != nullptr ) { ConfigurationEvent aRemoveEvent; aRemoveEvent.aInfo = uno::makeAny( i ); @@ -1348,7 +1348,7 @@ void ImageManagerImpl::implts_notifyContainerListener( const ConfigurationEvent& { ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<css::ui::XUIConfigurationListener>::get()); - if ( pContainer != NULL ) + if ( pContainer != nullptr ) { ::cppu::OInterfaceIteratorHelper pIterator( *pContainer ); while ( pIterator.hasMoreElements() ) @@ -1382,7 +1382,7 @@ void ImageManagerImpl::clear() for ( sal_Int32 n = 0; n < ImageType_COUNT; n++ ) { delete m_pUserImageList[n]; - m_pUserImageList[n] = 0; + m_pUserImageList[n] = nullptr; } } } // namespace framework diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index fc1134452fd7..48e1845a5d65 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -539,7 +539,7 @@ ModuleUIConfigurationManager::UIElementData* ModuleUIConfigurationManager::impl } // Nothing has been found! - return NULL; + return nullptr; } void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorage > xStorage, UIElementType& rElementType, bool bResetModifyState ) @@ -849,8 +849,8 @@ void ModuleUIConfigurationManager::impl_Initialize() ModuleUIConfigurationManager::ModuleUIConfigurationManager( const Reference< XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& aArguments) - : m_xDefaultConfigStorage( 0 ) - , m_xUserConfigStorage( 0 ) + : m_xDefaultConfigStorage( nullptr ) + , m_xUserConfigStorage( nullptr ) , m_bReadOnly( true ) , m_bModified( false ) , m_bConfigRead( false ) @@ -862,7 +862,7 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager( , m_aListenerContainer( m_mutex ) { for ( int i = 0; i < css::ui::UIElementType::COUNT; i++ ) - m_pStorageHandler[i] = 0; + m_pStorageHandler[i] = nullptr; // Make sure we have a default initialized entry for every layer and user interface element type! // The following code depends on this! @@ -1687,7 +1687,7 @@ sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly() throw (css::uno::Ru void ModuleUIConfigurationManager::implts_notifyContainerListener( const ui::ConfigurationEvent& aEvent, NotifyOp eOp ) { ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<css::ui::XUIConfigurationListener>::get()); - if ( pContainer != NULL ) + if ( pContainer != nullptr ) { ::cppu::OInterfaceIteratorHelper pIterator( *pContainer ); while ( pIterator.hasMoreElements() ) diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index cb958b26f900..6232f9c108fd 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -447,7 +447,7 @@ UIConfigurationManager::UIElementData* UIConfigurationManager::impl_findUIElemen } // Nothing has been found! - return NULL; + return nullptr; } void UIConfigurationManager::impl_storeElementTypeData( Reference< XStorage >& xStorage, UIElementType& rElementType, bool bResetModifyState ) @@ -683,7 +683,7 @@ void UIConfigurationManager::impl_Initialize() } UIConfigurationManager::UIConfigurationManager( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) : - m_xDocConfigStorage( 0 ) + m_xDocConfigStorage( nullptr ) , m_bReadOnly( true ) , m_bModified( false ) , m_bConfigRead( false ) @@ -1388,7 +1388,7 @@ sal_Bool SAL_CALL UIConfigurationManager::isReadOnly() throw (css::uno::RuntimeE void UIConfigurationManager::implts_notifyContainerListener( const ConfigurationEvent& aEvent, NotifyOp eOp ) { ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( cppu::UnoType<css::ui::XUIConfigurationListener>::get()); - if ( pContainer != NULL ) + if ( pContainer != nullptr ) { ::cppu::OInterfaceIteratorHelper pIterator( *pContainer ); while ( pIterator.hasMoreElements() ) diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index 31bc9b123449..fcf5eb32a399 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -96,7 +96,7 @@ static const char* CONFIGURATION_PROPERTIES[] = WINDOWSTATE_PROPERTY_STYLE, WINDOWSTATE_PROPERTY_DOCKPOS, WINDOWSTATE_PROPERTY_DOCKSIZE, - 0 + nullptr }; // Configuration access class for WindowState supplier implementation diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index ead89e761b90..6334060ae512 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -149,7 +149,7 @@ void SAL_CALL AddonsToolBarManager::dispose() throw( RuntimeException, std::exce { AddonsParams* pRuntimeItemData = static_cast<AddonsParams*>(m_pToolBar->GetItemData( nId )); delete pRuntimeItemData; - m_pToolBar->SetItemData( nId, NULL ); + m_pToolBar->SetItemData( nId, nullptr ); } } } @@ -306,7 +306,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue } else { - ::cppu::OWeakObject* pController = 0; + ::cppu::OWeakObject* pController = nullptr; pController = ToolBarMerger::CreateController( m_xContext, m_xFrame, m_pToolBar, aURL, nId, nWidth, aControlType ); xController.set( pController, UNO_QUERY ); diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index 793a521b3bd1..5ce44fd4ad6a 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -105,8 +105,8 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument if ( xFrame.is() && m_aConfigData.getLength() > 0 ) { // Create VCL based toolbar which will be filled with settings data - ToolBox* pToolBar = 0; - AddonsToolBarManager* pToolBarManager = 0; + ToolBox* pToolBar = nullptr; + AddonsToolBarManager* pToolBarManager = nullptr; { SolarMutexGuard aSolarMutexGuard; vcl::Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index b4748579a86a..808fddad43e8 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -82,7 +82,7 @@ ComboBoxControl::~ComboBoxControl() void ComboBoxControl::dispose() { - m_pComboboxToolbarController = 0; + m_pComboboxToolbarController = nullptr; ComboBox::dispose(); } @@ -147,7 +147,7 @@ ComboboxToolbarController::ComboboxToolbarController( sal_Int32 nWidth, const OUString& aCommand ) : ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ) - , m_pComboBox( 0 ) + , m_pComboBox( nullptr ) { m_pComboBox = VclPtr<ComboBoxControl>::Create( m_pToolbar, WB_DROPDOWN, this ); if ( nWidth == 0 ) @@ -170,7 +170,7 @@ throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; - m_pToolbar->SetItemWindow( m_nID, 0 ); + m_pToolbar->SetItemWindow( m_nID, nullptr ); m_pComboBox.disposeAndClear(); ComplexToolbarController::dispose(); diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 4f3d6ea602d0..7fb4d97720bb 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -72,7 +72,7 @@ throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; - m_pToolbar->SetItemWindow( m_nID, 0 ); + m_pToolbar->SetItemWindow( m_nID, nullptr ); svt::ToolboxController::dispose(); m_xURLTransformer.clear(); @@ -124,7 +124,7 @@ throw ( RuntimeException, std::exception ) pExecuteInfo->xDispatch = xDispatch; pExecuteInfo->aTargetURL = aTargetURL; pExecuteInfo->aArgs = aArgs; - Application::PostUserEvent( LINK(0, ComplexToolbarController , ExecuteHdl_Impl), pExecuteInfo ); + Application::PostUserEvent( LINK(nullptr, ComplexToolbarController , ExecuteHdl_Impl), pExecuteInfo ); } } @@ -260,7 +260,7 @@ void ComplexToolbarController::addNotifyInfo( aInfoSeq[nCount].Value = uno::makeAny( getFrameInterface() ); pNotifyInfo->aInfoSeq = aInfoSeq; - Application::PostUserEvent( LINK(0, ComplexToolbarController, Notify_Impl), pNotifyInfo ); + Application::PostUserEvent( LINK(nullptr, ComplexToolbarController, Notify_Impl), pNotifyInfo ); } } diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 9f2970a97291..dc9c604a2ad6 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -242,7 +242,7 @@ private: ControlMenuController::ControlMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : svt::PopupMenuControllerBase( xContext ), - m_pResPopupMenu( 0 ) + m_pResPopupMenu( nullptr ) { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); m_bShowMenuImages = rSettings.GetUseImagesInMenus(); @@ -278,7 +278,7 @@ void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) void ControlMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu ) { VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pVCLPopupMenu = 0; + PopupMenu* pVCLPopupMenu = nullptr; SolarMutexGuard aSolarMutexGuard; @@ -320,7 +320,7 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve } } - VCLXPopupMenu* pPopupMenu = NULL; + VCLXPopupMenu* pPopupMenu = nullptr; if ( nMenuId ) pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( m_xPopupMenu )); @@ -391,7 +391,7 @@ void SAL_CALL ControlMenuController::itemActivated( const css::awt::MenuEvent& ) // XPopupMenuController void ControlMenuController::impl_setPopupMenu() { - if ( m_pResPopupMenu == 0 ) + if ( m_pResPopupMenu == nullptr ) { std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag())); if ( pResMgr ) diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 72adca5533a3..2dd8223f774c 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -79,7 +79,7 @@ ListBoxControl::~ListBoxControl() void ListBoxControl::dispose() { - m_pListBoxListener = 0; + m_pListBoxListener = nullptr; ListBox::dispose(); } @@ -130,7 +130,7 @@ DropdownToolbarController::DropdownToolbarController( sal_Int32 nWidth, const OUString& aCommand ) : ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ) - , m_pListBoxControl( 0 ) + , m_pListBoxControl( nullptr ) { m_pListBoxControl = VclPtr<ListBoxControl>::Create( m_pToolbar, WB_DROPDOWN|WB_AUTOHSCROLL|WB_BORDER, this ); if ( nWidth == 0 ) @@ -154,7 +154,7 @@ throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; - m_pToolbar->SetItemWindow( m_nID, 0 ); + m_pToolbar->SetItemWindow( m_nID, nullptr ); m_pListBoxControl.disposeAndClear(); ComplexToolbarController::dispose(); diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index b0134c4a2ca9..0ffc7455826e 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -78,7 +78,7 @@ EditControl::~EditControl() void EditControl::dispose() { - m_pEditToolbarController = 0; + m_pEditToolbarController = nullptr; Edit::dispose(); } @@ -129,7 +129,7 @@ EditToolbarController::EditToolbarController( sal_Int32 nWidth, const OUString& aCommand ) : ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ) - , m_pEditControl( 0 ) + , m_pEditControl( nullptr ) { m_pEditControl = VclPtr<EditControl>::Create( m_pToolbar, WB_BORDER, this ); if ( nWidth == 0 ) @@ -151,7 +151,7 @@ throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; - m_pToolbar->SetItemWindow( m_nID, 0 ); + m_pToolbar->SetItemWindow( m_nID, nullptr ); m_pEditControl.disposeAndClear(); ComplexToolbarController::dispose(); diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 6e529b734e88..6ef837dddb62 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -76,7 +76,7 @@ void FontMenuController::fillPopupMenu( const Sequence< OUString >& rFontNameSeq { const OUString* pFontNameArray = rFontNameSeq.getConstArray(); VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pVCLPopupMenu = 0; + PopupMenu* pVCLPopupMenu = nullptr; SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 4f7d60eb67b7..7bbfc048d864 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -60,7 +60,7 @@ DEFINE_INIT_SERVICE ( FontSizeMenuController, {} ) FontSizeMenuController::FontSizeMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : svt::PopupMenuControllerBase( xContext ), - m_pHeightArray( 0 ) + m_pHeightArray( nullptr ) { } @@ -126,7 +126,7 @@ void FontSizeMenuController::setCurHeight( long nHeight, Reference< css::awt::XP void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu ) { VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pVCLPopupMenu = 0; + PopupMenu* pVCLPopupMenu = nullptr; resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx index bbdb74e78357..7432e8c4da65 100644 --- a/framework/source/uielement/genericstatusbarcontroller.cxx +++ b/framework/source/uielement/genericstatusbarcontroller.cxx @@ -75,7 +75,7 @@ throw ( RuntimeException, std::exception ) svt::StatusbarController::dispose(); SolarMutexGuard aGuard; - m_pItemData = NULL; + m_pItemData = nullptr; m_xGraphic.clear(); m_xStatusbarItem.clear(); diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index cfb1f8c68634..0f93f62e5fa9 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -172,7 +172,7 @@ throw ( RuntimeException, std::exception ) pExecuteInfo->xDispatch = xDispatch; pExecuteInfo->aTargetURL = aTargetURL; pExecuteInfo->aArgs = aArgs; - Application::PostUserEvent( LINK(0, GenericToolbarController , ExecuteHdl_Impl), pExecuteInfo ); + Application::PostUserEvent( LINK(nullptr, GenericToolbarController , ExecuteHdl_Impl), pExecuteInfo ); } } @@ -297,7 +297,7 @@ MenuToolbarController::MenuToolbarController( const Reference< XComponentContext const Reference< XIndexAccess >& xMenuDesc ) : GenericToolbarController( rxContext, rFrame, pToolBar, nID, aCommand ), m_xMenuDesc( xMenuDesc ), - pMenu( NULL ), + pMenu( nullptr ), m_aModuleIdentifier( aModuleIdentifier ) { } @@ -313,7 +313,7 @@ MenuToolbarController::~MenuToolbarController() if ( pMenu ) { delete pMenu; - pMenu = NULL; + pMenu = nullptr; } } @@ -357,14 +357,14 @@ MenuToolbarController::createPopupWindow() throw (css::uno::RuntimeException, st } if ( !pMenu || !m_pToolbar ) - return NULL; + return nullptr; OSL_ENSURE ( pMenu->GetItemCount(), "Empty PopupMenu!" ); ::Rectangle aRect( m_pToolbar->GetItemRect( m_nID ) ); pMenu->Execute( m_pToolbar, aRect, PopupMenuFlags::ExecuteDown ); - return NULL; + return nullptr; } } // namespace diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 9e170df97dea..7a10e8572f43 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -75,7 +75,7 @@ HeaderMenuController::~HeaderMenuController() void HeaderMenuController::fillPopupMenu( const Reference< css::frame::XModel >& rModel, Reference< css::awt::XPopupMenu >& rPopupMenu ) { VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pVCLPopupMenu = 0; + PopupMenu* pVCLPopupMenu = nullptr; SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 034c985b245e..a9c2a2239d6b 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -159,7 +159,7 @@ void LanguageSelectionMenuController::impl_setPopupMenu() void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu , const Mode eMode ) { VCLXPopupMenu* pVCLPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pPopupMenu = 0; + PopupMenu* pPopupMenu = nullptr; SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 4dc434ca5235..588675399e57 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -72,7 +72,7 @@ MacrosMenuController::~MacrosMenuController() void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu ) { VCLXPopupMenu* pVCLPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pPopupMenu = 0; + PopupMenu* pPopupMenu = nullptr; SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 5c46e755428f..2c0db7b83eea 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -264,7 +264,7 @@ void MenuBarManager::Destroy() if ( m_bDeleteMenu ) { delete m_pVCLMenu; - m_pVCLMenu = 0; + m_pVCLMenu = nullptr; } } } @@ -512,7 +512,7 @@ MenuBarManager::MenuItemHandler* MenuBarManager::GetMenuItemHandler( sal_uInt16 return pItemHandler; } - return 0; + return nullptr; } // Helper to set request images flag @@ -561,7 +561,7 @@ void MenuBarManager::RemoveListener() { { // Remove popup menu from menu structure - m_pVCLMenu->SetPopupMenu( pItemHandler->nItemId, 0 ); + m_pVCLMenu->SetPopupMenu( pItemHandler->nItemId, nullptr ); } Reference< css::lang::XEventListener > xEventListener( pItemHandler->xPopupMenuController, UNO_QUERY ); @@ -610,12 +610,12 @@ void MenuBarManager::RemoveListener() { } - m_xFrame = 0; + m_xFrame = nullptr; } void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( RuntimeException, std::exception ) { - MenuItemHandler* pMenuItemDisposing = NULL; + MenuItemHandler* pMenuItemDisposing = nullptr; SolarMutexGuard g; @@ -656,7 +656,7 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run { // Remove popup menu from menu structure as we release our reference to // the controller. - m_pVCLMenu->SetPopupMenu( pMenuItemDisposing->nItemId, 0 ); + m_pVCLMenu->SetPopupMenu( pMenuItemDisposing->nItemId, nullptr ); } pMenuItemDisposing->xPopupMenuController.clear(); @@ -819,7 +819,7 @@ IMPL_LINK_TYPED( MenuBarManager, Activate, Menu *, pMenu, bool ) vcl::KeyCode aKeyCode( KEY_F1 ); pMenu->SetAccelKey( pMenuItemHandler->nItemId, aKeyCode ); } - else if ( pMenu->GetPopupMenu( pMenuItemHandler->nItemId ) == 0 ) + else if ( pMenu->GetPopupMenu( pMenuItemHandler->nItemId ) == nullptr ) pMenu->SetAccelKey( pMenuItemHandler->nItemId, pMenuItemHandler->aKeyCode ); } } @@ -1387,7 +1387,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF vcl::KeyCode aKeyCode( KEY_F1 ); pMenu->SetAccelKey( pMenuItemHandler->nItemId, aKeyCode ); } - else if ( pMenu->GetPopupMenu( pMenuItemHandler->nItemId ) == 0 ) + else if ( pMenu->GetPopupMenu( pMenuItemHandler->nItemId ) == nullptr ) pMenu->SetAccelKey( pMenuItemHandler->nItemId, pMenuItemHandler->aKeyCode ); } } diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index bc9acf4bec67..1a95812a87fa 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -86,7 +86,7 @@ ReferencePathInfo MenuBarMerger::FindReferencePath( ReferencePathInfo aResult; if ( !nCount ) { - aResult.pPopupMenu = NULL; + aResult.pPopupMenu = nullptr; aResult.nPos = 0; aResult.nLevel = -1; aResult.eResult = RP_MENUITEM_NOT_FOUND; @@ -119,7 +119,7 @@ ReferencePathInfo MenuBarMerger::FindReferencePath( { sal_uInt16 nItemId = pCurrMenu->GetItemId( nTmpPos ); Menu* pTmpMenu = pCurrMenu->GetPopupMenu( nItemId ); - if ( pTmpMenu != 0 ) + if ( pTmpMenu != nullptr ) pCurrMenu = pTmpMenu; else { diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index 71c21ba786c0..b1f63fba368f 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -125,8 +125,8 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th if ( xFrame.is() && m_xConfigSource.is() ) { // Create VCL menubar which will be filled with settings data - MenuBar* pVCLMenuBar = 0; - VCLXMenuBar* pAwtMenuBar = 0; + MenuBar* pVCLMenuBar = nullptr; + VCLXMenuBar* pAwtMenuBar = nullptr; { SolarMutexGuard aSolarMutexGuard; pVCLMenuBar = new MenuBar(); diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 9ffa365c32f5..9029ccc49449 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -314,7 +314,7 @@ NewMenuController::~NewMenuController() void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu ) { VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pVCLPopupMenu = 0; + PopupMenu* pVCLPopupMenu = nullptr; SolarMutexGuard aSolarMutexGuard; @@ -434,7 +434,7 @@ void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent pNewDocument->xDispatch = xDispatch; pNewDocument->aTargetURL = aTargetURL; pNewDocument->aArgSeq = aArgsList; - Application::PostUserEvent( LINK(0, NewMenuController, ExecuteHdl_Impl), pNewDocument ); + Application::PostUserEvent( LINK(nullptr, NewMenuController, ExecuteHdl_Impl), pNewDocument ); } } diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index a73d61183891..ddc90894d3af 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -106,7 +106,7 @@ void ObjectMenuController::fillPopupMenu( const Sequence< css::embed::VerbDescri { const css::embed::VerbDescriptor* pVerbCommandArray = rVerbCommandSeq.getConstArray(); VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pVCLPopupMenu = 0; + PopupMenu* pVCLPopupMenu = nullptr; SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 767fa812e06a..7b36967650b8 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -431,13 +431,13 @@ throw ( css::uno::RuntimeException, std::exception ) if ( m_xPopupMenu.is() ) { // TODO investigate how to wrap Get/SetUserValue in css::awt::XMenu - MenuAttributes* pMenuAttributes( 0 ); + MenuAttributes* pMenuAttributes( nullptr ); VCLXPopupMenu* pTkPopupMenu = static_cast<VCLXPopupMenu *>( VCLXMenu::GetImplementation( m_xPopupMenu ) ); SolarMutexGuard aSolarMutexGuard; PopupMenu* pVCLPopupMenu = pTkPopupMenu ? - dynamic_cast< PopupMenu * >( pTkPopupMenu->GetMenu() ) : NULL; + dynamic_cast< PopupMenu * >( pTkPopupMenu->GetMenu() ) : nullptr; if ( pVCLPopupMenu ) pMenuAttributes = reinterpret_cast< MenuAttributes* >( diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 33e3efea200c..a86995d903ff 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -144,7 +144,7 @@ RecentFilesMenuController::~RecentFilesMenuController() void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu ) { VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pVCLPopupMenu = 0; + PopupMenu* pVCLPopupMenu = nullptr; SolarMutexGuard aSolarMutexGuard; @@ -317,7 +317,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex ) pLoadRecentFile->aTargetURL = aTargetURL; pLoadRecentFile->aArgSeq = aArgsList; - Application::PostUserEvent( LINK(0, RecentFilesMenuController, ExecuteHdl_Impl), pLoadRecentFile ); + Application::PostUserEvent( LINK(nullptr, RecentFilesMenuController, ExecuteHdl_Impl), pLoadRecentFile ); } } diff --git a/framework/source/uielement/saveasmenucontroller.cxx b/framework/source/uielement/saveasmenucontroller.cxx index 77e3f0267473..fe6aeb67b8c0 100644 --- a/framework/source/uielement/saveasmenucontroller.cxx +++ b/framework/source/uielement/saveasmenucontroller.cxx @@ -103,7 +103,7 @@ SaveAsMenuController::~SaveAsMenuController() void SaveAsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu ) { VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pVCLPopupMenu = 0; + PopupMenu* pVCLPopupMenu = nullptr; SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index b44899375fe7..c190d77f9303 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -89,7 +89,7 @@ SpinfieldControl::~SpinfieldControl() void SpinfieldControl::dispose() { - m_pSpinfieldToolbarController = 0; + m_pSpinfieldToolbarController = nullptr; SpinField::dispose(); } @@ -189,7 +189,7 @@ SpinfieldToolbarController::SpinfieldToolbarController( , m_nMin( 0.0 ) , m_nValue( 0.0 ) , m_nStep( 0.0 ) - , m_pSpinfieldControl( 0 ) + , m_pSpinfieldControl( nullptr ) { m_pSpinfieldControl = VclPtr<SpinfieldControl>::Create( m_pToolbar, WB_SPIN|WB_BORDER, this ); if ( nWidth == 0 ) @@ -211,7 +211,7 @@ throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; - m_pToolbar->SetItemWindow( m_nID, 0 ); + m_pToolbar->SetItemWindow( m_nID, nullptr ); m_pSpinfieldControl.disposeAndClear(); ComplexToolbarController::dispose(); diff --git a/framework/source/uielement/statusbar.cxx b/framework/source/uielement/statusbar.cxx index 2f520ec46d95..7189e6615a57 100644 --- a/framework/source/uielement/statusbar.cxx +++ b/framework/source/uielement/statusbar.cxx @@ -28,7 +28,7 @@ FrameworkStatusBar::FrameworkStatusBar( vcl::Window* pParent, WinBits nWinBits ) : StatusBar( pParent, nWinBits ), - m_pMgr( NULL ) + m_pMgr( nullptr ) { // set optimal size SetOutputSizePixel( CalcWindowSizePixel() ); diff --git a/framework/source/uielement/statusbaritem.cxx b/framework/source/uielement/statusbaritem.cxx index 6b9fde6504e0..22c75144bd14 100644 --- a/framework/source/uielement/statusbaritem.cxx +++ b/framework/source/uielement/statusbaritem.cxx @@ -85,8 +85,8 @@ StatusbarItem::~StatusbarItem() void SAL_CALL StatusbarItem::disposing() { osl::MutexGuard aGuard( m_aMutex ); - m_pItemData = 0; - m_pStatusBar = 0; + m_pItemData = nullptr; + m_pStatusBar = nullptr; } OUString SAL_CALL StatusbarItem::getCommand() diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 3019ebe2a03c..389d1f5d1afc 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -370,7 +370,7 @@ void StatusBarManager::CreateControllers() if ( !xController.is() ) { - svt::StatusbarController* pController( 0 ); + svt::StatusbarController* pController( nullptr ); // 2) Old SFX2 Statusbar controllers pController = CreateStatusBarController( m_xFrame, m_pStatusBar, nId, aCommandURL ); diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 1aab781592a6..7c3b82a6fe60 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -101,8 +101,8 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) if ( xFrame.is() && m_xConfigSource.is() ) { // Create VCL based toolbar which will be filled with settings data - StatusBar* pStatusBar( 0 ); - StatusBarManager* pStatusBarManager( 0 ); + StatusBar* pStatusBar( nullptr ); + StatusBarManager* pStatusBarManager( nullptr ); { SolarMutexGuard aSolarMutexGuard; vcl::Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx index 2df9de37eb81..4588c6a311da 100644 --- a/framework/source/uielement/subtoolbarcontroller.cxx +++ b/framework/source/uielement/subtoolbarcontroller.cxx @@ -109,7 +109,7 @@ SubToolBarController::SubToolBarController( const css::uno::Sequence< css::uno:: SubToolBarController::~SubToolBarController() { disposeUIElement(); - m_xUIElement = 0; + m_xUIElement = nullptr; } void SubToolBarController::disposeUIElement() @@ -129,7 +129,7 @@ void SubToolBarController::statusChanged( const css::frame::FeatureStateEvent& E if ( m_bDisposed ) return; - ToolBox* pToolBox = 0; + ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; if ( getToolboxId( nId, &pToolBox ) ) { @@ -192,7 +192,7 @@ css::uno::Reference< css::awt::XWindow > SubToolBarController::createPopupWindow { SolarMutexGuard aGuard; - ToolBox* pToolBox = 0; + ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; if ( getToolboxId( nId, &pToolBox ) ) { @@ -287,7 +287,7 @@ void SubToolBarController::updateImage() SolarMutexGuard aGuard; if ( !m_aLastCommand.isEmpty() ) { - ToolBox* pToolBox = 0; + ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; if ( getToolboxId( nId, &pToolBox ) ) { @@ -352,7 +352,7 @@ void SubToolBarController::endPopupMode( const css::awt::EndPopupModeEvent& e ) } disposeUIElement(); } - m_xUIElement = 0; + m_xUIElement = nullptr; // if the toolbar was teared-off recreate it and place it at the given position if( e.bTearoff ) @@ -412,7 +412,7 @@ void SubToolBarController::update() { svt::ToolboxController::update(); - ToolBox* pToolBox = 0; + ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; if ( getToolboxId( nId, &pToolBox ) ) { @@ -432,7 +432,7 @@ void SubToolBarController::dispose() svt::ToolboxController::dispose(); disposeUIElement(); - m_xUIElement = 0; + m_xUIElement = nullptr; } OUString SubToolBarController::getImplementationName() diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index cdf6b582ad5a..3847e2d68c70 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -768,7 +768,7 @@ void ToolBarManager::RemoveControllers() { } } - m_pToolBar->SetItemWindow(nItemId, 0); + m_pToolBar->SetItemWindow(nItemId, nullptr); } } m_aControllerMap.clear(); @@ -868,7 +868,7 @@ void ToolBarManager::CreateControllers() CommandToInfoMap::iterator pCommandIter = m_aCommandMap.find( aCommandURL ); sal_Int16 nWidth = ( pCommandIter != m_aCommandMap.end() ? pCommandIter->second.nWidth : 0 ); - svt::ToolboxController* pController( 0 ); + svt::ToolboxController* pController( nullptr ); if ( bHasDisabledEntries ) { @@ -926,7 +926,7 @@ void ToolBarManager::CreateControllers() pController = CreateToolBoxController( m_xFrame, m_pToolBar, nId, aCommandURL ); if ( !pController ) { - if ( m_pToolBar->GetItemData( nId ) != 0 ) + if ( m_pToolBar->GetItemData( nId ) != nullptr ) { // retrieve additional parameters OUString aControlType = static_cast< AddonsParams* >( m_pToolBar->GetItemData( nId ))->aControlType; @@ -1593,7 +1593,7 @@ void ToolBarManager::ImplClearPopupMenu( ToolBox *pToolBar ) { pItemMenu->Clear(); delete pItemMenu; - pItemMenu = NULL; + pItemMenu = nullptr; pMenu->SetPopupMenu( 1, pItemMenu ); } @@ -1678,7 +1678,7 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const xDisp = xProv->queryDispatch( aURL, OUString(), 0 ); if ( !xDisp.is() || IsPluginMode() ) - return 0; + return nullptr; } // popup menu for quick customization @@ -1826,7 +1826,7 @@ IMPL_LINK_TYPED( ToolBarManager, Command, CommandEvent const *, pCmdEvt, void ) //fdo#86820 We may have been disposed and so have a NULL m_pToolBar by //executing a menu entry, e.g. inserting a chart replaces the toolbars - pManagerMenu = m_bDisposed ? NULL : m_pToolBar->GetMenu(); + pManagerMenu = m_bDisposed ? nullptr : m_pToolBar->GetMenu(); if (pManagerMenu) { // Unlink our listeners again -- see above for why. @@ -1897,7 +1897,7 @@ IMPL_LINK_TYPED( ToolBarManager, MenuSelect, Menu*, pMenu, bool ) pExecuteInfo->nCmd = EXEC_CMD_DOCKTOOLBAR; pExecuteInfo->xLayoutManager = getLayoutManagerFromFrame( m_xFrame ); - Application::PostUserEvent( LINK(0, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo ); + Application::PostUserEvent( LINK(nullptr, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo ); break; } @@ -1909,7 +1909,7 @@ IMPL_LINK_TYPED( ToolBarManager, MenuSelect, Menu*, pMenu, bool ) pExecuteInfo->nCmd = EXEC_CMD_DOCKALLTOOLBARS; pExecuteInfo->xLayoutManager = getLayoutManagerFromFrame( m_xFrame ); - Application::PostUserEvent( LINK(0, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo ); + Application::PostUserEvent( LINK(nullptr, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo ); break; } @@ -1937,7 +1937,7 @@ IMPL_LINK_TYPED( ToolBarManager, MenuSelect, Menu*, pMenu, bool ) pExecuteInfo->xLayoutManager = getLayoutManagerFromFrame( m_xFrame ); pExecuteInfo->xWindow = VCLUnoHelper::GetInterface( m_pToolBar ); - Application::PostUserEvent( LINK(0, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo ); + Application::PostUserEvent( LINK(nullptr, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo ); break; } diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index 06a6658e3a97..5810412bb8c8 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -634,7 +634,7 @@ bool ToolBarMerger::RemoveItems( sal_uInt16 nWidth, const OUString& rControlType ) { - ::cppu::OWeakObject* pResult( 0 ); + ::cppu::OWeakObject* pResult( nullptr ); if ( rControlType == TOOLBARCONTROLLER_BUTTON ) pResult = new ButtonToolbarController( rxContext, pToolbar, rCommandURL ); diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index bf9c793f9f30..59ee67b353cf 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -442,7 +442,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r { SolarMutexGuard aGuard; VCLXPopupMenu* pXPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( m_xPopupMenu )); - PopupMenu* pVCLPopupMenu = pXPopupMenu ? static_cast<PopupMenu *>(pXPopupMenu->GetMenu()) : NULL; + PopupMenu* pVCLPopupMenu = pXPopupMenu ? static_cast<PopupMenu *>(pXPopupMenu->GetMenu()) : nullptr; assert(pVCLPopupMenu); if (pVCLPopupMenu) pVCLPopupMenu->SetUserValue( nIndex, sal_uIntPtr( aSortedTbs[i].bContextSensitive ? 1L : 0L )); @@ -551,7 +551,7 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev { SolarMutexGuard aGuard; VCLXPopupMenu* pXPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( xPopupMenu )); - PopupMenu* pVCLPopupMenu = pXPopupMenu ? static_cast<PopupMenu *>(pXPopupMenu->GetMenu()) : NULL; + PopupMenu* pVCLPopupMenu = pXPopupMenu ? static_cast<PopupMenu *>(pXPopupMenu->GetMenu()) : nullptr; SAL_WARN_IF(!pVCLPopupMenu, "framework", "worrying lack of popup menu"); if (!pVCLPopupMenu) @@ -713,7 +713,7 @@ void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& r pExecuteInfo->xDispatch = xDispatch; pExecuteInfo->aTargetURL = aTargetURL; pExecuteInfo->aArgs = aArgs; - Application::PostUserEvent( LINK(0, ToolbarsMenuController, ExecuteHdl_Impl), pExecuteInfo ); + Application::PostUserEvent( LINK(nullptr, ToolbarsMenuController, ExecuteHdl_Impl), pExecuteInfo ); } } else diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index 4789e1c5a823..7b9cbb2d6ba3 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -141,8 +141,8 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th if ( xFrame.is() && m_xConfigSource.is() ) { // Create VCL based toolbar which will be filled with settings data - ToolBox* pToolBar = 0; - ToolBarManager* pToolBarManager = 0; + ToolBox* pToolBar = nullptr; + ToolBarManager* pToolBarManager = nullptr; { SolarMutexGuard aSolarMutexGuard; vcl::Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx index 1cb00a3e06b4..3faa7815574c 100644 --- a/framework/source/uifactory/statusbarfactory.cxx +++ b/framework/source/uifactory/statusbarfactory.cxx @@ -79,7 +79,7 @@ throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentExcept { Reference< css::ui::XUIElement > xStatusBar( static_cast<OWeakObject *>(new StatusBarWrapper(m_xContext)), UNO_QUERY); - MenuBarFactory::CreateUIElement(ResourceURL, Args, NULL, "private:resource/statusbar/", xStatusBar, m_xContext); + MenuBarFactory::CreateUIElement(ResourceURL, Args, nullptr, "private:resource/statusbar/", xStatusBar, m_xContext); return xStatusBar; } diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx index 0b2188ad48e3..4bc329910187 100644 --- a/framework/source/uifactory/uicontrollerfactory.cxx +++ b/framework/source/uifactory/uicontrollerfactory.cxx @@ -93,7 +93,7 @@ void SAL_CALL UIControllerFactory::disposing() { // reduce reference count m_pConfigAccess->release(); - m_pConfigAccess = 0; + m_pConfigAccess = nullptr; } } diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index c65e819b9c22..3f009919cdef 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -416,7 +416,7 @@ void SAL_CALL UIElementFactoryManager::disposing() { // reduce reference count m_pConfigAccess->release(); - m_pConfigAccess = 0; + m_pConfigAccess = nullptr; } } diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index 34af27d673fa..e521ff1d108d 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -106,7 +106,7 @@ void SAL_CALL WindowContentFactoryManager::disposing() { // reduce reference count m_pConfigAccess->release(); - m_pConfigAccess = 0; + m_pConfigAccess = nullptr; } } diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index b838f4888fde..d05bf2b84222 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -100,11 +100,11 @@ ImageXMLEntryProperty ImagesEntries[OReadImagesDocumentHandler::IMG_XML_ENTRY_CO OReadImagesDocumentHandler::OReadImagesDocumentHandler( ImageListsDescriptor& aItems ) : m_aImageList( aItems ), - m_pImages( 0 ), - m_pExternalImages( 0 ) + m_pImages( nullptr ), + m_pExternalImages( nullptr ) { - m_aImageList.pImageList = NULL; - m_aImageList.pExternalImageList = NULL; + m_aImageList.pImageList = nullptr; + m_aImageList.pExternalImageList = nullptr; m_nHashMaskModeBitmap = OUString( ATTRIBUTE_MASKMODE_BITMAP ).hashCode(); m_nHashMaskModeColor = OUString( ATTRIBUTE_MASKMODE_COLOR ).hashCode(); @@ -251,7 +251,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( else { delete m_pImages; - m_pImages = NULL; + m_pImages = nullptr; OUString aErrorMessage = getErrorLineString(); aErrorMessage += "Attribute image:maskmode must be 'maskcolor' or 'maskbitmap'!"; @@ -281,7 +281,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( if ( m_pImages->aURL.isEmpty() ) { delete m_pImages; - m_pImages = NULL; + m_pImages = nullptr; OUString aErrorMessage = getErrorLineString(); aErrorMessage += "Required attribute xlink:href must have a value!"; @@ -296,7 +296,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( if ( !m_bImagesStartFound ) { delete m_pImages; - m_pImages = NULL; + m_pImages = nullptr; OUString aErrorMessage = getErrorLineString(); aErrorMessage += "Element 'image:entry' must be embedded into element 'image:images'!"; @@ -343,7 +343,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( { delete pItem; delete m_pImages; - m_pImages = NULL; + m_pImages = nullptr; OUString aErrorMessage = getErrorLineString(); aErrorMessage += "Required attribute 'image:bitmap-index' must have a value >= 0!"; @@ -355,7 +355,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( { delete pItem; delete m_pImages; - m_pImages = NULL; + m_pImages = nullptr; OUString aErrorMessage = getErrorLineString(); aErrorMessage += "Required attribute 'image:command' must have a value!"; @@ -372,7 +372,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( if ( !m_bImageContainerStartFound ) { delete m_pImages; - m_pImages = NULL; + m_pImages = nullptr; OUString aErrorMessage = getErrorLineString(); aErrorMessage += "Element 'image:externalimages' must be embedded into element 'image:imagecontainer'!"; @@ -383,7 +383,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( if ( m_bExternalImagesStartFound ) { delete m_pImages; - m_pImages = NULL; + m_pImages = nullptr; OUString aErrorMessage = getErrorLineString(); aErrorMessage += "Element 'image:externalimages' cannot be embedded into 'image:externalimages'!"; @@ -402,8 +402,8 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( { delete m_pImages; delete m_pExternalImages; - m_pImages = NULL; - m_pExternalImages = NULL; + m_pImages = nullptr; + m_pExternalImages = nullptr; OUString aErrorMessage = getErrorLineString(); aErrorMessage += "Element 'image:externalentry' must be embedded into 'image:externalimages'!"; @@ -414,8 +414,8 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( { delete m_pImages; delete m_pExternalImages; - m_pImages = NULL; - m_pExternalImages = NULL; + m_pImages = nullptr; + m_pExternalImages = nullptr; OUString aErrorMessage = getErrorLineString(); aErrorMessage += "Element 'image:externalentry' cannot be embedded into 'image:externalentry'!"; @@ -458,8 +458,8 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( delete pItem; delete m_pImages; delete m_pExternalImages; - m_pImages = NULL; - m_pExternalImages = NULL; + m_pImages = nullptr; + m_pExternalImages = nullptr; OUString aErrorMessage = getErrorLineString(); aErrorMessage += "Required attribute 'image:command' must have a value!"; @@ -472,8 +472,8 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( delete pItem; delete m_pImages; delete m_pExternalImages; - m_pImages = NULL; - m_pExternalImages = NULL; + m_pImages = nullptr; + m_pExternalImages = nullptr; OUString aErrorMessage = getErrorLineString(); aErrorMessage += "Required attribute 'xlink:href' must have a value!"; @@ -517,7 +517,7 @@ void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName) { if ( m_aImageList.pImageList ) m_aImageList.pImageList->push_back( m_pImages ); - m_pImages = NULL; + m_pImages = nullptr; } m_bImagesStartFound = false; } @@ -538,7 +538,7 @@ void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName) } m_bExternalImagesStartFound = false; - m_pExternalImages = NULL; + m_pExternalImages = nullptr; } break; |