diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:09:59 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:15 +0100 |
commit | 8697284d248f47dd4798f7ef49791fc7686f646d (patch) | |
tree | 3cc7278e7160aa96242b03dcc683f0ff5f235aa7 /avmedia/source/framework | |
parent | cb0fb3edd43194311a76ad6c0d3adad7f6dfe53d (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: Ib3f24439ffda42d217300dcc0ca979964ade360a
Diffstat (limited to 'avmedia/source/framework')
-rw-r--r-- | avmedia/source/framework/mediacontrol.cxx | 4 | ||||
-rw-r--r-- | avmedia/source/framework/mediamisc.cxx | 2 | ||||
-rw-r--r-- | avmedia/source/framework/mediaplayer.cxx | 6 | ||||
-rw-r--r-- | avmedia/source/framework/modeltools.cxx | 2 | ||||
-rw-r--r-- | avmedia/source/framework/soundhandler.cxx | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index d8efcf2a3b03..8d542290fb13 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -200,7 +200,7 @@ MediaControl::~MediaControl() void MediaControl::dispose() { - maZoomToolBox->SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, NULL ); + maZoomToolBox->SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, nullptr ); mpZoomListBox.disposeAndClear(); maTimeEdit.disposeAndClear(); maZoomToolBox.disposeAndClear(); @@ -485,7 +485,7 @@ IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void ) OUString aURL; if (::avmedia::MediaWindow::executeMediaURLDialog( - GetParent(), aURL, 0)) + GetParent(), aURL, nullptr)) { if( !::avmedia::MediaWindow::isMediaURL( aURL, ""/*TODO?*/, true ) ) ::avmedia::MediaWindow::executeFormatErrorBox( this ); diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx index 7fd6a9c61c6f..6733313ed318 100644 --- a/avmedia/source/framework/mediamisc.cxx +++ b/avmedia/source/framework/mediamisc.cxx @@ -28,7 +28,7 @@ namespace avmedia { ResMgr* GetResMgr() { - static ResMgr* pResMgr = NULL; + static ResMgr* pResMgr = nullptr; if( !pResMgr ) { diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index b9c4ad4126c7..c39af428e92e 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -80,7 +80,7 @@ MediaFloater::~MediaFloater() void MediaFloater::dispose() { delete mpMediaWindow; - mpMediaWindow = NULL; + mpMediaWindow = nullptr; SfxDockingWindow::dispose(); } @@ -103,7 +103,7 @@ void MediaFloater::ToggleFloatingMode() if (mpMediaWindow) mpMediaWindow->updateMediaItem( aRestoreItem ); delete mpMediaWindow; - mpMediaWindow = NULL; + mpMediaWindow = nullptr; SfxDockingWindow::ToggleFloatingMode(); @@ -145,7 +145,7 @@ void MediaFloater::dispatchCurrentURL() if( pDispatcher ) { OUString url; - if (mpMediaWindow != 0) { + if (mpMediaWindow != nullptr) { url = mpMediaWindow->getURL(); } const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, url ); diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx index 40d48a2c97ac..4d348c343ac0 100644 --- a/avmedia/source/framework/modeltools.cxx +++ b/avmedia/source/framework/modeltools.cxx @@ -140,7 +140,7 @@ static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed: // Create a temp file with which json parser can work. OUString sTempFileURL; const ::osl::FileBase::RC aErr = - ::osl::FileBase::createTempFile(0, 0, &sTempFileURL); + ::osl::FileBase::createTempFile(nullptr, nullptr, &sTempFileURL); if (::osl::FileBase::E_None != aErr) { SAL_WARN("avmedia.opengl", "Cannot create temp file"); diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index fd78096ec9a1..e0e5133f7232 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -82,13 +82,13 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( cs /* 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 ... */ static ::cppu::OTypeCollection aTypeCollection |