diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:13:39 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:22 +0100 |
commit | 89c4edc13f203db1641c63e22774262bbe61f36f (patch) | |
tree | 0aa28439045c19140ff51cd6cf1593d8cf515d89 /dbaccess/source/ext | |
parent | b58d56c5109f4cf6cacfc8e9c424b179a65bf1f1 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I2bba104b1bff30910864e45b5b032533099742ff
Diffstat (limited to 'dbaccess/source/ext')
5 files changed, 9 insertions, 9 deletions
diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx index 22a88887414c..f51c015c1cf4 100644 --- a/dbaccess/source/ext/macromigration/docinteraction.cxx +++ b/dbaccess/source/ext/macromigration/docinteraction.cxx @@ -54,7 +54,7 @@ namespace dbmm Reference< XInteractionHandler > xHandler; explicit InteractionHandler_Data( const Reference<XComponentContext>& _rContext ) - :xHandler( css::task::InteractionHandler::createWithParent(_rContext, 0), UNO_QUERY ) + :xHandler( css::task::InteractionHandler::createWithParent(_rContext, nullptr), UNO_QUERY ) { } }; @@ -76,7 +76,7 @@ namespace dbmm { // create request DocumentPasswordRequest aRequest( - OUString(), NULL, + OUString(), nullptr, InteractionClassification_QUERY, _io_rPassword.isEmpty() ? PasswordRequestMode_PASSWORD_ENTER : PasswordRequestMode_PASSWORD_REENTER, _rDocumentName diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index 8f5ca6483610..17420e54ead6 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -214,7 +214,7 @@ namespace dbmm enableButtons( WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::PREVIOUS | WizardButtonFlags::NEXT, false ); // start the migration asynchronously - PostUserEvent( LINK( this, MacroMigrationDialog, OnStartMigration ), NULL, true ); + PostUserEvent( LINK( this, MacroMigrationDialog, OnStartMigration ), nullptr, true ); } break; @@ -489,7 +489,7 @@ namespace dbmm } aViews.push_back( ViewDescriptor( xFrame, sViewName ) ); - xFrame->setComponent( NULL, NULL ); + xFrame->setComponent( nullptr, nullptr ); xController->dispose(); } diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index cc474d7b6b9d..a3170a20145e 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -238,7 +238,7 @@ namespace dbmm Command aCommand; aCommand.Name = OUString::createFromAscii( _pAsciiCommand ); return _rxCommandProc->execute( - aCommand, _rxCommandProc->createCommandIdentifier(), NULL ); + aCommand, _rxCommandProc->createCommandIdentifier(), nullptr ); } OUString lcl_getMimeType_nothrow( const Reference< XCommandProcessor >& _rxContent ) @@ -280,7 +280,7 @@ namespace dbmm aCommand.Argument <<= aLoadArgs.getPropertyValues(); Reference< XComponent > xDocComponent( xCommandProcessor->execute( - aCommand, xCommandProcessor->createCommandIdentifier(), NULL + aCommand, xCommandProcessor->createCommandIdentifier(), nullptr ), UNO_QUERY ); @@ -1337,7 +1337,7 @@ namespace dbmm // now that the concrete scripts storage does not have any elements anymore, // remove it - xScriptsRoot.reset( NULL ); // need to reset the storage to be allowed to remove it + xScriptsRoot.reset( nullptr ); // need to reset the storage to be allowed to remove it aDocStorage.removeScriptTypeStorage( _eScriptType ); // done so far diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx index feee88118280..475ca472e993 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.cxx +++ b/dbaccess/source/ext/macromigration/migrationlog.cxx @@ -188,7 +188,7 @@ namespace dbmm { static void lcl_appendErrorDescription( OUStringBuffer& _inout_rBuffer, const MigrationError& _rError ) { - const sal_Char* pAsciiErrorDescription( NULL ); + const sal_Char* pAsciiErrorDescription( nullptr ); ::std::vector< OUString > aParameterNames; switch ( _rError.eType ) { diff --git a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx index d312a7925663..efa4339cdce5 100644 --- a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx +++ b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx @@ -31,7 +31,7 @@ namespace dbmm class RangeProgressBar { public: - explicit RangeProgressBar(ProgressBar *pBar = NULL) + explicit RangeProgressBar(ProgressBar *pBar = nullptr) : m_pBar(pBar) , m_nRange(0) { |