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 /framework/source/helper | |
parent | 88b5e5fd3a6f0d70caf66568c25a3e47e01c71e2 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: Ie178c474921c1695927a9b01a9972baf09fbb73d
Diffstat (limited to 'framework/source/helper')
-rw-r--r-- | framework/source/helper/oframes.cxx | 4 | ||||
-rw-r--r-- | framework/source/helper/uiconfigelementwrapperbase.cxx | 12 | ||||
-rw-r--r-- | framework/source/helper/uielementwrapperbase.cxx | 12 | ||||
-rw-r--r-- | framework/source/helper/vclstatusindicator.cxx | 2 |
4 files changed, 15 insertions, 15 deletions
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 ) { |