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 | |
parent | 87bae0e188aa3ce3c31d1aa91707c0fad6b81b65 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I8690de2cb68dcfedc9f2239ce66cea06fd94bc16
Diffstat (limited to 'xmloff/source/forms')
23 files changed, 86 insertions, 86 deletions
diff --git a/xmloff/source/forms/controlpropertyhdl.cxx b/xmloff/source/forms/controlpropertyhdl.cxx index 25a4b1c8c59c..855df152f336 100644 --- a/xmloff/source/forms/controlpropertyhdl.cxx +++ b/xmloff/source/forms/controlpropertyhdl.cxx @@ -47,13 +47,13 @@ namespace xmloff //= OControlPropertyHandlerFactory OControlPropertyHandlerFactory::OControlPropertyHandlerFactory() - :m_pTextAlignHandler(NULL) - ,m_pControlBorderStyleHandler(NULL) - ,m_pControlBorderColorHandler(NULL) - ,m_pRotationAngleHandler(NULL) - ,m_pFontWidthHandler(NULL) - ,m_pFontEmphasisHandler(NULL) - ,m_pFontReliefHandler(NULL) + :m_pTextAlignHandler(nullptr) + ,m_pControlBorderStyleHandler(nullptr) + ,m_pControlBorderColorHandler(nullptr) + ,m_pRotationAngleHandler(nullptr) + ,m_pFontWidthHandler(nullptr) + ,m_pFontEmphasisHandler(nullptr) + ,m_pFontReliefHandler(nullptr) { } @@ -70,7 +70,7 @@ namespace xmloff const XMLPropertyHandler* OControlPropertyHandlerFactory::GetPropertyHandler(sal_Int32 _nType) const { - const XMLPropertyHandler* pHandler = NULL; + const XMLPropertyHandler* pHandler = nullptr; switch (_nType) { diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx index 916b97e1e0fa..852c2d93d3da 100644 --- a/xmloff/source/forms/controlpropertymap.cxx +++ b/xmloff/source/forms/controlpropertymap.cxx @@ -36,7 +36,7 @@ namespace xmloff #define MAP_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010, false } #define MAP_CONST( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010, false } #define MAP_CONST_P( name, prefix, token, type, context ){ name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010, false } -#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010, false } +#define MAP_END() { nullptr, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010, false } XMLPropertyMapEntry* getControlStylePropertyMap_Access( ) { diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 31da709100b2..f39a2281654f 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -92,7 +92,7 @@ namespace xmloff const Sequence< ScriptEventDescriptor >& _rEvents) :OPropertyExport(_rContext, _rxProps) ,m_aEvents(_rEvents) - ,m_pXMLElement(NULL) + ,m_pXMLElement(nullptr) { } @@ -148,7 +148,7 @@ namespace xmloff void OElementExport::implEndElement() { delete m_pXMLElement; - m_pXMLElement = NULL; + m_pXMLElement = nullptr; } void OElementExport::exportServiceNameAttribute() @@ -239,7 +239,7 @@ namespace xmloff ,m_nIncludeSpecial(0) ,m_nIncludeEvents(0) ,m_nIncludeBindings(0) - ,m_pOuterElement(NULL) + ,m_pOuterElement(nullptr) { OSL_ENSURE(m_xProps.is(), "OControlExport::OControlExport: invalid arguments!"); } @@ -456,7 +456,7 @@ namespace xmloff // see if this property can already be handled with an IPropertyHandler (which, on the long // term, should be the case for most, if not all, properties) const PropertyDescription* propDescription = metadata::getPropertyDescription( prop->Name ); - if ( propDescription == NULL ) + if ( propDescription == nullptr ) continue; // let the factory provide the concrete handler. Note that caching, if desired, is the task @@ -772,8 +772,8 @@ namespace xmloff if ((CCA_CURRENT_VALUE | CCA_VALUE) & m_nIncludeCommon) { - const sal_Char* pCurrentValuePropertyName = NULL; - const sal_Char* pValuePropertyName = NULL; + const sal_Char* pCurrentValuePropertyName = nullptr; + const sal_Char* pValuePropertyName = nullptr; // get the property names getValuePropertyNames(m_eType, m_nClassId, pCurrentValuePropertyName, pValuePropertyName); @@ -804,9 +804,9 @@ namespace xmloff pValueAttributeName, pValuePropertyName); - OSL_ENSURE((NULL == pValuePropertyName) == (0 == (CCA_VALUE & m_nIncludeCommon)), + OSL_ENSURE((nullptr == pValuePropertyName) == (0 == (CCA_VALUE & m_nIncludeCommon)), "OControlExport::exportCommonControlAttributes: no property found for the value attribute!"); - OSL_ENSURE((NULL == pCurrentValuePropertyName ) == (0 == (CCA_CURRENT_VALUE & m_nIncludeCommon)), + OSL_ENSURE((nullptr == pCurrentValuePropertyName ) == (0 == (CCA_CURRENT_VALUE & m_nIncludeCommon)), "OControlExport::exportCommonControlAttributes: no property found for the current-value attribute!"); #if OSL_DEBUG_LEVEL > 0 @@ -1190,13 +1190,13 @@ namespace xmloff // need to export the min value and the max value as attributes // It depends on the real type (FormComponentType) of the control, which properties hold these // values - const sal_Char* pMinValuePropertyName = NULL; - const sal_Char* pMaxValuePropertyName = NULL; + const sal_Char* pMinValuePropertyName = nullptr; + const sal_Char* pMaxValuePropertyName = nullptr; getValueLimitPropertyNames(m_nClassId, pMinValuePropertyName, pMaxValuePropertyName); - OSL_ENSURE((NULL == pMinValuePropertyName) == (0 == (SCA_MIN_VALUE & m_nIncludeSpecial)), + OSL_ENSURE((nullptr == pMinValuePropertyName) == (0 == (SCA_MIN_VALUE & m_nIncludeSpecial)), "OControlExport::exportCommonControlAttributes: no property found for the min value attribute!"); - OSL_ENSURE((NULL == pMaxValuePropertyName) == (0 == (SCA_MAX_VALUE & m_nIncludeSpecial)), + OSL_ENSURE((nullptr == pMaxValuePropertyName) == (0 == (SCA_MAX_VALUE & m_nIncludeSpecial)), "OControlExport::exportCommonControlAttributes: no property found for the max value attribute!"); // add the two attributes @@ -1409,7 +1409,7 @@ namespace xmloff XML_NAMESPACE_FORM, pOuterElementName, true, true) - : 0; + : nullptr; // add the attributes for the inner element exportInnerAttributes(); @@ -1425,12 +1425,12 @@ namespace xmloff // end the outer element if it exists delete m_pOuterElement; - m_pOuterElement = NULL; + m_pOuterElement = nullptr; } const sal_Char* OControlExport::getOuterXMLElementName() const { - return 0; + return nullptr; } const sal_Char* OControlExport::getXMLElementName() const @@ -1731,7 +1731,7 @@ namespace xmloff // is it a control bound to a calc cell? if ( FormCellBindingHelper::livesInSpreadsheetDocument( m_xProps ) ) { - FormCellBindingHelper aHelper( m_xProps, NULL ); + FormCellBindingHelper aHelper( m_xProps, nullptr ); { if ( FormCellBindingHelper::isCellBinding( aHelper.getCurrentBinding( ) ) ) { @@ -1771,7 +1771,7 @@ namespace xmloff { try { - FormCellBindingHelper aHelper( m_xProps, NULL ); + FormCellBindingHelper aHelper( m_xProps, nullptr ); Reference< XValueBinding > xBinding( aHelper.getCurrentBinding() ); OSL_ENSURE( xBinding.is(), "OControlExport::exportCellBindingAttributes: invalid bindable or invalid binding!" ); if ( xBinding.is() ) @@ -1835,7 +1835,7 @@ namespace xmloff OSL_ENSURE( xSource.is(), "OControlExport::exportCellListSourceRange: list source or sink!" ); if ( xSource.is() ) { - FormCellBindingHelper aHelper( m_xProps, NULL ); + FormCellBindingHelper aHelper( m_xProps, nullptr ); AddAttribute( OAttributeMetaData::getBindingAttributeNamespace( BA_LIST_CELL_RANGE ), diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 202dab5f40cb..f3a40fa7dad8 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -121,7 +121,7 @@ namespace xmloff :OPropertyImport(_rImport, _nPrefix, _rName) ,m_rFormImport(_rImport) ,m_rEventManager(_rEventManager) - ,m_pStyleElement( NULL ) + ,m_pStyleElement( nullptr ) ,m_xParentContainer(_rxParentContainer) ,m_bImplicitGenericAttributeHandling( true ) { @@ -466,7 +466,7 @@ namespace xmloff Sequence< OUString > aNames = m_xParentContainer->getElementNames(); OUString sReturn; - const OUString* pNames = NULL; + const OUString* pNames = nullptr; const OUString* pNamesEnd = aNames.getConstArray() + aNames.getLength(); for (sal_Int32 i=0; i<32768; ++i) // the limit is nearly arbitrary ... { @@ -664,7 +664,7 @@ namespace xmloff OUString OControlImport::determineDefaultServiceName() const { - const sal_Char* pServiceName = NULL; + const sal_Char* pServiceName = nullptr; switch ( m_eElementType ) { case OControlElement::TEXT: @@ -688,7 +688,7 @@ namespace xmloff case OControlElement::DATE: pServiceName = "com.sun.star.form.component.DateField"; break; default: break; } - if ( pServiceName != NULL ) + if ( pServiceName != nullptr ) return OUString::createFromAscii( pServiceName ); return OUString(); } @@ -828,10 +828,10 @@ namespace xmloff return; } - const sal_Char* pValueProperty = NULL; - const sal_Char* pCurrentValueProperty = NULL; - const sal_Char* pMinValueProperty = NULL; - const sal_Char* pMaxValueProperty = NULL; + const sal_Char* pValueProperty = nullptr; + const sal_Char* pCurrentValueProperty = nullptr; + const sal_Char* pMinValueProperty = nullptr; + const sal_Char* pMaxValueProperty = nullptr; bool bRetrievedValues = false; bool bRetrievedValueLimits = false; @@ -993,8 +993,8 @@ namespace xmloff DBG_UNHANDLED_EXCEPTION(); } - const sal_Char* pValueProperty = NULL; - const sal_Char* pDefaultValueProperty = NULL; + const sal_Char* pValueProperty = nullptr; + const sal_Char* pDefaultValueProperty = nullptr; getRuntimeValuePropertyNames(m_eElementType, nClassId, pValueProperty, pDefaultValueProperty); if ( pDefaultValueProperty && pValueProperty ) { diff --git a/xmloff/source/forms/elementimport_impl.hxx b/xmloff/source/forms/elementimport_impl.hxx index d49859453bae..3677f230a281 100644 --- a/xmloff/source/forms/elementimport_impl.hxx +++ b/xmloff/source/forms/elementimport_impl.hxx @@ -42,7 +42,7 @@ inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext( else { OSL_FAIL("OContainerImport::CreateChildContext: don't have an element!"); - return NULL; + return nullptr; } } diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx index e63d89c6d2dc..98a1c595c80a 100644 --- a/xmloff/source/forms/formattributes.cxx +++ b/xmloff/source/forms/formattributes.cxx @@ -217,7 +217,7 @@ namespace xmloff AttributeAssignments::const_iterator aPos = m_aKnownProperties.find(_rAttribName); if (m_aKnownProperties.end() != aPos) return &aPos->second; - return NULL; + return nullptr; } void OAttribute2Property::addStringProperty( diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx index 3449606d23d6..4897f7d103a0 100644 --- a/xmloff/source/forms/formattributes.hxx +++ b/xmloff/source/forms/formattributes.hxx @@ -255,7 +255,7 @@ namespace xmloff const SvXMLEnumMapEntry* pEnumMap; // the enum map, if appliable bool bInverseSemantics; // for booleanss: attribute and property value have the same or an inverse semantics? - AttributeAssignment() : pEnumMap(NULL), bInverseSemantics(false) { } + AttributeAssignment() : pEnumMap(nullptr), bInverseSemantics(false) { } }; protected: @@ -288,7 +288,7 @@ namespace xmloff */ void addStringProperty( const sal_Char* _pAttributeName, const OUString& _rPropertyName, - const sal_Char* _pAttributeDefault = NULL); + const sal_Char* _pAttributeDefault = nullptr); /** add a attribute assignment referring to a boolean property to the map @@ -348,7 +348,7 @@ namespace xmloff void addEnumProperty( const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_uInt16 _nAttributeDefault, const SvXMLEnumMapEntry* _pValueMap, - const ::com::sun::star::uno::Type* _pType = NULL); + const ::com::sun::star::uno::Type* _pType = nullptr); protected: /// some common code for the various add*Property methods diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx index ecaba1cfd3dd..cd40badb9e9d 100644 --- a/xmloff/source/forms/formenums.cxx +++ b/xmloff/source/forms/formenums.cxx @@ -47,21 +47,21 @@ namespace xmloff const SvXMLEnumMapEntry* OEnumMapper::s_pEnumMap[OEnumMapper::KNOWN_ENUM_PROPERTIES] = { - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr }; const SvXMLEnumMapEntry* OEnumMapper::getEnumMap(EnumProperties _eProperty) diff --git a/xmloff/source/forms/formevents.cxx b/xmloff/source/forms/formevents.cxx index 579da052a786..37ce1c5dc717 100644 --- a/xmloff/source/forms/formevents.cxx +++ b/xmloff/source/forms/formevents.cxx @@ -60,7 +60,7 @@ namespace xmloff { "XDatabaseParameterListener::approveParameter",XML_NAMESPACE_FORM, "supplyparameter" }, // "on-supplyparameter" { "XSQLErrorListener::errorOccured", XML_NAMESPACE_DOM, "error" }, // "on-error" { "XAdjustmentListener::adjustmentValueChanged",XML_NAMESPACE_FORM, "adjust" }, // "on-adjust" - { 0, 0, 0 } + { nullptr, 0, nullptr } }; const XMLEventNameTranslation* g_pFormsEventTranslation = aEventTranslations; diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx index 76971699819e..5a632c38109c 100644 --- a/xmloff/source/forms/formlayerexport.cxx +++ b/xmloff/source/forms/formlayerexport.cxx @@ -51,7 +51,7 @@ namespace xmloff OFormLayerXMLExport::~OFormLayerXMLExport() { delete m_pImpl; - m_pImpl = NULL; + m_pImpl = nullptr; } bool OFormLayerXMLExport::seekPage(const Reference< XDrawPage >& _rxDrawPage) @@ -118,7 +118,7 @@ namespace xmloff //= OOfficeFormsExport OOfficeFormsExport::OOfficeFormsExport( SvXMLExport& _rExp ) - :m_pImpl(NULL) + :m_pImpl(nullptr) { m_pImpl = new OFormsRootExport(_rExp); } diff --git a/xmloff/source/forms/formlayerimport.cxx b/xmloff/source/forms/formlayerimport.cxx index 5d496259a26e..00d64a06fe4d 100644 --- a/xmloff/source/forms/formlayerimport.cxx +++ b/xmloff/source/forms/formlayerimport.cxx @@ -33,7 +33,7 @@ namespace xmloff //= OFormLayerXMLExport OFormLayerXMLImport::OFormLayerXMLImport(SvXMLImport& _rImporter) - :m_pImpl(NULL) + :m_pImpl(nullptr) { m_pImpl = new OFormLayerXMLImport_Impl(_rImporter); } 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; diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index f0145f1d60d7..bd689f750712 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -76,7 +76,7 @@ namespace xmloff OFormLayerXMLExport_Impl::OFormLayerXMLExport_Impl(SvXMLExport& _rContext) :m_rContext(_rContext) - ,m_pControlNumberStyles(NULL) + ,m_pControlNumberStyles(nullptr) { initializePropertyMaps(); diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index 97f4592080e9..87ccd96e9077 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -71,7 +71,7 @@ using namespace ::com::sun::star::sdb; //= OFormLayerXMLImport_Impl OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter) :m_rImporter(_rImporter) - ,m_pAutoStyles(NULL) + ,m_pAutoStyles(nullptr) { // build the attribute2property map // string properties which are exported as attributes @@ -345,7 +345,7 @@ const SvXMLStyleContext* OFormLayerXMLImport_Impl::getStyleElement(const OUStrin // did you use setAutoStyleContext? const SvXMLStyleContext* pControlStyle = - m_pAutoStyles ? m_pAutoStyles->FindStyleChildContext( XML_STYLE_FAMILY_TEXT_PARAGRAPH, _rStyleName ) : NULL; + m_pAutoStyles ? m_pAutoStyles->FindStyleChildContext( XML_STYLE_FAMILY_TEXT_PARAGRAPH, _rStyleName ) : nullptr; OSL_ENSURE( pControlStyle || !m_pAutoStyles, OStringBuffer("OFormLayerXMLImport_Impl::getStyleElement: did not find the style named \"").append(OUStringToOString(_rStyleName, RTL_TEXTENCODING_ASCII_US)).append("\"!").getStr() ); return pControlStyle; @@ -482,7 +482,7 @@ SvXMLImportContext* OFormLayerXMLImport_Impl::createOfficeFormsContext( SvXMLImportContext* OFormLayerXMLImport_Impl::createContext(const sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< xml::sax::XAttributeList >&) { - SvXMLImportContext* pContext = NULL; + SvXMLImportContext* pContext = nullptr; if ( _rLocalName == "form" ) { if ( m_xCurrentPageFormsSupp.is() ) diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx index e289e78671e2..a295ae7a9a33 100644 --- a/xmloff/source/forms/officeforms.cxx +++ b/xmloff/source/forms/officeforms.cxx @@ -53,7 +53,7 @@ namespace xmloff SvXMLImportContext* OFormsRootImport::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList>& xAttrList ) { - SvXMLImportContext* pRet = 0; + SvXMLImportContext* pRet = nullptr; try { pRet = GetImport().GetFormImport()->createContext( _nPrefix, _rLocalName, xAttrList ); @@ -118,7 +118,7 @@ namespace xmloff //= OFormsRootExport OFormsRootExport::OFormsRootExport( SvXMLExport& _rExp ) - :m_pImplElement(NULL) + :m_pImplElement(nullptr) { addModelAttributes(_rExp); diff --git a/xmloff/source/forms/property_description.hxx b/xmloff/source/forms/property_description.hxx index 3d6c9be3d79c..d16e3b045294 100644 --- a/xmloff/source/forms/property_description.hxx +++ b/xmloff/source/forms/property_description.hxx @@ -86,7 +86,7 @@ namespace xmloff PropertyDescription() :propertyName() ,attribute() - ,factory( NULL ) + ,factory( nullptr ) ,propertyId( PID_INVALID ) ,propertyGroup( NO_GROUP ) { diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx index e5898f38a04b..496a929b5cc8 100644 --- a/xmloff/source/forms/property_meta_data.cxx +++ b/xmloff/source/forms/property_meta_data.cxx @@ -181,7 +181,7 @@ namespace xmloff { namespace metadata DescriptionsByName::const_iterator pos = rAllDescriptions.find( i_propertyName ); if ( pos != rAllDescriptions.end() ) return pos->second; - return NULL; + return nullptr; } void getPropertyGroup( const PropertyGroup i_propertyGroup, PropertyDescriptionList& o_propertyDescriptions ) diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index 3627dd48c487..a78c8c6bd97d 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -99,7 +99,7 @@ namespace xmloff void OPropertyExport::exportRemainingProperties() { // the properties tag (will be created if we have at least one no-default property) - SvXMLElementExport* pPropertiesTag = NULL; + SvXMLElementExport* pPropertiesTag = nullptr; try { diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx index 510eb960a4e1..c8f545ef140e 100644 --- a/xmloff/source/forms/propertyexport.hxx +++ b/xmloff/source/forms/propertyexport.hxx @@ -394,10 +394,10 @@ namespace xmloff dbg_implCheckProperty(name, &cppu::UnoType<type>::get()) #define DBG_CHECK_PROPERTY_NO_TYPE(name) \ - dbg_implCheckProperty(name, NULL) + dbg_implCheckProperty(name, nullptr) #define DBG_CHECK_PROPERTY_ASCII_NO_TYPE( name ) \ - dbg_implCheckProperty( OUString::createFromAscii( name ), NULL ) + dbg_implCheckProperty( OUString::createFromAscii( name ), nullptr ) #else #define DBG_CHECK_PROPERTY(name, type) #define DBG_CHECK_PROPERTY_NO_TYPE(name) diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index d40003387a58..7ea93ac919b2 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -379,7 +379,7 @@ SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPr void OPropertyElementsContext::Characters(const OUString& _rChars) { - OSL_ENSURE(0 == _rChars.trim(), "OPropertyElementsContext::Characters: non-whitespace characters detected!"); + OSL_ENSURE(nullptr == _rChars.trim(), "OPropertyElementsContext::Characters: non-whitespace characters detected!"); SvXMLImportContext::Characters(_rChars); } diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx index f7acc6900e35..f31defc2bad9 100644 --- a/xmloff/source/forms/propertyimport.hxx +++ b/xmloff/source/forms/propertyimport.hxx @@ -45,7 +45,7 @@ namespace xmloff static ::com::sun::star::uno::Any convertString( const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters, - const SvXMLEnumMapEntry* _pEnumMap = NULL, + const SvXMLEnumMapEntry* _pEnumMap = nullptr, const bool _bInvertBoolean = false ); diff --git a/xmloff/source/forms/valueproperties.cxx b/xmloff/source/forms/valueproperties.cxx index 28603f685f5d..8f0c542af581 100644 --- a/xmloff/source/forms/valueproperties.cxx +++ b/xmloff/source/forms/valueproperties.cxx @@ -33,7 +33,7 @@ namespace xmloff sal_Char const * & _rpCurrentValuePropertyName, sal_Char const * & _rpValuePropertyName) { // reset the pointers in case we can't determine the property names - _rpCurrentValuePropertyName = _rpValuePropertyName = NULL; + _rpCurrentValuePropertyName = _rpValuePropertyName = nullptr; switch (_nFormComponentType) { case FormComponentType::TEXTFIELD: @@ -94,7 +94,7 @@ namespace xmloff void OValuePropertiesMetaData::getValueLimitPropertyNames(sal_Int16 _nFormComponentType, sal_Char const * & _rpMinValuePropertyName, sal_Char const * & _rpMaxValuePropertyName) { - _rpMinValuePropertyName = _rpMaxValuePropertyName = NULL; + _rpMinValuePropertyName = _rpMaxValuePropertyName = nullptr; switch (_nFormComponentType) { case FormComponentType::NUMERICFIELD: @@ -129,7 +129,7 @@ namespace xmloff sal_Char const * & _rpValuePropertyName, sal_Char const * & _rpDefaultValuePropertyName ) { // reset the pointers in case we can't determine the property names - _rpValuePropertyName = _rpDefaultValuePropertyName = NULL; + _rpValuePropertyName = _rpDefaultValuePropertyName = nullptr; switch (_nFormComponentType) { case FormComponentType::TEXTFIELD: |