diff options
Diffstat (limited to 'framework/source/services/desktop.cxx')
| -rw-r--r-- | framework/source/services/desktop.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
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()".) |