diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:29:37 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:32:02 +0100 |
commit | 6de82da0c154a0e8a353125aa80a61779abfd3ba (patch) | |
tree | 6adbd1a972beecd84a8ee90beadf912d7fe0c25f /xmlscript | |
parent | 1e661634129bb692294972b5b61df2874632d14d (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: Ie91fbfc9369fe9f2de1cf12c746598a80c2233c1
Diffstat (limited to 'xmlscript')
-rw-r--r-- | xmlscript/source/misc/unoservices.cxx | 12 | ||||
-rw-r--r-- | xmlscript/source/xml_helper/xml_impctx.cxx | 4 | ||||
-rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | 6 | ||||
-rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 6 | ||||
-rw-r--r-- | xmlscript/source/xmlflat_imexp/xmlbas_import.cxx | 2 | ||||
-rw-r--r-- | xmlscript/source/xmllib_imexp/imp_share.hxx | 4 | ||||
-rw-r--r-- | xmlscript/source/xmllib_imexp/xmllib_import.cxx | 4 | ||||
-rw-r--r-- | xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 2 |
8 files changed, 20 insertions, 20 deletions
diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx index c3eaac582e6a..8d89cef7e758 100644 --- a/xmlscript/source/misc/unoservices.cxx +++ b/xmlscript/source/misc/unoservices.cxx @@ -30,29 +30,29 @@ namespace xmlscript { create_DocumentHandlerImpl, getImplementationName_DocumentHandlerImpl, getSupportedServiceNames_DocumentHandlerImpl, ::cppu::createSingleComponentFactory, - 0, 0 + nullptr, 0 }, { create_XMLBasicExporter, getImplementationName_XMLBasicExporter, getSupportedServiceNames_XMLBasicExporter, ::cppu::createSingleComponentFactory, - 0, 0 + nullptr, 0 }, { create_XMLOasisBasicExporter, getImplementationName_XMLOasisBasicExporter, getSupportedServiceNames_XMLOasisBasicExporter, ::cppu::createSingleComponentFactory, - 0, 0 + nullptr, 0 }, { create_XMLBasicImporter, getImplementationName_XMLBasicImporter, getSupportedServiceNames_XMLBasicImporter, ::cppu::createSingleComponentFactory, - 0, 0 + nullptr, 0 }, { create_XMLOasisBasicImporter, getImplementationName_XMLOasisBasicImporter, getSupportedServiceNames_XMLOasisBasicImporter, ::cppu::createSingleComponentFactory, - 0, 0 + nullptr, 0 }, - { 0, 0, 0, 0, 0, 0 } + { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; } diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx index 6b8ac8c8f50e..a553186093ff 100644 --- a/xmlscript/source/xml_helper/xml_impctx.cxx +++ b/xmlscript/source/xml_helper/xml_impctx.cxx @@ -193,7 +193,7 @@ DocumentHandlerImpl::DocumentHandlerImpl( m_nLastPrefix_lookup( UID_UNKNOWN ), m_aLastPrefix_lookup( "<<< unknown URI >>>" ), m_nSkipElements( 0 ), - m_pMutex( 0 ) + m_pMutex( nullptr ) { m_elements.reserve( 10 ); @@ -203,7 +203,7 @@ DocumentHandlerImpl::DocumentHandlerImpl( DocumentHandlerImpl::~DocumentHandlerImpl() throw () { - if (m_pMutex != 0) + if (m_pMutex != nullptr) { delete m_pMutex; #if OSL_DEBUG_LEVEL == 0 diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx index 8f24797aa6a5..cfa7509b1cab 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx @@ -1053,7 +1053,7 @@ void ElementDescriptor::readBullitinBoard( StyleBag * all_styles ) Sequence< OUString > aElements( xDialogModel->getElementNames() ); OUString const * pElements = aElements.getConstArray(); - ElementDescriptor * pRadioGroup = 0; + ElementDescriptor * pRadioGroup = nullptr; sal_Int32 nPos; for ( nPos = 0; nPos < aElements.getLength(); ++nPos ) @@ -1072,7 +1072,7 @@ void ElementDescriptor::readBullitinBoard( StyleBag * all_styles ) if (! xServiceInfo.is()) continue; - ElementDescriptor * pElem = 0; + ElementDescriptor * pElem = nullptr; // group up radio buttons if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlRadioButtonModel" ) ) @@ -1089,7 +1089,7 @@ void ElementDescriptor::readBullitinBoard( StyleBag * all_styles ) } else // no radio { - pRadioGroup = 0; // close radiogroup + pRadioGroup = nullptr; // close radiogroup if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlButtonModel" ) ) { diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index 57c85a1d6be3..b5191b18f1d3 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -1444,7 +1444,7 @@ static StringTriple const s_aEventTranslations[] = { "com.sun.star.form.XDatabaseParameterListener", "approveParameter", "on-supplyparameter" }, { "com.sun.star.sdb.XSQLErrorListener", "errorOccured", "on-error" }, { "com.sun.star.awt.XAdjustmentListener", "adjustmentValueChanged", "on-adjustmentvaluechange" }, - { 0, 0, 0 } + { nullptr, nullptr, nullptr } }; extern StringTriple const * const g_pEventTranslations; StringTriple const * const g_pEventTranslations = s_aEventTranslations; @@ -1769,7 +1769,7 @@ Reference< xml::input::XElement > DialogImport::startRootElement( // window else if ( rLocalName == "window" ) { - return new WindowElement( rLocalName, xAttributes, 0, this ); + return new WindowElement( rLocalName, xAttributes, nullptr, this ); } else { @@ -1817,7 +1817,7 @@ Reference< xml::input::XElement > DialogImport::getStyle( return (*_pStyles)[ nPos ]; } } - return 0; + return nullptr; } Reference< xml::sax::XDocumentHandler > SAL_CALL importDialogModel( diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx index 9926fbe4d767..c1cf9b7c5a00 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx @@ -486,7 +486,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x if ( xLibContainer.is() ) { - xElement.set( new BasicLibrariesElement( rLocalName, xAttributes, 0, this, xLibContainer ) ); + xElement.set( new BasicLibrariesElement( rLocalName, xAttributes, nullptr, this, xLibContainer ) ); } } else diff --git a/xmlscript/source/xmllib_imexp/imp_share.hxx b/xmlscript/source/xmllib_imexp/imp_share.hxx index 02be5cfeb06a..a28fb2f7cd33 100644 --- a/xmlscript/source/xmllib_imexp/imp_share.hxx +++ b/xmlscript/source/xmllib_imexp/imp_share.hxx @@ -116,7 +116,7 @@ struct LibraryImport public: explicit LibraryImport( LibDescriptorArray* pLibArray ) : mpLibArray(pLibArray) - , mpLibDesc(NULL) + , mpLibDesc(nullptr) , XMLNS_LIBRARY_UID(0) , XMLNS_XLINK_UID(0) { @@ -124,7 +124,7 @@ public: // Single library mode explicit LibraryImport(LibDescriptor* pLibDesc) - : mpLibArray(NULL) + : mpLibArray(nullptr) , mpLibDesc(pLibDesc) , XMLNS_LIBRARY_UID(0) , XMLNS_XLINK_UID(0) diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx index f65ac55ab7d2..24fabb5b54af 100644 --- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx +++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx @@ -154,7 +154,7 @@ Reference< xml::input::XElement > LibraryImport::startRootElement( } else if ( mpLibArray && rLocalName == "libraries" ) { - return new LibrariesElement( rLocalName, xAttributes, 0, this ); + return new LibrariesElement( rLocalName, xAttributes, nullptr, this ); } else if ( mpLibDesc && rLocalName == "library" ) { @@ -166,7 +166,7 @@ Reference< xml::input::XElement > LibraryImport::startRootElement( getBoolAttr( &aDesc.bPasswordProtected, "passwordprotected", xAttributes, XMLNS_LIBRARY_UID ); getBoolAttr( &aDesc.bPreload, "preload", xAttributes, XMLNS_LIBRARY_UID ); - return new LibraryElement( rLocalName, xAttributes, 0, this ); + return new LibraryElement( rLocalName, xAttributes, nullptr, this ); } else { diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx index a14e7a237d9e..23bd93b4704a 100644 --- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx +++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx @@ -161,7 +161,7 @@ Reference< xml::input::XElement > ModuleImport::startRootElement( mrModuleDesc.aLanguage = xAttributes->getValueByUidName( XMLNS_SCRIPT_UID, "language" ); mrModuleDesc.aModuleType = xAttributes->getValueByUidName( XMLNS_SCRIPT_UID, "moduleType" ); - return new ModuleElement( rLocalName, xAttributes, 0, this ); + return new ModuleElement( rLocalName, xAttributes, nullptr, this ); } else { |