diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:26:16 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:54 +0100 |
commit | 175e2adfd1677cb83373b0ba47853493f3b77859 (patch) | |
tree | 8509fc88a7b4875ece2b50530e35bef17d9d4d29 /include/toolkit | |
parent | a9b4c9ca3df362cbe0f7904003197bcadd607215 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: Ied9204441c07f1f6a6026c8c1a2fa21b93b98e1a
Diffstat (limited to 'include/toolkit')
-rw-r--r-- | include/toolkit/awt/vclxwindows.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/controls/accessiblecontrolcontext.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/controls/unocontrolcontainer.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/helper/macros.hxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index 8de05e041250..de95b539a122 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -936,7 +936,7 @@ private: FormatterBase* mpFormatter; protected: - FormatterBase* GetFormatter() const { return GetWindow() ? mpFormatter : NULL; } + FormatterBase* GetFormatter() const { return GetWindow() ? mpFormatter : nullptr; } public: VCLXFormattedSpinField(); diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx index ed06321c05c7..286be0861491 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/include/toolkit/controls/accessiblecontrolcontext.hxx @@ -117,7 +117,7 @@ namespace toolkit // stops listening at the control model void stopModelListening( ); - VclPtr< vcl::Window > implGetWindow( css::uno::Reference< css::awt::XWindow >* _pxUNOWindow = NULL ) const; + VclPtr< vcl::Window > implGetWindow( css::uno::Reference< css::awt::XWindow >* _pxUNOWindow = nullptr ) const; }; diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx index 4664a38d7620..b08430984fd9 100644 --- a/include/toolkit/controls/unocontrolcontainer.hxx +++ b/include/toolkit/controls/unocontrolcontainer.hxx @@ -136,7 +136,7 @@ private: */ sal_Int32 impl_addControl( const css::uno::Reference< css::awt::XControl >& _rxControl, - const OUString* _pName = NULL + const OUString* _pName = nullptr ); /** removes the given control from the container, including necessary notifications and the like diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index 584129131b0f..e844bd350677 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -47,7 +47,7 @@ IMPL_XUNOTUNNEL_MINIMAL( ClassName ) \ ClassName* ClassName::GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) \ { \ css::uno::Reference< css::lang::XUnoTunnel > xUT( rxIFace, css::uno::UNO_QUERY ); \ - return xUT.is() ? reinterpret_cast<ClassName*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( ClassName::GetUnoTunnelId() ))) : NULL; \ + return xUT.is() ? reinterpret_cast<ClassName*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( ClassName::GetUnoTunnelId() ))) : nullptr; \ } #define IMPL_IMPLEMENTATION_ID( ClassName ) \ @@ -60,7 +60,7 @@ css::uno::Sequence< sal_Int8 > ClassName::getImplementationId() throw(css::uno:: IMPL_IMPLEMENTATION_ID( ClassName ) \ css::uno::Sequence< css::uno::Type > ClassName::getTypes() throw(css::uno::RuntimeException, std::exception) \ { \ - static ::cppu::OTypeCollection* pCollection = NULL; \ + static ::cppu::OTypeCollection* pCollection = nullptr; \ if( !pCollection ) \ { \ ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ); \ |