diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:29:15 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:32:01 +0100 |
commit | 51b45df6bba163dec7ba91c700de695ad517e5dd (patch) | |
tree | 566633496f4048112c75edbbe250b0f01d86a8dd /xmloff/source/forms/handler | |
parent | 87bae0e188aa3ce3c31d1aa91707c0fad6b81b65 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I8690de2cb68dcfedc9f2239ce66cea06fd94bc16
Diffstat (limited to 'xmloff/source/forms/handler')
-rw-r--r-- | xmloff/source/forms/handler/form_handler_factory.cxx | 14 | ||||
-rw-r--r-- | xmloff/source/forms/handler/vcl_date_handler.cxx | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/xmloff/source/forms/handler/form_handler_factory.cxx b/xmloff/source/forms/handler/form_handler_factory.cxx index b6a285100b1c..1444f9cb883b 100644 --- a/xmloff/source/forms/handler/form_handler_factory.cxx +++ b/xmloff/source/forms/handler/form_handler_factory.cxx @@ -28,14 +28,14 @@ namespace xmloff namespace { - static PPropertyHandler s_pVCLDateHandler = NULL; - static PPropertyHandler s_pVCLTimeHandler = NULL; + static PPropertyHandler s_pVCLDateHandler = nullptr; + static PPropertyHandler s_pVCLTimeHandler = nullptr; } //= FormHandlerFactory PPropertyHandler FormHandlerFactory::getFormPropertyHandler( const PropertyId i_propertyId ) { - PPropertyHandler pHandler( NULL ); + PPropertyHandler pHandler( nullptr ); switch ( i_propertyId ) { @@ -43,10 +43,10 @@ namespace xmloff case PID_DATE_MAX: case PID_DEFAULT_DATE: case PID_DATE: - if ( s_pVCLDateHandler.get() == NULL ) + if ( s_pVCLDateHandler.get() == nullptr ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if ( s_pVCLDateHandler == NULL ) + if ( s_pVCLDateHandler == nullptr ) s_pVCLDateHandler = new VCLDateHandler(); } pHandler = s_pVCLDateHandler; @@ -56,10 +56,10 @@ namespace xmloff case PID_TIME_MAX: case PID_DEFAULT_TIME: case PID_TIME: - if ( s_pVCLTimeHandler.get() == NULL ) + if ( s_pVCLTimeHandler.get() == nullptr ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if ( s_pVCLTimeHandler == NULL ) + if ( s_pVCLTimeHandler == nullptr ) s_pVCLTimeHandler = new VCLTimeHandler(); } pHandler = s_pVCLTimeHandler; diff --git a/xmloff/source/forms/handler/vcl_date_handler.cxx b/xmloff/source/forms/handler/vcl_date_handler.cxx index 0df8f14dd3ab..4dde7c21045f 100644 --- a/xmloff/source/forms/handler/vcl_date_handler.cxx +++ b/xmloff/source/forms/handler/vcl_date_handler.cxx @@ -59,7 +59,7 @@ namespace xmloff aDateTime.Year = aDate.Year; OUStringBuffer aBuffer; - ::sax::Converter::convertDateTime( aBuffer, aDateTime, 0 ); + ::sax::Converter::convertDateTime( aBuffer, aDateTime, nullptr ); return aBuffer.makeStringAndClear(); } @@ -67,7 +67,7 @@ namespace xmloff { DateTime aDateTime; Date aDate; - if (::sax::Converter::parseDateTime( aDateTime, 0, i_attributeValue )) + if (::sax::Converter::parseDateTime( aDateTime, nullptr, i_attributeValue )) { aDate.Day = aDateTime.Day; aDate.Month = aDateTime.Month; |