Kaydet (Commit) 2e353981 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:nullptr (automatic rewrite)

Change-Id: Id275f54b08da54c356db052b949d7a1f9154b22c
üst de29ac09
...@@ -45,7 +45,7 @@ using namespace std; ...@@ -45,7 +45,7 @@ using namespace std;
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL analysis_component_getFactory( extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL analysis_component_getFactory(
const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
{ {
void* pRet = 0; void* pRet = nullptr;
if( pServiceManager && OUString::createFromAscii( pImplName ) == AnalysisAddIn::getImplementationName_Static() ) if( pServiceManager && OUString::createFromAscii( pImplName ) == AnalysisAddIn::getImplementationName_Static() )
{ {
...@@ -134,22 +134,22 @@ void AnalysisAddIn::InitData() ...@@ -134,22 +134,22 @@ void AnalysisAddIn::InitData()
} }
else else
{ {
pFD = NULL; pFD = nullptr;
} }
if( pDefLocales ) if( pDefLocales )
{ {
delete pDefLocales; delete pDefLocales;
pDefLocales = NULL; pDefLocales = nullptr;
} }
} }
AnalysisAddIn::AnalysisAddIn( const uno::Reference< uno::XComponentContext >& xContext ) : AnalysisAddIn::AnalysisAddIn( const uno::Reference< uno::XComponentContext >& xContext ) :
pDefLocales( NULL ), pDefLocales( nullptr ),
pFD( NULL ), pFD( nullptr ),
pFactDoubles( NULL ), pFactDoubles( nullptr ),
pCDL( NULL ), pCDL( nullptr ),
pResMgr( NULL ), pResMgr( nullptr ),
aAnyConv( xContext ) aAnyConv( xContext )
{ {
} }
......
...@@ -39,7 +39,7 @@ using namespace sca::analysis; ...@@ -39,7 +39,7 @@ using namespace sca::analysis;
#define INTPAR true // first parameter is internal #define INTPAR true // first parameter is internal
#define FUNCDATA( FUNCNAME, DBL, OPT, NUMOFPAR, CAT ) \ #define FUNCDATA( FUNCNAME, DBL, OPT, NUMOFPAR, CAT ) \
{ "get" #FUNCNAME, ANALYSIS_FUNCNAME_##FUNCNAME, ANALYSIS_##FUNCNAME, DBL, OPT, ANALYSIS_DEFFUNCNAME_##FUNCNAME, NUMOFPAR, CAT, NULL } { "get" #FUNCNAME, ANALYSIS_FUNCNAME_##FUNCNAME, ANALYSIS_##FUNCNAME, DBL, OPT, ANALYSIS_DEFFUNCNAME_##FUNCNAME, NUMOFPAR, CAT, nullptr }
#define FUNCDATAS( FUNCNAME, DBL, OPT, NUMOFPAR, CAT, SUFFIX ) \ #define FUNCDATAS( FUNCNAME, DBL, OPT, NUMOFPAR, CAT, SUFFIX ) \
{ "get" #FUNCNAME, ANALYSIS_FUNCNAME_##FUNCNAME, ANALYSIS_##FUNCNAME, DBL, OPT, ANALYSIS_DEFFUNCNAME_##FUNCNAME, NUMOFPAR, CAT, SUFFIX } { "get" #FUNCNAME, ANALYSIS_FUNCNAME_##FUNCNAME, ANALYSIS_##FUNCNAME, DBL, OPT, ANALYSIS_DEFFUNCNAME_##FUNCNAME, NUMOFPAR, CAT, SUFFIX }
...@@ -2547,8 +2547,8 @@ ConvertDataList::~ConvertDataList() ...@@ -2547,8 +2547,8 @@ ConvertDataList::~ConvertDataList()
double ConvertDataList::Convert( double fVal, const OUString& rFrom, const OUString& rTo ) throw( uno::RuntimeException, lang::IllegalArgumentException ) double ConvertDataList::Convert( double fVal, const OUString& rFrom, const OUString& rTo ) throw( uno::RuntimeException, lang::IllegalArgumentException )
{ {
ConvertData* pFrom = NULL; ConvertData* pFrom = nullptr;
ConvertData* pTo = NULL; ConvertData* pTo = nullptr;
bool bSearchFrom = true; bool bSearchFrom = true;
bool bSearchTo = true; bool bSearchTo = true;
sal_Int16 nLevelFrom = 0; sal_Int16 nLevelFrom = 0;
......
...@@ -83,7 +83,7 @@ sal_Int32 GetDiffDate360( sal_Int32 nNullDate, sal_Int32 nDate1, sal_I ...@@ -83,7 +83,7 @@ sal_Int32 GetDiffDate360( sal_Int32 nNullDate, sal_Int32 nDate1, sal_I
sal_Int32 GetDaysInYears( sal_uInt16 nYear1, sal_uInt16 nYear2 ); sal_Int32 GetDaysInYears( sal_uInt16 nYear1, sal_uInt16 nYear2 );
inline sal_Int16 GetDayOfWeek( sal_Int32 nDate ); inline sal_Int16 GetDayOfWeek( sal_Int32 nDate );
sal_Int32 GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode, sal_Int32 GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode,
sal_Int32* pOptDaysIn1stYear = NULL ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); sal_Int32* pOptDaysIn1stYear = nullptr ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
double GetYearDiff( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode ) double GetYearDiff( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode )
throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
sal_Int32 GetDaysInYear( sal_Int32 nNullDate, sal_Int32 nDate, sal_Int32 nMode ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); sal_Int32 GetDaysInYear( sal_Int32 nNullDate, sal_Int32 nDate, sal_Int32 nMode ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
......
...@@ -118,7 +118,7 @@ extern "C" { ...@@ -118,7 +118,7 @@ extern "C" {
SAL_DLLPUBLIC_EXPORT void * SAL_CALL date_component_getFactory( SAL_DLLPUBLIC_EXPORT void * SAL_CALL date_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{ {
void* pRet = 0; void* pRet = nullptr;
if ( pServiceManager && if ( pServiceManager &&
OUString::createFromAscii( pImplName ) == ScaDateAddIn::getImplementationName_Static() ) OUString::createFromAscii( pImplName ) == ScaDateAddIn::getImplementationName_Static() )
......
...@@ -121,7 +121,7 @@ extern "C" { ...@@ -121,7 +121,7 @@ extern "C" {
SAL_DLLPUBLIC_EXPORT void * SAL_CALL pricing_component_getFactory( SAL_DLLPUBLIC_EXPORT void * SAL_CALL pricing_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{ {
void* pRet = 0; void* pRet = nullptr;
if ( pServiceManager && if ( pServiceManager &&
OUString::createFromAscii( pImplName ) == ScaPricingAddIn::getImplementationName_Static() ) OUString::createFromAscii( pImplName ) == ScaPricingAddIn::getImplementationName_Static() )
...@@ -146,9 +146,9 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL pricing_component_getFactory( ...@@ -146,9 +146,9 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL pricing_component_getFactory(
// "normal" service implementation // "normal" service implementation
ScaPricingAddIn::ScaPricingAddIn() : ScaPricingAddIn::ScaPricingAddIn() :
pDefLocales( NULL ), pDefLocales( nullptr ),
pResMgr( NULL ), pResMgr( nullptr ),
pFuncDataList( NULL ) pFuncDataList( nullptr )
{ {
} }
...@@ -212,7 +212,7 @@ void ScaPricingAddIn::InitData() ...@@ -212,7 +212,7 @@ void ScaPricingAddIn::InitData()
if( pDefLocales ) if( pDefLocales )
{ {
delete pDefLocales; delete pDefLocales;
pDefLocales = NULL; pDefLocales = nullptr;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment