summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:10:36 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:17 +0100
commit08e49fa3377d8c4e7e5df7a32233fcd9763ee936 (patch)
treef06399e5a005a70612093f415bd02ea2d1ba719f /include
parenta17cde058213f962b8de880de6f5b1e4f2061b37 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I1ec9a671fe3ac838feb36297915e3cdf8749d944
Diffstat (limited to 'include')
-rw-r--r--include/basic/basmgr.hxx6
-rw-r--r--include/basic/sbmeth.hxx4
-rw-r--r--include/basic/sbmod.hxx4
-rw-r--r--include/basic/sbstar.hxx6
-rw-r--r--include/basic/sbuno.hxx2
-rw-r--r--include/basic/sbx.hxx2
-rw-r--r--include/basic/sbxobj.hxx2
-rw-r--r--include/basic/sbxvar.hxx12
8 files changed, 19 insertions, 19 deletions
diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx
index c8bbb2d35a07..11eb3f526818 100644
--- a/include/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
@@ -81,7 +81,7 @@ struct LibraryContainerInfo
OldBasicPassword* mpOldBasicPassword;
LibraryContainerInfo()
- :mpOldBasicPassword( NULL )
+ :mpOldBasicPassword( nullptr )
{
}
@@ -135,8 +135,8 @@ protected:
public:
TYPEINFO_OVERRIDE();
- BasicManager( SotStorage& rStorage, const OUString& rBaseURL, StarBASIC* pParentFromStdLib = NULL, OUString* pLibPath = NULL, bool bDocMgr = false );
- BasicManager( StarBASIC* pStdLib, OUString* pLibPath = NULL, bool bDocMgr = false );
+ BasicManager( SotStorage& rStorage, const OUString& rBaseURL, StarBASIC* pParentFromStdLib = nullptr, OUString* pLibPath = nullptr, bool bDocMgr = false );
+ BasicManager( StarBASIC* pStdLib, OUString* pLibPath = nullptr, bool bDocMgr = false );
/** deletes the given BasicManager instance
diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx
index a93fe11d470e..e780057681b2 100644
--- a/include/basic/sbmeth.hxx
+++ b/include/basic/sbmeth.hxx
@@ -62,7 +62,7 @@ public:
void GetLineRange( sal_uInt16&, sal_uInt16& );
// Interface to execute a method from the applications
- ErrCode Call( SbxValue* pRet = NULL, SbxVariable* pCaller = NULL );
+ ErrCode Call( SbxValue* pRet = nullptr, SbxVariable* pCaller = nullptr );
virtual void Broadcast( sal_uInt32 nHintId ) override;
};
@@ -77,7 +77,7 @@ class BASIC_DLLPUBLIC SbIfaceMapperMethod : public SbMethod
public:
TYPEINFO_OVERRIDE();
SbIfaceMapperMethod( const OUString& rName, SbMethod* pImplMeth )
- : SbMethod( rName, pImplMeth->GetType(), NULL )
+ : SbMethod( rName, pImplMeth->GetType(), nullptr )
, mxImplMeth( pImplMeth )
{}
virtual ~SbIfaceMapperMethod();
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index e68fd646dfce..5fd7e02f2e1a 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -86,7 +86,7 @@ protected:
void GlobalRunDeInit();
const sal_uInt8* FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16& ) const;
const sal_uInt8* FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16&,
- bool bFollowJumps, const SbiImage* pImg=NULL ) const;
+ bool bFollowJumps, const SbiImage* pImg=nullptr ) const;
virtual bool LoadData( SvStream&, sal_uInt16 ) override;
virtual bool StoreData( SvStream& ) const override;
virtual bool LoadCompleted() override;
@@ -120,7 +120,7 @@ public:
bool StoreBinaryData( SvStream&, sal_uInt16 nVer );
bool LoadBinaryData( SvStream& );
bool ExceedsLegacyModuleSize();
- void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const;
+ void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = nullptr ) const;
bool HasExeCode();
bool IsVBACompat() const { return mbVBACompat;}
void SetVBACompat( bool bCompat );
diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx
index 2e924c074a68..3a7090361110 100644
--- a/include/basic/sbstar.hxx
+++ b/include/basic/sbstar.hxx
@@ -88,7 +88,7 @@ public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASIC,1);
TYPEINFO_OVERRIDE();
- StarBASIC( StarBASIC* pParent = NULL, bool bIsDocBasic = false );
+ StarBASIC( StarBASIC* pParent = nullptr, bool bIsDocBasic = false );
// #51727 SetModified overridden so that the Modfied-State is
// not delivered to Parent.
@@ -119,13 +119,13 @@ public:
static sal_Int32 GetErl();
virtual SbxVariable* Find( const OUString&, SbxClassType ) override;
- virtual bool Call( const OUString&, SbxArray* = NULL ) override;
+ virtual bool Call( const OUString&, SbxArray* = nullptr ) override;
SbxArray* GetModules() { return pModules; }
SbxObject* GetRtl() { return pRtl; }
SbModule* FindModule( const OUString& );
// Run init code of all modules (including the inserted Doc-Basics)
- void InitAllModules( StarBASIC* pBasicNotToInit = NULL );
+ void InitAllModules( StarBASIC* pBasicNotToInit = nullptr );
void DeInitAllModules();
void ClearAllModuleVars();
diff --git a/include/basic/sbuno.hxx b/include/basic/sbuno.hxx
index e0f485e2c3c8..895ecf59dba2 100644
--- a/include/basic/sbuno.hxx
+++ b/include/basic/sbuno.hxx
@@ -37,7 +37,7 @@ BASIC_DLLPUBLIC void createAllObjectProperties( SbxObject* pObj );
BASIC_DLLPUBLIC void SetSbUnoObjectDfltPropName( SbxObject* pObj );
BASIC_DLLPUBLIC css::uno::Any sbxToUnoValue( const SbxValue* pVar );
-BASIC_DLLPUBLIC css::uno::Any sbxToUnoValue( const SbxValue* pVar, const css::uno::Type& rType, css::beans::Property* pUnoProperty = NULL );
+BASIC_DLLPUBLIC css::uno::Any sbxToUnoValue( const SbxValue* pVar, const css::uno::Type& rType, css::beans::Property* pUnoProperty = nullptr );
BASIC_DLLPUBLIC void unoToSbxValue( SbxVariable* pVar, const css::uno::Any& aValue );
diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index 526cf162c8af..cca67eaa3ede 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -54,7 +54,7 @@ struct SbxParamInfo
SbxDataType eType; // Data type
SbxFlagBits nFlags; // Flag-Bits
sal_uInt32 nUserData; // IDs etc.
- SbxParamInfo( const OUString& s, SbxDataType t, SbxFlagBits n, SbxBase* b = NULL )
+ SbxParamInfo( const OUString& s, SbxDataType t, SbxFlagBits n, SbxBase* b = nullptr )
: aName( s ), aTypeRef( b ), eType( t ), nFlags( n ), nUserData( 0 ) {}
~SbxParamInfo() {}
};
diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx
index 51d40eefd69f..2b07be4621ae 100644
--- a/include/basic/sbxobj.hxx
+++ b/include/basic/sbxobj.hxx
@@ -62,7 +62,7 @@ public:
virtual SbxVariable* Find( const OUString&, SbxClassType );
SbxVariable* FindQualified( const OUString&, SbxClassType );
// Quick-Call-Interface for Methods
- virtual bool Call( const OUString&, SbxArray* = NULL );
+ virtual bool Call( const OUString&, SbxArray* = nullptr );
// Execution of DDE-Commands
SbxVariable* Execute( const OUString& );
// Manage elements
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index c237be0930e6..d2b5f066f712 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -68,7 +68,7 @@ struct SbxValues
};
SbxDataType eType;
- SbxValues(): pData( NULL ), eType(SbxEMPTY) {}
+ SbxValues(): pData( nullptr ), eType(SbxEMPTY) {}
SbxValues( SbxDataType e ): eType(e) {}
SbxValues( char _nChar ): nChar( _nChar ), eType(SbxCHAR) {}
SbxValues( sal_uInt8 _nByte ): nByte( _nByte ), eType(SbxBYTE) {}
@@ -105,7 +105,7 @@ public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VALUE,1);
TYPEINFO_OVERRIDE();
SbxValue();
- SbxValue( SbxDataType, void* = NULL );
+ SbxValue( SbxDataType, void* = nullptr );
SbxValue( const SbxValue& );
SbxValue& operator=( const SbxValue& );
virtual void Clear() override;
@@ -187,8 +187,8 @@ public:
bool Convert( SbxDataType );
bool Compute( SbxOperator, const SbxValue& );
bool Compare( SbxOperator, const SbxValue& ) const;
- bool Scan( const OUString&, sal_uInt16* = NULL );
- void Format( OUString&, const OUString* = NULL ) const;
+ bool Scan( const OUString&, sal_uInt16* = nullptr );
+ void Format( OUString&, const OUString* = nullptr ) const;
// The following operators are definied for easier handling.
// TODO: Ensure error conditions (overflow, conversions)
@@ -294,7 +294,7 @@ public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VARIABLE,2);
TYPEINFO_OVERRIDE();
SbxVariable();
- SbxVariable( SbxDataType, void* = NULL );
+ SbxVariable( SbxDataType, void* = nullptr );
SbxVariable( const SbxVariable& );
SbxVariable& operator=( const SbxVariable& );
@@ -321,7 +321,7 @@ public:
// Sfx-Broadcasting-Support:
// Due to data reduction and better DLL-hierarchy currently via casting
SfxBroadcaster& GetBroadcaster();
- bool IsBroadcaster() const { return pCst != NULL; }
+ bool IsBroadcaster() const { return pCst != nullptr; }
virtual void Broadcast( sal_uInt32 nHintId ) override;
inline const SbxObject* GetParent() const { return pParent; }