diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:24:17 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:40 +0100 |
| commit | e246e5e3cf2722beb8a633259c0c395b498f58c6 (patch) | |
| tree | a04f4d49e8f762a9ef780aceb20e81894ff185a3 /include/sot | |
| parent | 2ee689b56a8ec09387e1fadcea3097537180e4a7 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I147f1ca886d5194d0e7180c427923225ef4ef927
Diffstat (limited to 'include/sot')
| -rw-r--r-- | include/sot/exchange.hxx | 2 | ||||
| -rw-r--r-- | include/sot/factory.hxx | 4 | ||||
| -rw-r--r-- | include/sot/stg.hxx | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/sot/exchange.hxx b/include/sot/exchange.hxx index 4d9285beeff3..9b63bf3c2139 100644 --- a/include/sot/exchange.hxx +++ b/include/sot/exchange.hxx @@ -150,7 +150,7 @@ public: // In:- optional - check only for this specific format SotClipboardFormatId nOnlyTestFormat = SotClipboardFormatId::NONE, // In:- optional - check the contents of Xtransferable - const css::uno::Reference< css::datatransfer::XTransferable >* pxTransferable = NULL ); + const css::uno::Reference< css::datatransfer::XTransferable >* pxTransferable = nullptr ); static sal_uInt16 IsChart( const SvGlobalName& rName ); static sal_uInt16 IsMath( const SvGlobalName& rName ); diff --git a/include/sot/factory.hxx b/include/sot/factory.hxx index 03bdea2b4d11..0c8d75485151 100644 --- a/include/sot/factory.hxx +++ b/include/sot/factory.hxx @@ -42,8 +42,8 @@ class SOT_DLLPUBLIC SotFactory : public SvGlobalName protected: virtual ~SotFactory(); public: - static void IncSvObjectCount( SotObject * = NULL ); - static void DecSvObjectCount( SotObject * = NULL ); + static void IncSvObjectCount( SotObject * = nullptr ); + static void DecSvObjectCount( SotObject * = nullptr ); #ifdef DBG_UTIL static const SotFactory * Find( const SvGlobalName & ); diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx index 056baf9eac9d..9ce5cddfffb2 100644 --- a/include/sot/stg.hxx +++ b/include/sot/stg.hxx @@ -105,7 +105,7 @@ public: virtual bool Revert() = 0; virtual BaseStorageStream* OpenStream( const OUString & rEleName, StreamMode = STREAM_STD_READWRITE, - bool bDirect = true, const OString* pKey=0 ) = 0; + bool bDirect = true, const OString* pKey=nullptr ) = 0; virtual BaseStorage* OpenStorage( const OUString & rEleName, StreamMode = STREAM_STD_READWRITE, bool bDirect = false ) = 0; @@ -133,7 +133,7 @@ protected: OLEStorageBase( StgIo*, StgDirEntry*, StreamMode& ); ~OLEStorageBase(); bool Validate_Impl( bool=false ) const; - static bool ValidateMode_Impl( StreamMode, StgDirEntry* p = NULL ); + static bool ValidateMode_Impl( StreamMode, StgDirEntry* p = nullptr ); }; class StorageStream : public BaseStorageStream, public OLEStorageBase @@ -195,7 +195,7 @@ public: virtual bool Revert() override; virtual BaseStorageStream* OpenStream( const OUString & rEleName, StreamMode = STREAM_STD_READWRITE, - bool bDirect = true, const OString* pKey=0 ) override; + bool bDirect = true, const OString* pKey=nullptr ) override; virtual BaseStorage* OpenStorage( const OUString & rEleName, StreamMode = STREAM_STD_READWRITE, bool bDirect = false ) override; @@ -300,7 +300,7 @@ public: virtual bool Revert() override; virtual BaseStorageStream* OpenStream( const OUString & rEleName, StreamMode = STREAM_STD_READWRITE, - bool bDirect = true, const OString* pKey=0 ) override; + bool bDirect = true, const OString* pKey=nullptr ) override; virtual BaseStorage* OpenStorage( const OUString & rEleName, StreamMode = STREAM_STD_READWRITE, bool bDirect = false ) override; |