loplugin:nullptr (automatic rewrite)

Change-Id: Id275f54b08da54c356db052b949d7a1f9154b22c

5 files changed, 18 insertions, 18 deletions

diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index 04988972edbd..92fb4e64bafa 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -45,7 +45,7 @@ using namespace std;
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL analysis_component_getFactory(
     const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
 {
-    void* pRet = 0;
+    void* pRet = nullptr;
 
     if( pServiceManager && OUString::createFromAscii( pImplName ) == AnalysisAddIn::getImplementationName_Static() )
     {
@@ -134,22 +134,22 @@ void AnalysisAddIn::InitData()
     }
     else
     {
-        pFD = NULL;
+        pFD = nullptr;
     }
 
     if( pDefLocales )
     {
         delete pDefLocales;
-        pDefLocales = NULL;
+        pDefLocales = nullptr;
     }
 }
 
 AnalysisAddIn::AnalysisAddIn( const uno::Reference< uno::XComponentContext >& xContext ) :
-    pDefLocales( NULL ),
-    pFD( NULL ),
-    pFactDoubles( NULL ),
-    pCDL( NULL ),
-    pResMgr( NULL ),
+    pDefLocales( nullptr ),
+    pFD( nullptr ),
+    pFactDoubles( nullptr ),
+    pCDL( nullptr ),
+    pResMgr( nullptr ),
     aAnyConv( xContext )
 {
 }
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 7f2bb8101851..35aa32b13e28 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -39,7 +39,7 @@ using namespace sca::analysis;
 #define INTPAR              true    // first parameter is internal
 
 #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 ) \
     { "get" #FUNCNAME, ANALYSIS_FUNCNAME_##FUNCNAME, ANALYSIS_##FUNCNAME, DBL, OPT, ANALYSIS_DEFFUNCNAME_##FUNCNAME, NUMOFPAR, CAT, SUFFIX }
@@ -2547,8 +2547,8 @@ ConvertDataList::~ConvertDataList()
 
 double ConvertDataList::Convert( double fVal, const OUString& rFrom, const OUString& rTo ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
-    ConvertData*    pFrom = NULL;
-    ConvertData*    pTo = NULL;
+    ConvertData*    pFrom = nullptr;
+    ConvertData*    pTo = nullptr;
     bool            bSearchFrom = true;
     bool            bSearchTo = true;
     sal_Int16       nLevelFrom = 0;
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 05894af37883..5f377c8ead5b 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -83,7 +83,7 @@ sal_Int32           GetDiffDate360( sal_Int32 nNullDate, sal_Int32 nDate1, sal_I
 sal_Int32           GetDaysInYears( sal_uInt16 nYear1, sal_uInt16 nYear2 );
 inline sal_Int16    GetDayOfWeek( sal_Int32 nDate );
 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 )
                                 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 );
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index e53b017e8f9f..a81cf4b31786 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -118,7 +118,7 @@ extern "C" {
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL date_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
-    void* pRet = 0;
+    void* pRet = nullptr;
 
     if ( pServiceManager &&
             OUString::createFromAscii( pImplName ) == ScaDateAddIn::getImplementationName_Static() )
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx
index 31477074ee03..c35e2aece889 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -121,7 +121,7 @@ extern "C" {
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL pricing_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
-    void* pRet = 0;
+    void* pRet = nullptr;
 
     if ( pServiceManager &&
             OUString::createFromAscii( pImplName ) == ScaPricingAddIn::getImplementationName_Static() )
@@ -146,9 +146,9 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL pricing_component_getFactory(
 
 //  "normal" service implementation
 ScaPricingAddIn::ScaPricingAddIn() :
-    pDefLocales( NULL ),
-    pResMgr( NULL ),
-    pFuncDataList( NULL )
+    pDefLocales( nullptr ),
+    pResMgr( nullptr ),
+    pFuncDataList( nullptr )
 {
 }
 
@@ -212,7 +212,7 @@ void ScaPricingAddIn::InitData()
     if( pDefLocales )
     {
         delete pDefLocales;
-        pDefLocales = NULL;
+        pDefLocales = nullptr;
     }
 }