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 /include/avmedia | |
parent | loplugin:nullptr (automatic rewrite) (diff) | |
download | core-8697284d248f47dd4798f7ef49791fc7686f646d.tar.gz core-8697284d248f47dd4798f7ef49791fc7686f646d.zip |
loplugin:nullptr (automatic rewrite)
Change-Id: Ib3f24439ffda42d217300dcc0ca979964ade360a
Diffstat (limited to 'include/avmedia')
-rw-r--r-- | include/avmedia/mediaitem.hxx | 2 | ||||
-rw-r--r-- | include/avmedia/mediaplayer.hxx | 6 | ||||
-rw-r--r-- | include/avmedia/mediawindow.hxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index 2ba3c1d1e25b..de54de2cb078 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -72,7 +72,7 @@ public: virtual ~MediaItem(); virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, diff --git a/include/avmedia/mediaplayer.hxx b/include/avmedia/mediaplayer.hxx index d2a0ce04b9b8..878954325d8c 100644 --- a/include/avmedia/mediaplayer.hxx +++ b/include/avmedia/mediaplayer.hxx @@ -61,14 +61,14 @@ private: inline MediaFloater * getMediaFloater() { SfxViewFrame * cur = SfxViewFrame::Current(); - if (cur != 0) { + if (cur != nullptr) { SfxChildWindow * win = cur->GetChildWindow( MediaPlayer::GetChildWindowId()); - if (win != 0) { + if (win != nullptr) { return static_cast<MediaFloater *>(win->GetWindow()); } } - return 0; + return nullptr; } } diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index 04c72964b48a..14e36b4841d8 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -101,9 +101,9 @@ namespace avmedia static bool executeMediaURLDialog( vcl::Window* pParent, OUString& rURL, bool *const o_pbLink ); static void executeFormatErrorBox( vcl::Window* pParent ); - static bool isMediaURL( const OUString& rURL, const OUString& rReferer, bool bDeep = false, Size* pPreferredSizePixel = NULL ); + static bool isMediaURL( const OUString& rURL, const OUString& rReferer, bool bDeep = false, Size* pPreferredSizePixel = nullptr ); - static css::uno::Reference< css::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType = 0 ); + static css::uno::Reference< css::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType = nullptr ); static css::uno::Reference< css::graphic::XGraphic > grabFrame( const OUString& rURL, const OUString& rReferer, const OUString& sMimeType, double fMediaTime = AVMEDIA_FRAMEGRABBER_DEFAULTFRAME ); |