summaryrefslogtreecommitdiff
path: root/reportdesign/source/filter/xml
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:21:28 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:34 +0100
commite96bf3c40f945d15a8bdc9cffc27346dfb3cb246 (patch)
treef61fc8ea79d0d0dbb57bab725242145831357061 /reportdesign/source/filter/xml
parent70bd790b62f79ad8bbdccdf9c743dfca10ec19aa (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I9cace0074f2fd0e71e41779b9edd099abfa8dedc
Diffstat (limited to 'reportdesign/source/filter/xml')
-rw-r--r--reportdesign/source/filter/xml/xmlCell.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlCell.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlColumn.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlControlProperty.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlControlProperty.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlExport.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx16
-rw-r--r--reportdesign/source/filter/xml/xmlFixedContent.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlFixedContent.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlGroup.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlHelper.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx6
-rw-r--r--reportdesign/source/filter/xml/xmlMasterFields.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlReportElement.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlReportElementBase.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlSection.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlStyleImport.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlTable.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx10
-rw-r--r--reportdesign/source/filter/xml/xmlservices.cxx30
20 files changed, 50 insertions, 50 deletions
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index 84d759232626..8522e4fc387c 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -101,7 +101,7 @@ SvXMLImportContext* OXMLCell::CreateChildContext(
const OUString& _rLocalName,
const Reference< XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext = 0;
+ SvXMLImportContext *pContext = nullptr;
ORptFilter& rImport = GetOwnImport();
const SvXMLTokenMap& rTokenMap = rImport.GetCellElemTokenMap();
Reference<XMultiServiceFactory> xFactor(rImport.GetModel(),uno::UNO_QUERY);
diff --git a/reportdesign/source/filter/xml/xmlCell.hxx b/reportdesign/source/filter/xml/xmlCell.hxx
index 274c49811f25..177aa44f5d66 100644
--- a/reportdesign/source/filter/xml/xmlCell.hxx
+++ b/reportdesign/source/filter/xml/xmlCell.hxx
@@ -46,7 +46,7 @@ namespace rptxml
,const OUString& rLName
,const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList
,OXMLTable* _pContainer
- ,OXMLCell* _pCell = NULL);
+ ,OXMLCell* _pCell = nullptr);
virtual ~OXMLCell();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx
index c75a9519d356..2e1d48ae3ab0 100644
--- a/reportdesign/source/filter/xml/xmlColumn.cxx
+++ b/reportdesign/source/filter/xml/xmlColumn.cxx
@@ -86,7 +86,7 @@ SvXMLImportContext* OXMLRowColumn::CreateChildContext(
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext = 0;
+ SvXMLImportContext *pContext = nullptr;
ORptFilter& rImport = GetOwnImport();
const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap();
@@ -108,7 +108,7 @@ SvXMLImportContext* OXMLRowColumn::CreateChildContext(
break;
case XML_TOK_COV_CELL:
m_pContainer->incrementColumnIndex();
- m_pContainer->addCell(NULL);
+ m_pContainer->addCell(nullptr);
break;
default:
break;
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 00d9a4eada65..05797c5dad45 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -122,7 +122,7 @@ SvXMLImportContext* OXMLControlProperty::CreateChildContext(
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext = 0;
+ SvXMLImportContext *pContext = nullptr;
ORptFilter& rImport = GetOwnImport();
const SvXMLTokenMap& rTokenMap = rImport.GetControlPropertyElemTokenMap();
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx
index 59f3a0debb3b..dad1d316be0f 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.hxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx
@@ -49,7 +49,7 @@ namespace rptxml
,const OUString& rLName
,const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList
,const css::uno::Reference< css::beans::XPropertySet >& _xControl
- ,OXMLControlProperty* _pContainer = NULL);
+ ,OXMLControlProperty* _pContainer = nullptr);
virtual ~OXMLControlProperty();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index eca8ff0eb8f4..7da95327f7dd 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -174,7 +174,7 @@ namespace rptxml
const XMLPropertyState& /*rProperty*/,
const SvXMLUnitConverter& /*rUnitConverter*/,
const SvXMLNamespaceMap& /*rNamespaceMap*/,
- const ::std::vector< XMLPropertyState >* /*pProperties*/ = 0,
+ const ::std::vector< XMLPropertyState >* /*pProperties*/ = nullptr,
sal_uInt32 /*nIdx*/ = 0 ) const override
{
// nothing to do here
@@ -512,7 +512,7 @@ void ORptExport::collectStyleNames(sal_Int32 _nFamily,const ::std::vector< sal_I
void ORptExport::exportSectionAutoStyle(const Reference<XSection>& _xProp)
{
- OSL_ENSURE(_xProp != NULL,"Section is NULL -> GPF");
+ OSL_ENSURE(_xProp != nullptr,"Section is NULL -> GPF");
exportAutoStyle(_xProp);
Reference<XReportDefinition> xReport = _xProp->getReportDefinition();
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index 735f33d6ac64..e8be136df26d 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -85,7 +85,7 @@ ExportDocumentHandler::~ExportDocumentHandler()
{
if ( m_xProxy.is() )
{
- m_xProxy->setDelegator( NULL );
+ m_xProxy->setDelegator( nullptr );
m_xProxy.clear();
}
}
@@ -174,7 +174,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const
m_xDelegatee->startElement(lcl_createAttribute(XML_NP_OFFICE,XML_REPORT),xNewAttribs);
const OUString sTableCalc = lcl_createAttribute(XML_NP_TABLE,XML_CALCULATION_SETTINGS);
- m_xDelegatee->startElement(sTableCalc,NULL);
+ m_xDelegatee->startElement(sTableCalc,nullptr);
pList = new SvXMLAttributeList();
uno::Reference< xml::sax::XAttributeList > xNullAttr = pList;
pList->AddAttribute(lcl_createAttribute(XML_NP_TABLE,XML_DATE_VALUE),"1899-12-30");
@@ -187,7 +187,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const
}
else if ( _sName == "table:table" )
{
- m_xDelegatee->startElement(lcl_createAttribute(XML_NP_RPT,XML_DETAIL),NULL);
+ m_xDelegatee->startElement(lcl_createAttribute(XML_NP_RPT,XML_DETAIL),nullptr);
lcl_exportPrettyPrinting(m_xDelegatee);
}
else if ( _sName == "table:table-header-rows" )
@@ -362,7 +362,7 @@ uno::Sequence< uno::Type > SAL_CALL ExportDocumentHandler::getTypes( ) throw (u
void ExportDocumentHandler::exportTableRows()
{
const OUString sRow( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_ROW) );
- m_xDelegatee->startElement(sRow,NULL);
+ m_xDelegatee->startElement(sRow,nullptr);
const OUString sValueType( lcl_createAttribute(XML_NP_OFFICE, XML_VALUE_TYPE) );
@@ -396,7 +396,7 @@ void ExportDocumentHandler::exportTableRows()
pCellAtt->RemoveAttribute(sValueType);
pCellAtt->AddAttribute(sValueType,s_sFloat);
}
- m_xDelegatee->startElement(sP,NULL);
+ m_xDelegatee->startElement(sP,nullptr);
m_xDelegatee->endElement(sP);
m_xDelegatee->endElement(sCell);
}
@@ -417,10 +417,10 @@ void ExportDocumentHandler::exportTableRows()
pCellAtt->RemoveAttribute(sValueType);
pCellAtt->AddAttribute(sValueType,s_sFloat);
}
- m_xDelegatee->startElement(sP,NULL);
+ m_xDelegatee->startElement(sP,nullptr);
m_xDelegatee->startElement(sFtext,xAttribs);
- m_xDelegatee->startElement(sRElement,NULL);
- m_xDelegatee->startElement(sRComponent,NULL);
+ m_xDelegatee->startElement(sRElement,nullptr);
+ m_xDelegatee->startElement(sRComponent,nullptr);
m_xDelegatee->endElement(sRComponent);
m_xDelegatee->endElement(sRElement);
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index ee88ab298175..82df4ab0660c 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -112,7 +112,7 @@ OXMLFixedContent::OXMLFixedContent( ORptFilter& rImport,
,OXMLCell& _rCell
,OXMLTable* _pContainer
,OXMLFixedContent* _pInP) :
- OXMLReportElementBase( rImport, nPrfx, rLName,NULL,_pContainer)
+ OXMLReportElementBase( rImport, nPrfx, rLName,nullptr,_pContainer)
,m_rCell(_rCell)
,m_pInP(_pInP)
,m_bFormattedField(false)
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx b/reportdesign/source/filter/xml/xmlFixedContent.hxx
index 8dbc868b25cb..056aef5ff535 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.hxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx
@@ -48,7 +48,7 @@ namespace rptxml
const OUString& rLName
,OXMLCell& _rCell
,OXMLTable* _pContainer
- ,OXMLFixedContent* _pInP = NULL);
+ ,OXMLFixedContent* _pInP = nullptr);
virtual ~OXMLFixedContent();
// This method is called for all characters that are contained in the
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index 4dac4ddc2e61..c1d2d79a2036 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -197,7 +197,7 @@ SvXMLImportContext* OXMLGroup::CreateChildContext(
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext = 0;
+ SvXMLImportContext *pContext = nullptr;
ORptFilter& rImport = GetOwnImport();
const SvXMLTokenMap& rTokenMap = rImport.GetGroupElemTokenMap();
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index e0774bedde95..abd74a66bd57 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -70,7 +70,7 @@ OPropertyHandlerFactory::~OPropertyHandlerFactory()
const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 _nType) const
{
- const XMLPropertyHandler* pHandler = NULL;
+ const XMLPropertyHandler* pHandler = nullptr;
sal_Int32 nType = _nType;
nType &= MID_FLAG_MASK;
@@ -106,7 +106,7 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32
#define MAP_CONST_P_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010, false }
#define MAP_CONST_S( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_SECTION, context, SvtSaveOptions::ODFVER_010, false }
#define MAP_CONST_C_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, 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}
rtl::Reference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _bOldFormat, bool bForExport)
{
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index e5a8d1a8929e..b25b34c3288e 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -57,7 +57,7 @@ ImportDocumentHandler::~ImportDocumentHandler()
{
if ( m_xProxy.is() )
{
- m_xProxy->setDelegator( NULL );
+ m_xProxy->setDelegator( nullptr );
m_xProxy.clear();
}
}
@@ -203,7 +203,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const
catch(uno::Exception&)
{
}
- m_xDelegatee->startElement(lcl_createAttribute(XML_NP_OFFICE,XML_CHART),NULL);
+ m_xDelegatee->startElement(lcl_createAttribute(XML_NP_OFFICE,XML_CHART),nullptr);
bExport = false;
m_bImportedChart = true;
}
@@ -367,7 +367,7 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any >
xReceiver->attachDataProvider(m_xDatabaseDataProvider.get());
}
- m_aArguments = m_xDatabaseDataProvider->detectArguments(NULL);
+ m_aArguments = m_xDatabaseDataProvider->detectArguments(nullptr);
uno::Reference< reflection::XProxyFactory > xProxyFactory = reflection::ProxyFactory::create( m_xContext );
m_xProxy = xProxyFactory->createProxy(m_xDelegatee.get());
diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx
index 83f5c9cdafff..aefa1bdad949 100644
--- a/reportdesign/source/filter/xml/xmlMasterFields.cxx
+++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx
@@ -83,7 +83,7 @@ SvXMLImportContext* OXMLMasterFields::CreateChildContext(
const OUString& _rLocalName,
const Reference< XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext = 0;
+ SvXMLImportContext *pContext = nullptr;
const SvXMLTokenMap& rTokenMap = static_cast<ORptFilter&>(GetImport()).GetSubDocumentElemTokenMap();
switch( rTokenMap.Get( _nPrefix, _rLocalName ) )
diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx
index 197e20e660ad..16e2ba7852d5 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.cxx
@@ -89,7 +89,7 @@ SvXMLImportContext* OXMLReportElement::CreateChildContext(
const OUString& _rLocalName,
const Reference< XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext = 0;
+ SvXMLImportContext *pContext = nullptr;
ORptFilter& rImport = GetOwnImport();
const SvXMLTokenMap& rTokenMap = rImport.GetReportElementElemTokenMap();
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
index 1a536696c04e..fb0e8307903d 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
@@ -63,7 +63,7 @@ SvXMLImportContext* OXMLReportElementBase::_CreateChildContext(
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext = 0;
+ SvXMLImportContext *pContext = nullptr;
const SvXMLTokenMap& rTokenMap = m_rImport.GetControlElemTokenMap();
switch( rTokenMap.Get( nPrefix, rLocalName ) )
diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx
index 030f693c480c..0119d239f1d0 100644
--- a/reportdesign/source/filter/xml/xmlSection.cxx
+++ b/reportdesign/source/filter/xml/xmlSection.cxx
@@ -109,7 +109,7 @@ SvXMLImportContext* OXMLSection::CreateChildContext(
const OUString& _rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext = 0;
+ SvXMLImportContext *pContext = nullptr;
ORptFilter& rImport = GetOwnImport();
const SvXMLTokenMap& rTokenMap = rImport.GetSectionElemTokenMap();
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index b8a941cce8e3..9567b023f764 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -244,7 +244,7 @@ SvXMLStyleContext *OReportStylesContext::CreateDefaultStyleStyleChildContext(
sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
{
- SvXMLStyleContext *pStyle = 0;
+ SvXMLStyleContext *pStyle = nullptr;
switch( nFamily )
{
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index 2872bc382ff0..f3ef9ad8b702 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -123,7 +123,7 @@ SvXMLImportContext* OXMLTable::CreateChildContext(
const OUString& _rLocalName,
const Reference< XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext = 0;
+ SvXMLImportContext *pContext = nullptr;
ORptFilter& rImport = GetOwnImport();
const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap();
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 649bcf523dd1..a0d680b4c6db 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -205,7 +205,7 @@ sal_Int32 ReadThroughComponent(
,const uno::Reference<beans::XPropertySet>& _xProp)
{
OSL_ENSURE( xStorage.is(), "Need storage!");
- OSL_ENSURE(NULL != pStreamName, "Please, please, give me a name!");
+ OSL_ENSURE(nullptr != pStreamName, "Please, please, give me a name!");
if ( xStorage.is() )
{
@@ -222,7 +222,7 @@ sal_Int32 ReadThroughComponent(
// if no stream can be opened, return immediately with OK signal
// do we even have an alternative name?
- if ( NULL == pCompatibilityStreamName )
+ if ( nullptr == pCompatibilityStreamName )
return 0;
// if so, does the stream exist?
@@ -627,7 +627,7 @@ SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
- SvXMLImportContext *pContext = 0;
+ SvXMLImportContext *pContext = nullptr;
const SvXMLTokenMap& rTokenMap = GetDocElemTokenMap();
switch( rTokenMap.Get( nPrefix, rLocalName ) )
@@ -648,7 +648,7 @@ SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix,
pAutoStyle->FillPropertySet(getReportDefinition().get());
}
}
- pContext = new OXMLReport( *this, nPrefix, rLocalName,xAttrList,getReportDefinition(),NULL );
+ pContext = new OXMLReport( *this, nPrefix, rLocalName,xAttrList,getReportDefinition(),nullptr );
}
break;
case XML_TOK_DOC_STYLES:
@@ -1019,7 +1019,7 @@ void ORptFilter::insertFunction(const css::uno::Reference< css::report::XFunctio
SvXMLImportContext* ORptFilter::CreateMetaContext(const OUString& rLocalName,const uno::Reference<xml::sax::XAttributeList>&)
{
- SvXMLImportContext* pContext = NULL;
+ SvXMLImportContext* pContext = nullptr;
if ( (getImportFlags() & SvXMLImportFlags::META) )
{
diff --git a/reportdesign/source/filter/xml/xmlservices.cxx b/reportdesign/source/filter/xml/xmlservices.cxx
index 0bcaa49be56c..5d3724a24a10 100644
--- a/reportdesign/source/filter/xml/xmlservices.cxx
+++ b/reportdesign/source/filter/xml/xmlservices.cxx
@@ -39,35 +39,35 @@ namespace
cppu::ImplementationEntry entries[] = {
{ &ORptFilter::create, &ORptFilter::getImplementationName_Static, &ORptFilter::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, 0, 0 },
+ &cppu::createSingleComponentFactory, nullptr, 0 },
{ &ORptTypeDetection::create, &ORptTypeDetection::getImplementationName_Static, &ORptTypeDetection::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, 0, 0 },
+ &cppu::createSingleComponentFactory, nullptr, 0 },
{ &ODBFullExportHelper::create, &ODBFullExportHelper::getImplementationName_Static, &ODBFullExportHelper::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, 0, 0 },
+ &cppu::createSingleComponentFactory, nullptr, 0 },
{ &ORptExportHelper::create, &ORptExportHelper::getImplementationName_Static, &ORptExportHelper::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, 0, 0 },
+ &cppu::createSingleComponentFactory, nullptr, 0 },
{ &ORptExport::create, &ORptExport::getImplementationName_Static, &ORptExport::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, 0, 0 },
+ &cppu::createSingleComponentFactory, nullptr, 0 },
{ &ORptContentExportHelper::create, &ORptContentExportHelper::getImplementationName_Static, &ORptContentExportHelper::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, 0, 0 },
+ &cppu::createSingleComponentFactory, nullptr, 0 },
{ &ORptStylesExportHelper::create, &ORptStylesExportHelper::getImplementationName_Static, &ORptStylesExportHelper::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, 0, 0 },
+ &cppu::createSingleComponentFactory, nullptr, 0 },
{ &ORptMetaExportHelper::create, &ORptMetaExportHelper::getImplementationName_Static, &ORptMetaExportHelper::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, 0, 0 },
+ &cppu::createSingleComponentFactory, nullptr, 0 },
{ &ORptImportHelper::create, &ORptImportHelper::getImplementationName_Static, &ORptImportHelper::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, 0, 0 },
+ &cppu::createSingleComponentFactory, nullptr, 0 },
{ &ORptContentImportHelper::create, &ORptContentImportHelper::getImplementationName_Static, &ORptContentImportHelper::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, 0, 0 },
+ &cppu::createSingleComponentFactory, nullptr, 0 },
{ &ORptStylesImportHelper::create, &ORptStylesImportHelper::getImplementationName_Static, &ORptStylesImportHelper::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, 0, 0 },
+ &cppu::createSingleComponentFactory, nullptr, 0 },
{ &ExportDocumentHandler::create, &ExportDocumentHandler::getImplementationName_Static, &ExportDocumentHandler::getSupportedServiceNames_static,
- &cppu::createSingleComponentFactory, 0, 0 },
+ &cppu::createSingleComponentFactory, nullptr, 0 },
{ &ImportDocumentHandler::create, &ImportDocumentHandler::getImplementationName_Static, &ImportDocumentHandler::getSupportedServiceNames_static,
- &cppu::createSingleComponentFactory, 0, 0 },
+ &cppu::createSingleComponentFactory, nullptr, 0 },
{ &ORptMetaImportHelper::create, &ORptMetaImportHelper::getImplementationName_Static, &ORptMetaImportHelper::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, 0, 0 },
- { 0, 0, 0, 0, 0, 0 }
+ &cppu::createSingleComponentFactory, nullptr, 0 },
+ { nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
};
}