diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 16:18:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 16:20:34 +0100 |
| commit | d9376e1fc80e322d527e001590b5f1312c7b9477 (patch) | |
| tree | 6faf9af710e59470987f4fc9b5fd172efbd69050 /avmedia/source/quicktime | |
| parent | 551433e7cfc371215bb414aec11c26f8222d5f09 (diff) | |
loplugin:nullptr (automatic rewrite; Mac-specific code)
Change-Id: Ib50c9415e1ddd0e6cabc1b737a39a7d101014da9
Diffstat (limited to 'avmedia/source/quicktime')
| -rw-r--r-- | avmedia/source/quicktime/quicktimeuno.mm | 2 | ||||
| -rw-r--r-- | avmedia/source/quicktime/window.mm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/avmedia/source/quicktime/quicktimeuno.mm b/avmedia/source/quicktime/quicktimeuno.mm index 0ca8370bf847..befff1c9ec4b 100644 --- a/avmedia/source/quicktime/quicktimeuno.mm +++ b/avmedia/source/quicktime/quicktimeuno.mm @@ -34,7 +34,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno: extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediaQuickTime_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) { uno::Reference< lang::XSingleServiceFactory > xFactory; - void* pRet = 0; + void* pRet = nullptr; if( rtl_str_compare( pImplName, AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ) == 0 ) { diff --git a/avmedia/source/quicktime/window.mm b/avmedia/source/quicktime/window.mm index 30e5bfc8cdb2..683610d995ca 100644 --- a/avmedia/source/quicktime/window.mm +++ b/avmedia/source/quicktime/window.mm @@ -31,13 +31,13 @@ namespace avmedia { namespace quicktime { static ::osl::Mutex& ImplGetOwnStaticMutex() { - static ::osl::Mutex* pMutex = NULL; + static ::osl::Mutex* pMutex = nullptr; - if( pMutex == NULL ) + if( pMutex == nullptr ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if( pMutex == NULL ) + if( pMutex == nullptr ) { static ::osl::Mutex aMutex; pMutex = &aMutex; |