diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:21:28 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:34 +0100 |
| commit | e96bf3c40f945d15a8bdc9cffc27346dfb3cb246 (patch) | |
| tree | f61fc8ea79d0d0dbb57bab725242145831357061 | |
| parent | 70bd790b62f79ad8bbdccdf9c743dfca10ec19aa (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I9cace0074f2fd0e71e41779b9edd099abfa8dedc
62 files changed, 274 insertions, 274 deletions
diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx index c0c70c337d11..e20c526dc602 100644 --- a/reportdesign/source/core/api/Functions.cxx +++ b/reportdesign/source/core/api/Functions.cxx @@ -105,7 +105,7 @@ void SAL_CALL OFunctions::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexO ::std::advance(aPos,Index); xFunction = *aPos; m_aFunctions.erase(aPos); - xFunction->setParent(NULL); + xFunction->setParent(nullptr); } container::ContainerEvent aEvent(static_cast<container::XContainer*>(this), uno::makeAny(Index), uno::makeAny(xFunction), uno::Any()); m_aContainerListeners.notifyEach(&container::XContainerListener::elementRemoved,aEvent); diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index 9bc9fd2ee0f9..2ce1c6b477b3 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -128,7 +128,7 @@ OReportComponentProperties::~OReportComponentProperties() { if ( m_xProxy.is() ) { - m_xProxy->setDelegator( NULL ); + m_xProxy->setDelegator( nullptr ); m_xProxy.clear(); } } diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 3590f125a9ba..4cf3f71ee96b 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1523,8 +1523,8 @@ bool OReportDefinition::WriteThroughComponent( const uno::Sequence<beans::PropertyValue> & rMediaDesc, const uno::Reference<embed::XStorage>& _xStorageToSaveTo) { - OSL_ENSURE( NULL != pStreamName, "Need stream name!" ); - OSL_ENSURE( NULL != pServiceName, "Need service name!" ); + OSL_ENSURE( nullptr != pStreamName, "Need stream name!" ); + OSL_ENSURE( nullptr != pServiceName, "Need service name!" ); try { uno::Reference<embed::XStorage> xMyStorage = _xStorageToSaveTo; @@ -1582,7 +1582,7 @@ bool OReportDefinition::WriteThroughComponent( { OSL_ENSURE( xOutputStream.is(), "I really need an output stream!" ); OSL_ENSURE( xComponent.is(), "Need component!" ); - OSL_ENSURE( NULL != pServiceName, "Need component name!" ); + OSL_ENSURE( nullptr != pServiceName, "Need component name!" ); // get component uno::Reference< xml::sax::XWriter > xSaxWriter( @@ -2011,7 +2011,7 @@ uno::Sequence< sal_Int8 > SAL_CALL OReportDefinition::getImplementationId( ) th uno::Sequence< sal_Int8 > OReportDefinition::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); @@ -2480,7 +2480,7 @@ uno::Reference< embed::XStorage > OReportDefinition::getStorage() const uno::Reference< task::XInteractionHandler > OReportDefinition::getInteractionHandler() const { uno::Reference< task::XInteractionHandler > xRet( - task::InteractionHandler::createWithParent(m_aProps->m_xContext, 0), uno::UNO_QUERY_THROW); + task::InteractionHandler::createWithParent(m_aProps->m_xContext, nullptr), uno::UNO_QUERY_THROW); return xRet; } diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index cb7c7f3979be..db24846fb052 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -268,7 +268,7 @@ OUString OReportEngineJFree::getNewOutputName() // Methods uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentModel( ) throw (lang::DisposedException, lang::IllegalArgumentException, uno::Exception, uno::RuntimeException, std::exception) { - return createDocumentAlive(NULL,true); + return createDocumentAlive(nullptr,true); } uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive( const uno::Reference< frame::XFrame >& _frame ) throw (lang::DisposedException, lang::IllegalArgumentException, uno::Exception, uno::RuntimeException, std::exception) diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 4f40df5c76ca..e5f1534f4799 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -87,7 +87,7 @@ uno::Reference<report::XSection> OSection::createOSection( bool const bPageSection) { OSection *const pNew = - new OSection(xParentDef, 0, context, lcl_getAbsent(bPageSection)); + new OSection(xParentDef, nullptr, context, lcl_getAbsent(bPageSection)); pNew->init(); return pNew; } @@ -98,7 +98,7 @@ uno::Reference<report::XSection> OSection::createOSection( bool const) { OSection *const pNew = - new OSection(0, xParentGroup, context, lcl_getGroupAbsent()); + new OSection(nullptr, xParentGroup, context, lcl_getGroupAbsent()); pNew->init(); return pNew; } @@ -548,7 +548,7 @@ OSection::group(uno::Reference< drawing::XShapes > const& xShapes) // no lock because m_xDrawPage_ShapeGrouper is const return (m_xDrawPage_ShapeGrouper.is()) ? m_xDrawPage_ShapeGrouper->group(xShapes) - : 0; + : nullptr; } void SAL_CALL OSection::ungroup(uno::Reference<drawing::XShapeGroup> const& xGroup) @@ -567,7 +567,7 @@ uno::Reference<container::XNameContainer> SAL_CALL OSection::getForms() // no lock because m_xDrawPage_FormSupplier is const return (m_xDrawPage_FormSupplier.is()) ? m_xDrawPage_FormSupplier->getForms() - : 0; + : nullptr; } // XFormsSupplier2 sal_Bool SAL_CALL OSection::hasForms() throw (uno::RuntimeException, std::exception) @@ -590,7 +590,7 @@ sal_Int64 OSection::getSomething( const uno::Sequence< sal_Int8 > & rId ) throw OSection* OSection::getImplementation( const uno::Reference< uno::XInterface >& _rxComponent ) { - OSection* pContent( NULL ); + OSection* pContent( nullptr ); uno::Reference< lang::XUnoTunnel > xUnoTunnel( _rxComponent, uno::UNO_QUERY ); if ( xUnoTunnel.is() ) @@ -601,7 +601,7 @@ OSection* OSection::getImplementation( const uno::Reference< uno::XInterface >& uno::Sequence< sal_Int8 > OSection::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx index 33d441afe3a1..7f499f2ff12d 100644 --- a/reportdesign/source/core/api/services.cxx +++ b/reportdesign/source/core/api/services.cxx @@ -45,24 +45,24 @@ namespace cppu::ImplementationEntry entries[] = { { &OReportDefinition::create, &OReportDefinition::getImplementationName_Static, &OReportDefinition::getSupportedServiceNames_Static, - &cppu::createSingleComponentFactory, 0, 0 }, + &cppu::createSingleComponentFactory, nullptr, 0 }, { &OFormattedField::create, &OFormattedField::getImplementationName_Static, &OFormattedField::getSupportedServiceNames_Static, - &cppu::createSingleComponentFactory, 0, 0 }, + &cppu::createSingleComponentFactory, nullptr, 0 }, { &OFixedText::create, &OFixedText::getImplementationName_Static, &OFixedText::getSupportedServiceNames_Static, - &cppu::createSingleComponentFactory, 0, 0 }, + &cppu::createSingleComponentFactory, nullptr, 0 }, { &OImageControl::create, &OImageControl::getImplementationName_Static, &OImageControl::getSupportedServiceNames_Static, - &cppu::createSingleComponentFactory, 0, 0 }, + &cppu::createSingleComponentFactory, nullptr, 0 }, { &OFormatCondition::create, &OFormatCondition::getImplementationName_Static, &OFormatCondition::getSupportedServiceNames_Static, - &cppu::createSingleComponentFactory, 0, 0 }, + &cppu::createSingleComponentFactory, nullptr, 0 }, { &OReportEngineJFree::create, &OReportEngineJFree::getImplementationName_Static, &OReportEngineJFree::getSupportedServiceNames_Static, - &cppu::createSingleComponentFactory, 0, 0 }, + &cppu::createSingleComponentFactory, nullptr, 0 }, { &OFunction::create, &OFunction::getImplementationName_Static, &OFunction::getSupportedServiceNames_Static, - &cppu::createSingleComponentFactory, 0, 0 }, + &cppu::createSingleComponentFactory, nullptr, 0 }, { &OShape::create, &OShape::getImplementationName_Static, &OShape::getSupportedServiceNames_Static, - &cppu::createSingleComponentFactory, 0, 0 }, + &cppu::createSingleComponentFactory, nullptr, 0 }, { &OFixedLine::create, &OFixedLine::getImplementationName_Static, &OFixedLine::getSupportedServiceNames_Static, - &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } + &cppu::createSingleComponentFactory, nullptr, 0 }, + { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; } diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx index c83872fed3de..da06a0768b0b 100644 --- a/reportdesign/source/core/misc/conditionalexpression.cxx +++ b/reportdesign/source/core/misc/conditionalexpression.cxx @@ -41,7 +41,7 @@ namespace rptui sal_Int32 nPatternIndex = sExpression.indexOf( '$' ); while ( nPatternIndex > -1 ) { - const OUString* pReplace = NULL; + const OUString* pReplace = nullptr; switch ( sExpression[ nPatternIndex + 1 ] ) { case '$': pReplace = &_rFieldDataSource; break; @@ -50,7 +50,7 @@ namespace rptui default: break; } - if ( pReplace == NULL ) + if ( pReplace == nullptr ) { OSL_FAIL( "ConditionalExpression::assembleExpression: illegal pattern!" ); break; diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx index 29a3d24e7270..30bba53cfdbf 100644 --- a/reportdesign/source/core/resource/core_resource.cxx +++ b/reportdesign/source/core/resource/core_resource.cxx @@ -38,7 +38,7 @@ namespace reportdesign //= ResourceManager - SimpleResMgr* ResourceManager::m_pImpl = NULL; + SimpleResMgr* ResourceManager::m_pImpl = nullptr; ResourceManager::EnsureDelete::~EnsureDelete() diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx index 3632382f0b53..d17998f5bb09 100644 --- a/reportdesign/source/core/sdr/ModuleHelper.cxx +++ b/reportdesign/source/core/sdr/ModuleHelper.cxx @@ -56,7 +56,7 @@ public: OModuleImpl::OModuleImpl() - :m_pResources(NULL) + :m_pResources(nullptr) { } @@ -90,7 +90,7 @@ namespace } sal_Int32 OModule::s_nClients = 0; -OModuleImpl* OModule::s_pImpl = NULL; +OModuleImpl* OModule::s_pImpl = nullptr; ResMgr* OModule::getResManager() { @@ -112,7 +112,7 @@ void OModule::revokeClient() if (!--s_nClients && s_pImpl) { delete s_pImpl; - s_pImpl = NULL; + s_pImpl = nullptr; } } diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx index 6a255cf07b0a..72225117554b 100644 --- a/reportdesign/source/core/sdr/ReportDrawPage.cxx +++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx @@ -113,7 +113,7 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb * Das leere OLE-Objekt bekommt ein neues IPObj **************************************************/ pObj->SetEmptyPresObj(false); - rOle2Obj.SetOutlinerParaObject(NULL); + rOle2Obj.SetOutlinerParaObject(nullptr); rOle2Obj.SetObjRef(xObj); rOle2Obj.SetPersistName(sName); rOle2Obj.SetName(sName); diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx index f1ddef879905..cbb5a8a305bf 100644 --- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx +++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx @@ -29,11 +29,11 @@ SdrUndoAction* lcl_createUndo(SdrObject& rObject,Action _eAction,sal_uInt16 _nCo { OObjectBase* pObj = dynamic_cast<OObjectBase*>(&rObject); if ( !pObj ) - return NULL; + return nullptr; uno::Reference< report::XReportComponent> xReportComponent = pObj->getReportComponent(); uno::Reference< report::XSection> xSection = pObj->getSection(); uno::Reference< report::XGroup> xGroup = xSection->getGroup(); - SdrUndoAction* pUndo = NULL; + SdrUndoAction* pUndo = nullptr; if ( xGroup.is() ) pUndo = new OUndoGroupSectionAction(*rObject.GetModel(),_eAction,OGroupHelper::getMemberFunction(xSection),xGroup,xReportComponent,_nCommentId); else diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 9be8337c7792..2a653e195e30 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -48,8 +48,8 @@ TYPEINIT1(OReportModel,SdrModel); OReportModel::OReportModel(::reportdesign::OReportDefinition* _pReportDefinition) : - SdrModel(SvtPathOptions().GetPalettePath(),NULL,_pReportDefinition, false, false) - ,m_pController(NULL) + SdrModel(SvtPathOptions().GetPalettePath(),nullptr,_pReportDefinition, false, false) + ,m_pController(nullptr) ,m_pReportDefinition(_pReportDefinition) { m_pUndoEnv = new OXUndoEnvironment(*this); @@ -66,8 +66,8 @@ OReportModel::~OReportModel() void OReportModel::detachController() { - m_pReportDefinition = NULL; - m_pController = NULL; + m_pReportDefinition = nullptr; + m_pController = nullptr; m_pUndoEnv->EndListening( *this ); ClearUndoBuffer(); m_pUndoEnv->Clear(OXUndoEnvironment::Accessor()); @@ -76,7 +76,7 @@ void OReportModel::detachController() SdrPage* OReportModel::AllocPage(bool /*bMasterPage*/) { OSL_FAIL("Who called me!"); - return NULL; + return nullptr; } @@ -113,7 +113,7 @@ OReportPage* OReportModel::createNewPage(const uno::Reference< report::XSection OReportPage* OReportModel::getPage(const uno::Reference< report::XSection >& _xSection) { - OReportPage* pPage = NULL; + OReportPage* pPage = nullptr; sal_uInt16 nCount = GetPageCount(); for (sal_uInt16 i = 0; i < nCount && !pPage ; ++i) { diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 2f8e7b991c49..02ad7f276122 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -113,7 +113,7 @@ sal_uInt16 OObjectBase::getObjectType(const uno::Reference< report::XReportCompo SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportComponent>& _xComponent) { - SdrObject* pNewObj = NULL; + SdrObject* pNewObj = nullptr; sal_uInt16 nType = OObjectBase::getObjectType(_xComponent); switch( nType ) { diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index 387546749825..3dff18e62d73 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -61,13 +61,13 @@ OReportPage::~OReportPage() SdrPage* OReportPage::Clone() const { - return Clone(0); + return Clone(nullptr); } SdrPage* OReportPage::Clone( SdrModel* const pNewModel ) const { OReportPage *const pNewPage = new OReportPage( *this ); - OReportModel* pReportModel = 0; + OReportModel* pReportModel = nullptr; if ( pNewModel ) { pReportModel = dynamic_cast<OReportModel*>( pNewModel ); @@ -124,7 +124,7 @@ SdrObject* OReportPage::RemoveObject(size_t nObjNum) OUnoObject& rUnoObj = dynamic_cast<OUnoObject&>(*pObj); uno::Reference< container::XChild> xChild(rUnoObj.GetUnoControlModel(),uno::UNO_QUERY); if ( xChild.is() ) - xChild->setParent(NULL); + xChild->setParent(nullptr); } return pObj; } @@ -139,7 +139,7 @@ void OReportPage::insertObject(const uno::Reference< report::XReportComponent >& return; // Object already in list SvxShape* pShape = SvxShape::getImplementation( _xObject ); - OObjectBase* pObject = pShape ? dynamic_cast< OObjectBase* >( pShape->GetSdrObject() ) : NULL; + OObjectBase* pObject = pShape ? dynamic_cast< OObjectBase* >( pShape->GetSdrObject() ) : nullptr; OSL_ENSURE( pObject, "OReportPage::insertObject: no implementation object found for the given shape/component!" ); if ( pObject ) pObject->StartListening(); diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index 4a35395ffdbc..84727f79021d 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -134,7 +134,7 @@ OUndoContainerAction::~OUndoContainerAction() #if OSL_DEBUG_LEVEL > 0 SvxShape* pShape = SvxShape::getImplementation( xChild ); - SdrObject* pObject = pShape ? pShape->GetSdrObject() : NULL; + SdrObject* pObject = pShape ? pShape->GetSdrObject() : nullptr; OSL_ENSURE( pObject == nullptr || (pShape->HasSdrObjectOwnership() && !pObject->IsInserted()), "OUndoContainerAction::~OUndoContainerAction: inconsistency in the shape/object ownership!" ); #endif @@ -159,7 +159,7 @@ void OUndoContainerAction::implReInsert( ) m_xContainer->insertByIndex( m_xContainer->getCount(),uno::makeAny(m_xElement) ); } // we don't own the object anymore - m_xOwnElement = NULL; + m_xOwnElement = nullptr; } @@ -252,7 +252,7 @@ OUndoGroupSectionAction::OUndoGroupSectionAction(SdrModel& _rMod ,const uno::Reference< report::XGroup >& _xGroup ,const Reference< XInterface > & xElem ,sal_uInt16 _nCommentId) -:OUndoContainerAction(_rMod,_eAction,NULL,xElem,_nCommentId) +:OUndoContainerAction(_rMod,_eAction,nullptr,xElem,_nCommentId) ,m_aGroupHelper(_xGroup) ,m_pMemberFunction(_pMemberFunction) { @@ -271,7 +271,7 @@ void OUndoGroupSectionAction::implReInsert( ) catch(uno::Exception&){} // we don't own the object anymore - m_xOwnElement = NULL; + m_xOwnElement = nullptr; } @@ -298,7 +298,7 @@ OUndoReportSectionAction::OUndoReportSectionAction(SdrModel& _rMod ,const uno::Reference< report::XReportDefinition >& _xReport ,const Reference< XInterface > & xElem ,sal_uInt16 _nCommentId) -:OUndoContainerAction(_rMod,_eAction,NULL,xElem,_nCommentId) +:OUndoContainerAction(_rMod,_eAction,nullptr,xElem,_nCommentId) ,m_aReportHelper(_xReport) ,m_pMemberFunction(_pMemberFunction) { @@ -323,7 +323,7 @@ void OUndoReportSectionAction::implReInsert( ) } catch(uno::Exception&){} // we don't own the object anymore - m_xOwnElement = NULL; + m_xOwnElement = nullptr; } diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index 3ae3b8ea984d..b24dcb3739a5 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -317,7 +317,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv // add their undo actions out-of-order SolarMutexGuard aSolarGuard; - ORptUndoPropertyAction* pUndo = NULL; + ORptUndoPropertyAction* pUndo = nullptr; try { uno::Reference< report::XSection> xSection( xSet, uno::UNO_QUERY ); @@ -335,7 +335,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv DBG_UNHANDLED_EXCEPTION(); } - if ( pUndo == NULL ) + if ( pUndo == nullptr ) pUndo = new ORptUndoPropertyAction( m_pImpl->m_rModel, _rEvent ); m_pImpl->m_rModel.GetSdrUndoManager()->AddUndoAction( pUndo ); 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 } }; } diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 77eb178fea59..3d88444a4abf 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -165,8 +165,8 @@ OAddFieldWindow::OAddFieldWindow(vcl::Window* pParent ,m_aInsertButton(VclPtr<PushButton>::Create(this, WB_TABSTOP|WB_CENTER)) ,m_nCommandType(0) ,m_bEscapeProcessing(false) - ,m_pChangeListener(NULL) - ,m_pContainerListener(NULL) + ,m_pChangeListener(nullptr) + ,m_pContainerListener(nullptr) { SetHelpId( HID_RPT_FIELD_SEL_WIN ); SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor()) ); @@ -291,7 +291,7 @@ namespace const OUString* pEntries = _rEntries.getConstArray(); sal_Int32 nEntries = _rEntries.getLength(); for ( sal_Int32 i = 0; i < nEntries; ++i, ++pEntries ) - _rListBox.InsertEntry( *pEntries,NULL,false,TREELIST_APPEND,new ColumnInfo(*pEntries) ); + _rListBox.InsertEntry( *pEntries,nullptr,false,TREELIST_APPEND,new ColumnInfo(*pEntries) ); } void lcl_addToList( OAddFieldWindowListBox& _rListBox, const uno::Reference< container::XNameAccess>& i_xColumns ) { @@ -305,9 +305,9 @@ namespace if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) ) xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel; if ( !sLabel.isEmpty() ) - _rListBox.InsertEntry( sLabel,NULL,false,TREELIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); + _rListBox.InsertEntry( sLabel,nullptr,false,TREELIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); else - _rListBox.InsertEntry( *pEntries,NULL,false,TREELIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); + _rListBox.InsertEntry( *pEntries,nullptr,false,TREELIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); } } } @@ -319,7 +319,7 @@ void OAddFieldWindow::Update() if ( m_pContainerListener.is() ) m_pContainerListener->dispose(); - m_pContainerListener = NULL; + m_pContainerListener = nullptr; m_xColumns.clear(); try @@ -378,7 +378,7 @@ void OAddFieldWindow::Update() m_aActions->EnableItem(m_aActions->GetItemId(i)); } } - OnSelectHdl(NULL); + OnSelectHdl(nullptr); } } catch( const Exception& ) @@ -473,9 +473,9 @@ void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) ) xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel; if ( !sLabel.isEmpty() ) - m_pListBox->InsertEntry( sLabel,NULL,false,TREELIST_APPEND,new ColumnInfo(sName,sLabel) ); + m_pListBox->InsertEntry( sLabel,nullptr,false,TREELIST_APPEND,new ColumnInfo(sName,sLabel) ); else - m_pListBox->InsertEntry( sName,NULL,false,TREELIST_APPEND,new ColumnInfo(sName,sLabel) ); + m_pListBox->InsertEntry( sName,nullptr,false,TREELIST_APPEND,new ColumnInfo(sName,sLabel) ); } } } @@ -501,7 +501,7 @@ IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnSelectHdl, SvTreeListBox*, void ) IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnClickHdl, Button*, void ) { - OnDoubleClickHdl(NULL); + OnDoubleClickHdl(nullptr); } IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnDoubleClickHdl, SvTreeListBox*, bool ) @@ -532,7 +532,7 @@ IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnSortAction, ToolBox*, void ) { const sal_uInt16 nCurItem = m_aActions->GetCurItemId(); if ( SID_ADD_CONTROL_PAIR == nCurItem ) - OnDoubleClickHdl(NULL); + OnDoubleClickHdl(nullptr); else { if ( SID_FM_REMOVE_FILTER_SORT == nCurItem || !m_aActions->IsItemChecked(nCurItem) ) diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index e99a84ce22f8..175a74083f40 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -507,14 +507,14 @@ namespace rptui // determine whether the new focus window is part of an (currently invisible) condition const vcl::Window* pConditionCandidate = pGetFocusWindow->GetParent(); - const vcl::Window* pPlaygroundCandidate = pConditionCandidate ? pConditionCandidate->GetParent() : NULL; + const vcl::Window* pPlaygroundCandidate = pConditionCandidate ? pConditionCandidate->GetParent() : nullptr; while ( ( pPlaygroundCandidate ) && ( pPlaygroundCandidate != this ) && ( pPlaygroundCandidate != m_pConditionPlayground ) ) { pConditionCandidate = pConditionCandidate->GetParent(); - pPlaygroundCandidate = pConditionCandidate ? pConditionCandidate->GetParent() : NULL; + pPlaygroundCandidate = pConditionCandidate ? pConditionCandidate->GetParent() : nullptr; } if (pConditionCandidate && pPlaygroundCandidate == m_pConditionPlayground) { diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index ae3885680764..d5477f11442c 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -218,9 +218,9 @@ Condition::Condition( vcl::Window* _pParent, IConditionalFormatAction& _rAction, :VclHBox(_pParent) ,m_rController( _rController ) ,m_rAction( _rAction ) - ,m_pColorFloat(NULL) - ,m_pBtnUpdaterFontColor(NULL) - ,m_pBtnUpdaterBackgroundColor(NULL) + ,m_pColorFloat(nullptr) + ,m_pBtnUpdaterFontColor(nullptr) + ,m_pBtnUpdaterBackgroundColor(nullptr) ,m_nCondIndex( 0 ) ,m_bInDestruction( false ) { diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 98be66e4d957..dd1b33f68be5 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -52,9 +52,9 @@ FormulaDialog::FormulaDialog(vcl::Window* pParent : FormulaModalDialog( pParent, false,false,false,_pFunctionMgr.get(),this) ,m_aFunctionManager(_pFunctionMgr) ,m_pFormulaData(new FormEditData()) - ,m_pAddField(NULL) + ,m_pAddField(nullptr) ,m_xRowSet(_xRowSet) - ,m_pEdit(NULL) + ,m_pEdit(nullptr) ,m_sFormula("=") ,m_nStart(0) ,m_nEnd(1) @@ -237,7 +237,7 @@ IMPL_LINK_TYPED( FormulaDialog, OnClickHdl, OAddFieldWindow& ,_rAddFieldDlg, voi m_pEdit->SetText(sName); } } - m_pEdit = NULL; + m_pEdit = nullptr; _rAddFieldDlg.Hide(); RefInputDoneAfter( true ); } @@ -260,7 +260,7 @@ table::CellAddress FormulaDialog::getReferencePosition() const ::std::unique_ptr<formula::FormulaTokenArray> FormulaDialog::convertToTokenArray(const uno::Sequence< sheet::FormulaToken >& _aTokenList) { ::std::unique_ptr<formula::FormulaTokenArray> pArray(new FormulaTokenArray()); - pArray->Fill(_aTokenList, mrStringPool, NULL); + pArray->Fill(_aTokenList, mrStringPool, nullptr); return pArray; } diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 92be5c040b01..b32c430d6056 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -198,11 +198,11 @@ OFieldExpressionControl::OFieldExpressionControl(OGroupsSortingDialog* _pParentD BrowserMode::COLUMNSELECTION | BrowserMode::MULTISELECTION | BrowserMode::AUTOSIZE_LASTCOL | BrowserMode::KEEPHIGHLIGHT | BrowserMode::HLINES | BrowserMode::VLINES) ,m_aGroupPositions(GROUPS_START_LEN,-1) - ,m_pComboCell(NULL) + ,m_pComboCell(nullptr) ,m_nDataPos(-1) ,m_nCurrentPos(-1) - ,m_nPasteEvent(0) - ,m_nDeleteEvent(0) + ,m_nPasteEvent(nullptr) + ,m_nDeleteEvent(nullptr) ,m_pParent(_pParentDialog) ,m_bIgnoreEvent(false) ,aContainerListener(new OFieldExpressionControlContainerListener(this)) @@ -746,7 +746,7 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt) case SID_DELETE: if( m_nDeleteEvent ) Application::RemoveUserEvent( m_nDeleteEvent ); - m_nDeleteEvent = Application::PostUserEvent( LINK(this, OFieldExpressionControl, DelayedDelete), NULL, true ); + m_nDeleteEvent = Application::PostUserEvent( LINK(this, OFieldExpressionControl, DelayedDelete), nullptr, true ); break; default: break; @@ -853,13 +853,13 @@ void OFieldExpressionControl::paste() { if( m_nPasteEvent ) Application::RemoveUserEvent( m_nPasteEvent ); - m_nPasteEvent = Application::PostUserEvent( LINK(this, OFieldExpressionControl, DelayedPaste), NULL, true ); + m_nPasteEvent = Application::PostUserEvent( LINK(this, OFieldExpressionControl, DelayedPaste), nullptr, true ); } } IMPL_LINK_NOARG_TYPED( OFieldExpressionControl, DelayedPaste, void*, void ) { - m_nPasteEvent = 0; + m_nPasteEvent = nullptr; sal_Int32 nPastePosition = GetSelectRowCount() ? FirstSelectedRow() : GetCurRow(); @@ -870,7 +870,7 @@ IMPL_LINK_NOARG_TYPED( OFieldExpressionControl, DelayedPaste, void*, void ) IMPL_LINK_NOARG_TYPED( OFieldExpressionControl, DelayedDelete, void*, void ) { - m_nDeleteEvent = 0; + m_nDeleteEvent = nullptr; DeleteRows(); } @@ -943,7 +943,7 @@ OGroupsSortingDialog::OGroupsSortingDialog(vcl::Window* _pParent, bool _bReadOnl : FloatingWindow(_pParent, "FloatingSort", "modules/dbreport/ui/floatingsort.ui") , OPropertyChangeListener(m_aMutex) , m_pController(_pController) - , m_pCurrentGroupListener(NULL) + , m_pCurrentGroupListener(nullptr) , m_xGroups(m_pController->getReportDefinition()->getGroups()) , m_bReadOnly(_bReadOnly) { @@ -1036,7 +1036,7 @@ void OGroupsSortingDialog::DisplayData( sal_Int32 _nRow ) if ( m_pCurrentGroupListener.is() ) m_pCurrentGroupListener->dispose(); - m_pCurrentGroupListener = NULL; + m_pCurrentGroupListener = nullptr; if ( !bEmpty && nGroupPos != NO_GROUP ) { uno::Reference< report::XGroup> xGroup = getGroup(nGroupPos); @@ -1159,7 +1159,7 @@ IMPL_LINK_NOARG_TYPED( OGroupsSortingDialog, OnFormatAction, ToolBox*, void ) } if ( nCommand == m_nDeleteId ) { - Application::PostUserEvent( LINK(m_pFieldExpression, OFieldExpressionControl, DelayedDelete), NULL, true ); + Application::PostUserEvent( LINK(m_pFieldExpression, OFieldExpressionControl, DelayedDelete), nullptr, true ); } else { diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 216f826dddf9..1575cbcb0e6b 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -220,8 +220,8 @@ NavigatorTree::NavigatorTree( vcl::Window* pParent,OReportController& _rControll ,m_aTimerTriggered(-1,-1) ,m_aDropActionType( DA_SCROLLUP ) ,m_rController(_rController) - ,m_pMasterReport(NULL) - ,m_pDragedEntry(NULL) + ,m_pMasterReport(nullptr) + ,m_pDragedEntry(nullptr) ,m_nTimerCounter( DROP_ACTION_TIMER_INITIAL_TICKS ) { set_hexpand(true); @@ -280,13 +280,13 @@ void NavigatorTree::Command( const CommandEvent& rEvt ) case CommandEventId::ContextMenu: { // the point that was clicked on - SvTreeListEntry* ptClickedOn = NULL; + SvTreeListEntry* ptClickedOn = nullptr; ::Point aWhere; if (rEvt.IsMouseEvent()) { aWhere = rEvt.GetMousePosPixel(); ptClickedOn = GetEntry(aWhere); - if (ptClickedOn == NULL) + if (ptClickedOn == nullptr) break; if ( !IsSelected(ptClickedOn) ) { @@ -507,7 +507,7 @@ void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw ( SvTreeListEntry* NavigatorTree::insertEntry(const OUString& _sName,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData) { - SvTreeListEntry* pEntry = NULL; + SvTreeListEntry* pEntry = nullptr; if ( _nImageId ) { const Image aImage( m_aNavigatorImages.GetImage( _nImageId ) ); @@ -550,7 +550,7 @@ void NavigatorTree::traverseFunctions(const uno::Reference< report::XFunctions>& SvTreeListEntry* NavigatorTree::find(const uno::Reference< uno::XInterface >& _xContent) { - SvTreeListEntry* pRet = NULL; + SvTreeListEntry* pRet = nullptr; if ( _xContent.is() ) { SvTreeListEntry* pCurrent = First(); diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index f900cfaa8404..2651ef18bd59 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -48,21 +48,21 @@ ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, c if (rDialog == "BackgroundDialog") { - AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); + AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), nullptr ); } else if (rDialog == "PageDialog") { - AddTabPage("page", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), 0 ); - AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); + AddTabPage("page", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), nullptr ); + AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), nullptr ); } else if (rDialog == "CharDialog") { - AddTabPage("font", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), 0 ); - AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 ); - AddTabPage("position", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), 0 ); - AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), 0 ); - m_nCharBgdId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); - AddTabPage("alignment", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), 0 ); + AddTabPage("font", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), nullptr ); + AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), nullptr ); + AddTabPage("position", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), nullptr ); + AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), nullptr ); + m_nCharBgdId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), nullptr ); + AddTabPage("alignment", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), nullptr ); } else OSL_FAIL("Unknown page id"); diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index f8183cc07210..227df6b477e6 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -99,8 +99,8 @@ public: // IControlReferenceHandler virtual void ShowReference(const OUString& _sRef) override; virtual void HideReference( bool bDoneRefMode = true ) override; - virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) override; - virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) override; + virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = nullptr ) override; + virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = nullptr ) override; }; diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx index 74e86a8e072c..cc0f8cae4e82 100644 --- a/reportdesign/source/ui/inc/UITools.hxx +++ b/reportdesign/source/ui/inc/UITools.hxx @@ -138,7 +138,7 @@ namespace rptui * \param _bAllObjects if <TRUE/> all objects are taken into account, otherwise only not marked ones * \return the object which is overlapped, otherwise <NULL/> */ - SdrObject* isOver(const Rectangle& _rRect,SdrPage& _rPage,SdrView& _rView,bool _bAllObjects = false,SdrObject* _pIgnore = NULL, sal_Int16 _nIgnoreType=0); + SdrObject* isOver(const Rectangle& _rRect,SdrPage& _rPage,SdrView& _rView,bool _bAllObjects = false,SdrObject* _pIgnore = nullptr, sal_Int16 _nIgnoreType=0); SdrObject* isOver(const Rectangle& _rRect,SdrPage& _rPage,SdrView& _rView,bool _bAllObjects, SdrUnoObj* _pIgnoreList[], int _nIgnoreListLength); diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index ee5ecf74d270..29b50ab86882 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -262,7 +262,7 @@ namespace rptui /** returns the current position in the list */ - sal_uInt16 getPosition(const OSectionWindow* _pSectionWindow = NULL) const; + sal_uInt16 getPosition(const OSectionWindow* _pSectionWindow = nullptr) const; /** calls on every section BrkAction * diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index 031f74a9669a..e8cf8cf221e4 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -89,7 +89,7 @@ namespace rptui DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 ) sal_uInt16 OPropertyInfoService::s_nCount = 0; - OPropertyInfoImpl* OPropertyInfoService::s_pPropertyInfos = NULL; + OPropertyInfoImpl* OPropertyInfoService::s_pPropertyInfos = nullptr; const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo() { @@ -197,7 +197,7 @@ namespace rptui if ( ( pPropInfo < s_pPropertyInfos + s_nCount ) && pPropInfo->sName == _rName ) return pPropInfo; - return NULL; + return nullptr; } @@ -213,7 +213,7 @@ namespace rptui if (s_pPropertyInfos[i].nId == _nId) return &s_pPropertyInfos[i]; - return NULL; + return nullptr; } diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index e8ba532fb7fe..c7f134d220da 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -136,7 +136,7 @@ OSectionUndo::~OSectionUndo() #if OSL_DEBUG_LEVEL > 0 SvxShape* pShape = SvxShape::getImplementation( xShape ); - SdrObject* pObject = pShape ? pShape->GetSdrObject() : NULL; + SdrObject* pObject = pShape ? pShape->GetSdrObject() : nullptr; OSL_ENSURE( pShape && pShape->HasSdrObjectOwnership() && pObject && !pObject->IsInserted(), "OSectionUndo::~OSectionUndo: inconsistency in the shape/object ownership!" ); #endif diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index a769f7458d9d..083d42a8cc50 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -178,7 +178,7 @@ void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32 ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> addStyleListener(const uno::Reference< report::XReportDefinition >& _xReportDefinition,::comphelper::OPropertyChangeListener* _pListener) { - ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> pRet = NULL; + ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> pRet = nullptr; if ( _xReportDefinition.is() ) { uno::Reference<beans::XPropertySet> xPageStyle(getUsedStyle(_xReportDefinition),uno::UNO_QUERY); @@ -377,7 +377,7 @@ namespace sal_uInt16 _nFont, sal_uInt16 _nFontHeight,sal_uInt16 _nPosture, sal_uInt16 _nWeight) { vcl::Font aNewFont( _rOriginalFont ); - const SfxPoolItem* pItem( NULL ); + const SfxPoolItem* pItem( nullptr ); if ( SfxItemState::SET == _rItemSet.GetItemState( _nFont,true,&pItem) && dynamic_cast< const SvxFontItem *>( pItem ) != nullptr) { const SvxFontItem* pFontItem = static_cast<const SvxFontItem*>(pItem); @@ -440,7 +440,7 @@ namespace void lcl_itemsToCharProperties( const vcl::Font& _rOriginalControlFont,const vcl::Font& _rOriginalControlFontAsian,const vcl::Font& _rOriginalControlFontComplex, const SfxItemSet& _rItemSet, uno::Sequence< beans::NamedValue >& _out_rProperties ) { - const SfxPoolItem* pItem( NULL ); + const SfxPoolItem* pItem( nullptr ); // create an AWT font awt::FontDescriptor aAwtFont; @@ -834,7 +834,7 @@ void applyCharacterSettings( const uno::Reference< report::XReportControlFormat void notifySystemWindow(vcl::Window* _pWindow, vcl::Window* _pToRegister, const ::comphelper::mem_fun1_t<TaskPaneList,vcl::Window*>& rMemFunc) { OSL_ENSURE(_pWindow,"Window can not be null!"); - SystemWindow* pSystemWindow = _pWindow ? _pWindow->GetSystemWindow() : NULL; + SystemWindow* pSystemWindow = _pWindow ? _pWindow->GetSystemWindow() : nullptr; if ( pSystemWindow ) { rMemFunc( pSystemWindow->GetTaskPaneList(), _pToRegister ); @@ -843,22 +843,22 @@ void notifySystemWindow(vcl::Window* _pWindow, vcl::Window* _pToRegister, const SdrObject* isOver(const Rectangle& _rRect, SdrPage& _rPage, SdrView& _rView, bool _bAllObjects, SdrObject* _pIgnore, sal_Int16 _nIgnoreType) { - SdrObject* pOverlappedObj = NULL; + SdrObject* pOverlappedObj = nullptr; SdrObjListIter aIter(_rPage,IM_DEEPNOGROUPS); - SdrObject* pObjIter = NULL; + SdrObject* pObjIter = nullptr; - while( !pOverlappedObj && (pObjIter = aIter.Next()) != NULL ) + while( !pOverlappedObj && (pObjIter = aIter.Next()) != nullptr ) { if ( _pIgnore != pObjIter && (_bAllObjects || !_rView.IsObjMarked(pObjIter)) - && (dynamic_cast<OUnoObject*>(pObjIter) != NULL || dynamic_cast<OOle2Obj*>(pObjIter) != NULL)) + && (dynamic_cast<OUnoObject*>(pObjIter) != nullptr || dynamic_cast<OOle2Obj*>(pObjIter) != nullptr)) { if (_nIgnoreType == ISOVER_IGNORE_CUSTOMSHAPES && pObjIter->GetObjIdentifier() == OBJ_CUSTOMSHAPE) { continue; } - if (dynamic_cast<OUnoObject*>(pObjIter) != NULL || dynamic_cast<OOle2Obj*>(pObjIter) != NULL) + if (dynamic_cast<OUnoObject*>(pObjIter) != nullptr || dynamic_cast<OOle2Obj*>(pObjIter) != nullptr) { Rectangle aRect = _rRect.GetIntersection(pObjIter->GetLastBoundRect()); if ( !aRect.IsEmpty() && (aRect.Left() != aRect.Right() && aRect.Top() != aRect.Bottom() ) ) @@ -884,11 +884,11 @@ bool checkArrayForOccurrence(SdrObject* _pObjToCheck, SdrUnoObj* _pIgnore[], int SdrObject* isOver(const Rectangle& _rRect,SdrPage& _rPage,SdrView& _rView,bool _bAllObjects, SdrUnoObj * _pIgnoreList[], int _nIgnoreListLength) { - SdrObject* pOverlappedObj = NULL; + SdrObject* pOverlappedObj = nullptr; SdrObjListIter aIter(_rPage,IM_DEEPNOGROUPS); - SdrObject* pObjIter = NULL; + SdrObject* pObjIter = nullptr; - while( !pOverlappedObj && (pObjIter = aIter.Next()) != NULL ) + while( !pOverlappedObj && (pObjIter = aIter.Next()) != nullptr ) { if (checkArrayForOccurrence(pObjIter, _pIgnoreList, _nIgnoreListLength)) { @@ -896,7 +896,7 @@ SdrObject* isOver(const Rectangle& _rRect,SdrPage& _rPage,SdrView& _rView,bool _ } if ( (_bAllObjects || !_rView.IsObjMarked(pObjIter)) - && (dynamic_cast<OUnoObject*>(pObjIter) != NULL || dynamic_cast<OOle2Obj*>(pObjIter) != NULL) ) + && (dynamic_cast<OUnoObject*>(pObjIter) != nullptr || dynamic_cast<OOle2Obj*>(pObjIter) != nullptr) ) { Rectangle aRect = _rRect.GetIntersection(pObjIter->GetLastBoundRect()); if ( !aRect.IsEmpty() && (aRect.Left() != aRect.Right() && aRect.Top() != aRect.Bottom() ) ) @@ -909,8 +909,8 @@ SdrObject* isOver(const Rectangle& _rRect,SdrPage& _rPage,SdrView& _rView,bool _ SdrObject* isOver(SdrObject* _pObj,SdrPage& _rPage,SdrView& _rView,bool _bUnMarkedObjects) { - SdrObject* pOverlappedObj = NULL; - if (dynamic_cast<OUnoObject*>(_pObj) != NULL || dynamic_cast<OOle2Obj*>(_pObj) != NULL) // this doesn't need to be done for shapes + SdrObject* pOverlappedObj = nullptr; + if (dynamic_cast<OUnoObject*>(_pObj) != nullptr || dynamic_cast<OOle2Obj*>(_pObj) != nullptr) // this doesn't need to be done for shapes { Rectangle aRect = _pObj->GetCurrentBoundRect(); pOverlappedObj = isOver(aRect,_rPage,_rView,_bUnMarkedObjects,_pObj); @@ -977,7 +977,7 @@ void correctOverlapping(SdrObject* _pControl,OReportSection& _aReportSection,boo while ( bOverlapping ) { SdrObject* pOverlappedObj = isOver(aRect,*_aReportSection.getPage(),rSectionView,true, _pControl); - bOverlapping = pOverlappedObj != NULL; + bOverlapping = pOverlappedObj != nullptr; if ( bOverlapping ) { const Rectangle& aLogicRect = pOverlappedObj->GetLogicRect(); diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx index 67964880152a..2715df93b3b9 100644 --- a/reportdesign/source/ui/misc/rptuiservices.cxx +++ b/reportdesign/source/ui/misc/rptuiservices.cxx @@ -42,20 +42,20 @@ namespace cppu::ImplementationEntry entries[] = { { &OReportController::create, &OReportController::getImplementationName_Static, &OReportController::getSupportedServiceNames_Static, - &cppu::createSingleComponentFactory, 0, 0 }, + &cppu::createSingleComponentFactory, nullptr, 0 }, { &OToolboxController::create, &OToolboxController::getImplementationName_Static, &OToolboxController::getSupportedServiceNames_Static, - &cppu::createSingleComponentFactory, 0, 0 }, + &cppu::createSingleComponentFactory, nullptr, 0 }, { &OStatusbarController::create, &OStatusbarController::getImplementationName_Static, &OStatusbarController::getSupportedServiceNames_Static, - &cppu::createSingleComponentFactory, 0, 0 }, + &cppu::createSingleComponentFactory, nullptr, 0 }, { &DefaultComponentInspectorModel::create, &DefaultComponentInspectorModel::getImplementationName_Static, &DefaultComponentInspectorModel::getSupportedServiceNames_static, - &cppu::createSingleComponentFactory, 0, 0 }, + &cppu::createSingleComponentFactory, nullptr, 0 }, { &ReportComponentHandler::create, &ReportComponentHandler::getImplementationName_Static, &ReportComponentHandler::getSupportedServiceNames_static, - &cppu::createSingleComponentFactory, 0, 0 }, + &cppu::createSingleComponentFactory, nullptr, 0 }, { &GeometryHandler::create, &GeometryHandler::getImplementationName_Static, &GeometryHandler::getSupportedServiceNames_static, - &cppu::createSingleComponentFactory, 0, 0 }, + &cppu::createSingleComponentFactory, nullptr, 0 }, { &DataProviderHandler::create, &DataProviderHandler::getImplementationName_Static, &DataProviderHandler::getSupportedServiceNames_static, - &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } + &cppu::createSingleComponentFactory, nullptr, 0 }, + { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; } diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index dec013cbed3b..4bd397eba5b7 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -100,7 +100,7 @@ void SAL_CALL OStatusbarController::initialize( const Sequence< Any >& _rArgumen } } - SfxStatusBarControl *pController = 0; + SfxStatusBarControl *pController = nullptr; if ( m_aCommandURL == ".uno:ZoomSlider" ) { pController = new SvxZoomSliderControl(m_nSlotId = SID_ATTR_ZOOMSLIDER,m_nId,*pStatusBar); diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index f7b9ebd041d8..d13d1956e848 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -87,7 +87,7 @@ Reference< XInterface > OToolboxController::create(Reference< XComponentContext } OToolboxController::OToolboxController(const Reference< XComponentContext >& _rxORB) - : m_pToolbarController(NULL) + : m_pToolbarController(nullptr) ,m_nToolBoxId(1) ,m_nSlotId(0) { diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 33323495360e..b15399dcf340 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -61,7 +61,7 @@ class OTaskWindow : public vcl::Window { VclPtr<PropBrw> m_pPropWin; public: - explicit OTaskWindow(vcl::Window* _pParent) : Window(_pParent),m_pPropWin(NULL){} + explicit OTaskWindow(vcl::Window* _pParent) : Window(_pParent),m_pPropWin(nullptr){} virtual ~OTaskWindow() { disposeOnce(); } virtual void dispose() override { m_pPropWin.clear(); vcl::Window::dispose(); } @@ -89,10 +89,10 @@ ODesignView::ODesignView( vcl::Window* pParent, ,m_aSplitWin(VclPtr<SplitWindow>::Create(this)) ,m_rReportController( _rController ) ,m_aScrollWindow(VclPtr<rptui::OScrollWindowHelper>::Create(this)) - ,m_pPropWin(NULL) - ,m_pAddField(NULL) - ,m_pCurrentView(NULL) - ,m_pReportExplorer(NULL) + ,m_pPropWin(nullptr) + ,m_pAddField(nullptr) + ,m_pCurrentView(nullptr) + ,m_pReportExplorer(nullptr) ,m_eMode( RPTUI_SELECT ) ,m_eActObj( OBJ_NONE ) ,m_aGridSizeCoarse( 1000, 1000 ) // #i93595# 100TH_MM changed to grid using coarse 1 cm grid @@ -465,7 +465,7 @@ void ODesignView::showProperties(const uno::Reference< uno::XInterface>& _xRepor m_xReportComponent = _xReportComponent; if ( m_pCurrentView ) m_aScrollWindow->setMarked(m_pCurrentView,false); - m_pCurrentView = NULL; + m_pCurrentView = nullptr; m_aMarkIdle.Start(); } } @@ -607,7 +607,7 @@ void ODesignView::setMarked(const uno::Reference< report::XSection>& _xSection,b if ( _bMark ) UpdatePropertyBrowserDelayed(getMarkedSection()->getReportSection().getSectionView()); else - m_pCurrentView = NULL; + m_pCurrentView = nullptr; } void ODesignView::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _aShapes,bool _bMark) diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx index a55c8d193dad..b0ef99ae216a 100644 --- a/reportdesign/source/ui/report/FixedTextColor.cxx +++ b/reportdesign/source/ui/report/FixedTextColor.cxx @@ -172,7 +172,7 @@ namespace rptui if ( pUnoObj ) // this doesn't need to be done for shapes { OSectionWindow* pSectionWindow = pController->getSectionWindow(xSection); - if (pSectionWindow != 0) + if (pSectionWindow != nullptr) { OReportSection& aOutputDevice = pSectionWindow->getReportSection(); // OutputDevice OSectionView& aSdrView = aOutputDevice.getSectionView(); // SdrView diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index 10736ae36814..ab8d82491255 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -173,7 +173,7 @@ namespace rptui if ( pUnoObj ) // this doesn't need to be done for shapes { OSectionWindow* pSectionWindow = m_rReportController.getSectionWindow(xSection); - if (pSectionWindow != 0) + if (pSectionWindow != nullptr) { OReportSection& aOutputDevice = pSectionWindow->getReportSection(); // OutputDevice OSectionView& aSdrView = aOutputDevice.getSectionView(); // SdrView diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index b537e8718594..6126c03cb709 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -289,8 +289,8 @@ OReportController::OReportController(Reference< XComponentContext > const & xCon :OReportController_BASE(xContext) ,OPropertyStateContainer(OGenericUnoController_Base::rBHelper) ,m_aSelectionListeners( getMutex() ) - ,m_pClipbordNotifier(NULL) - ,m_pGroupsFloater(NULL) + ,m_pClipbordNotifier(nullptr) + ,m_pGroupsFloater(nullptr) ,m_sMode("normal") ,m_nSplitPos(-1) ,m_nPageNum(-1) @@ -332,7 +332,7 @@ void OReportController::disposing() m_pClipbordNotifier->ClearCallbackLink(); m_pClipbordNotifier->AddRemoveListener( getView(), false ); m_pClipbordNotifier->release(); - m_pClipbordNotifier = NULL; + m_pClipbordNotifier = nullptr; } if ( m_pGroupsFloater ) { @@ -360,7 +360,7 @@ void OReportController::disposing() { try { - OSectionWindow* pSectionWindow = NULL; + OSectionWindow* pSectionWindow = nullptr; if ( getDesignView() ) pSectionWindow = getDesignView()->getMarkedSection(); if ( pSectionWindow ) @@ -549,7 +549,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const case SID_SELECTALL_IN_SECTION: aReturn.bEnabled = !getDesignView()->isHandleEvent(_nId); if ( aReturn.bEnabled ) - aReturn.bEnabled = getCurrentSectionView() != NULL; + aReturn.bEnabled = getCurrentSectionView() != nullptr; break; case SID_ESCAPE: aReturn.bEnabled = getDesignView()->GetMode() == RPTUI_INSERT; @@ -1703,7 +1703,7 @@ void OReportController::impl_initialize( ) getDesignView()->showRuler(m_bShowRuler); getDesignView()->togglePropertyBrowser(m_bShowProperties); getDesignView()->setCurrentPage(m_sLastActivePage); - getDesignView()->unmarkAllObjects(NULL); + getDesignView()->unmarkAllObjects(nullptr); if ( m_nPageNum != -1 ) { @@ -2497,7 +2497,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ uno::Reference< beans::XPropertySet> xProp(getUsedStyle(m_xReportDefinition),uno::UNO_QUERY_THROW); const OUString sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEPAGE)); UndoContext aUndoContext( getUndoManager(), sUndoAction ); - const SfxPoolItem* pItem = NULL; + const SfxPoolItem* pItem = nullptr; if ( SfxItemState::SET == pSet->GetItemState( RPTUI_ID_SIZE,true,&pItem)) { uno::Any aValue; @@ -3077,7 +3077,7 @@ sal_Bool SAL_CALL OReportController::select( const Any& aSelection ) throw (Ille bool bRet = true; if ( getDesignView() ) { - getDesignView()->unmarkAllObjects(NULL); + getDesignView()->unmarkAllObjects(nullptr); getDesignView()->SetMode(RPTUI_SELECT); uno::Sequence< uno::Reference<report::XReportComponent> > aElements; @@ -3166,7 +3166,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co if ( aPos.X < nLeftMargin ) aPos.X = nLeftMargin; - SdrObject* pNewControl = NULL; + SdrObject* pNewControl = nullptr; uno::Reference< report::XReportComponent> xShapeProp; if ( _nObjectId == OBJ_CUSTOMSHAPE ) { @@ -3192,12 +3192,12 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co } else { - SdrUnoObj* pLabel( NULL ); - SdrUnoObj* pControl( NULL ); + SdrUnoObj* pLabel( nullptr ); + SdrUnoObj* pControl( nullptr ); FmFormView::createControlLabelPair( getDesignView() ,nLeftMargin,0 - ,NULL,NULL,_nObjectId,OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT, - NULL,pSectionWindow->getReportSection().getPage(),m_aReportModel.get(), + ,nullptr,nullptr,_nObjectId,OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT, + nullptr,pSectionWindow->getReportSection().getPage(),m_aReportModel.get(), pLabel,pControl); delete pLabel; @@ -3270,7 +3270,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs) { - getDesignView()->unmarkAllObjects(NULL); + getDesignView()->unmarkAllObjects(nullptr); const OUString sUndoAction(ModuleRes(RID_STR_UNDO_INSERT_CONTROL)); UndoContext aUndoContext( getUndoManager(), sUndoAction ); @@ -3298,7 +3298,7 @@ void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs) void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs) { - getDesignView()->unmarkAllObjects(NULL); + getDesignView()->unmarkAllObjects(nullptr); const OUString sUndoAction(ModuleRes(RID_STR_UNDO_INSERT_CONTROL)); UndoContext aUndoContext( getUndoManager(), sUndoAction ); @@ -3328,7 +3328,7 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) { - getDesignView()->unmarkAllObjects(NULL); + getDesignView()->unmarkAllObjects(nullptr); // Anhand des FormatKeys wird festgestellt, welches Feld benoetigt wird OSectionWindow* pSectionWindow[2]; @@ -3386,7 +3386,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) } } // clear all selections - getDesignView()->unmarkAllObjects(NULL); + getDesignView()->unmarkAllObjects(nullptr); uno::Reference< beans::XPropertySet > xField( aDescriptor[ svx::daColumnObject ], uno::UNO_QUERY ); uno::Reference< lang::XComponent > xHoldAlive; @@ -3481,8 +3481,8 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) Reference< XNumberFormats > xNumberFormats(xSupplier->getNumberFormats()); SdrUnoObj* pControl[2]; - pControl[0] = NULL; - pControl[1] = NULL; + pControl[0] = nullptr; + pControl[1] = nullptr; const sal_Int32 nRightMargin = getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_RIGHTMARGIN); const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(m_xReportDefinition,PROPERTY_PAPERSIZE).Width - nRightMargin; OSectionView* pSectionViews[2]; @@ -3603,7 +3603,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) while ( bOverlapping ) { const SdrObject* pOverlappedObj = isOver(aLabelAndTextfield, *pSectionWindow[0]->getReportSection().getPage(), *pSectionViews[0], true, pControl, 2); - bOverlapping = pOverlappedObj != NULL; + bOverlapping = pOverlappedObj != nullptr; if ( bOverlapping ) { const Rectangle& aLogicRect = pOverlappedObj->GetLogicRect(); @@ -3644,7 +3644,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) OSectionView* OReportController::getCurrentSectionView() const { - OSectionView* pSectionView = NULL; + OSectionView* pSectionView = nullptr; OSectionWindow* pSectionWindow = getDesignView()->getMarkedSection(); if ( pSectionWindow ) pSectionView = &pSectionWindow->getReportSection().getSectionView(); @@ -4003,7 +4003,7 @@ void OReportController::createDefaultControl(const uno::Sequence< beans::Propert if ( pKeyModifier == pEnd || ((pKeyModifier->Value >>= nKeyModifier) && nKeyModifier == KEY_MOD1) ) { Sequence< PropertyValue > aCreateArgs; - getDesignView()->unmarkAllObjects(NULL); + getDesignView()->unmarkAllObjects(nullptr); createControl(aCreateArgs,xSection,OUString(),getDesignView()->GetInsertObj()); } } @@ -4221,7 +4221,7 @@ OSectionWindow* OReportController::getSectionWindow(const css::uno::Reference< c } // throw NullPointerException? - return NULL; + return nullptr; } @@ -4255,7 +4255,7 @@ void OReportController::openZoomDialog() aZoomItem.SetValueSet(SvxZoomEnableFlags::N100|SvxZoomEnableFlags::WHOLEPAGE|SvxZoomEnableFlags::PAGEWIDTH); pDescriptor->Put(aZoomItem); - ::std::unique_ptr<AbstractSvxZoomDialog> pDlg( pFact->CreateSvxZoomDialog(NULL, *pDescriptor.get()) ); + ::std::unique_ptr<AbstractSvxZoomDialog> pDlg( pFact->CreateSvxZoomDialog(nullptr, *pDescriptor.get()) ); pDlg->SetLimits( 20, 400 ); bool bCancel = ( RET_CANCEL == pDlg->Execute() ); @@ -4376,7 +4376,7 @@ SfxUndoManager& OReportController::getUndoManager() const ENSURE_OR_THROW( !!pReportModel, "no access to our model" ); SfxUndoManager* pUndoManager( pReportModel->GetSdrUndoManager() ); - ENSURE_OR_THROW( pUndoManager != NULL, "no access to our model's UndoManager" ); + ENSURE_OR_THROW( pUndoManager != nullptr, "no access to our model's UndoManager" ); return *pUndoManager; } diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 7c5ef02e97b4..b08e4e62a2af 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -79,11 +79,11 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re : Window(_pParent,WB_DIALOGCONTROL) , ::comphelper::OPropertyChangeListener(m_aMutex) , DropTargetHelper(this) - , m_pPage(NULL) - , m_pView(NULL) + , m_pPage(nullptr) + , m_pView(nullptr) , m_pParent(_pParent) - , m_pMulti(NULL) - , m_pReportListener(NULL) + , m_pMulti(nullptr) + , m_pReportListener(nullptr) , m_xSection(_xSection) , m_nPaintEntranceCount(0) , m_eMode(RPTUI_SELECT) @@ -115,7 +115,7 @@ OReportSection::~OReportSection() void OReportSection::dispose() { - m_pPage = NULL; + m_pPage = nullptr; if ( m_pMulti.is() ) m_pMulti->dispose(); @@ -127,7 +127,7 @@ void OReportSection::dispose() ::std::unique_ptr<OSectionView> aTemp( m_pView); if ( m_pView ) m_pView->EndListening( *m_pModel ); - m_pView = NULL; + m_pView = nullptr; } m_pParent.clear(); vcl::Window::dispose(); @@ -145,7 +145,7 @@ void OReportSection::Paint( vcl::RenderContext& rRenderContext, const Rectangle& const vcl::Region aPaintRectRegion(rRect); // #i74769# - SdrPaintWindow* pTargetPaintWindow = 0; + SdrPaintWindow* pTargetPaintWindow = nullptr; // mark repaint start if (pPgView) @@ -264,7 +264,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC for (;pCopiesIter != pCopiesEnd ; ++pCopiesIter) { SvxShape* pShape = SvxShape::getImplementation( *pCopiesIter ); - SdrObject* pObject = pShape ? pShape->GetSdrObject() : NULL; + SdrObject* pObject = pShape ? pShape->GetSdrObject() : nullptr; if ( pObject ) { SdrObject* pNeuObj = pObject->Clone(); @@ -280,7 +280,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC bool bOverlapping = true; while ( bOverlapping ) { - bOverlapping = isOver(aRet,*m_pPage,*m_pView,true,pNeuObj) != NULL; + bOverlapping = isOver(aRet,*m_pPage,*m_pView,true,pNeuObj) != nullptr; if ( bOverlapping ) { aRet.Move(0,aRet.getHeight()+1); @@ -424,8 +424,8 @@ void OReportSection::SelectAll(const sal_uInt16 _nObjectType) { m_pView->UnmarkAll(); SdrObjListIter aIter(*m_pPage,IM_DEEPNOGROUPS); - SdrObject* pObjIter = NULL; - while( (pObjIter = aIter.Next()) != NULL ) + SdrObject* pObjIter = nullptr; + while( (pObjIter = aIter.Next()) != nullptr ) { if ( pObjIter->GetObjIdentifier() == _nObjectType ) m_pView->MarkObj( pObjIter, m_pView->GetSdrPageView() ); @@ -552,7 +552,7 @@ void OReportSection::impl_adjustObjectSizePosition(sal_Int32 i_nPaperWidth,sal_I awt::Point aPos = xReportComponent->getPosition(); awt::Size aSize = xReportComponent->getSize(); SvxShape* pShape = SvxShape::getImplementation( xReportComponent ); - SdrObject* pObject = pShape ? pShape->GetSdrObject() : NULL; + SdrObject* pObject = pShape ? pShape->GetSdrObject() : nullptr; if ( pObject ) { bool bChanged = false; @@ -636,7 +636,7 @@ void OReportSection::createDefault(const OUString& _sType,SdrObject* _pObj) { if ( aIter->equalsIgnoreAsciiCase( _sType ) ) { - OReportModel aReportModel(NULL); + OReportModel aReportModel(nullptr); SfxItemPool& rPool = aReportModel.GetItemPool(); rPool.FreezeIdRanges(); if ( GalleryExplorer::GetSdrObj( GALLERY_THEME_POWERPOINT, i, &aReportModel ) ) diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index 2957c0d92e01..b91cf7e40d09 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -51,7 +51,7 @@ OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView) ,m_aCornerWin( VclPtr<ScrollBarBox>::Create(this) ) ,m_pParent(_pDesignView) ,m_aReportWindow(VclPtr<rptui::OReportWindow>::Create(this,m_pParent)) - ,m_pReportDefinitionMultiPlexer(NULL) + ,m_pReportDefinitionMultiPlexer(nullptr) { SetMapMode( MapMode( MAP_100TH_MM ) ); @@ -333,8 +333,8 @@ bool OScrollWindowHelper::Notify( NotifyEvent& rNEvt ) (pCommandEvent->GetCommand() == CommandEventId::StartAutoScroll) || (pCommandEvent->GetCommand() == CommandEventId::AutoScroll))) ) { - ScrollBar* pHScrBar = NULL; - ScrollBar* pVScrBar = NULL; + ScrollBar* pHScrBar = nullptr; + ScrollBar* pVScrBar = nullptr; if ( m_aHScroll->IsVisible() ) pHScrBar = m_aHScroll.get(); diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 9f1f77041b01..6cc0ea141434 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -41,8 +41,8 @@ namespace rptui { -Image* OStartMarker::s_pDefCollapsed = NULL; -Image* OStartMarker::s_pDefExpanded = NULL; +Image* OStartMarker::s_pDefCollapsed = nullptr; +Image* OStartMarker::s_pDefExpanded = nullptr; oslInterlockedCount OStartMarker::s_nImageRefCount = 0; diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 5e8205d90a43..c85872e0b3d9 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -63,7 +63,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd if ( bMoveAllowed ) { Rectangle aNewRect = _aObjRect; - SdrObject* pOverlappedObj = NULL; + SdrObject* pOverlappedObj = nullptr; do { aNewRect = _aObjRect; @@ -78,7 +78,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd aNewRect.Move(_nXMov,_nYMov); break; } - if (dynamic_cast<OUnoObject*>(_pObj) != NULL || dynamic_cast<OOle2Obj*>(_pObj) != NULL) + if (dynamic_cast<OUnoObject*>(_pObj) != nullptr || dynamic_cast<OOle2Obj*>(_pObj) != nullptr) { pOverlappedObj = isOver(aNewRect,*_pObj->GetPage(),*_pView,true,_pObj); if ( pOverlappedObj && _pObj != pOverlappedObj ) @@ -161,7 +161,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd _nYMov = nYTemp; } else - pOverlappedObj = NULL; + pOverlappedObj = nullptr; } } while ( pOverlappedObj && bMoveAllowed ); @@ -424,7 +424,7 @@ OSectionWindow* OViewsWindow::getSectionWindow(const uno::Reference< report::XSe { OSL_ENSURE(_xSection.is(),"Section is NULL!"); - OSectionWindow* pSectionWindow = NULL; + OSectionWindow* pSectionWindow = nullptr; TSectionsMap::const_iterator aIter = m_aSections.begin(); TSectionsMap::const_iterator aEnd = m_aSections.end(); for (; aIter != aEnd ; ++aIter) @@ -442,7 +442,7 @@ OSectionWindow* OViewsWindow::getSectionWindow(const uno::Reference< report::XSe OSectionWindow* OViewsWindow::getMarkedSection(NearSectionAccess nsa) const { - OSectionWindow* pRet = NULL; + OSectionWindow* pRet = nullptr; TSectionsMap::const_iterator aIter = m_aSections.begin(); TSectionsMap::const_iterator aEnd = m_aSections.end(); sal_uInt32 nCurrentPosition = 0; @@ -460,7 +460,7 @@ OSectionWindow* OViewsWindow::getMarkedSection(NearSectionAccess nsa) const if (nCurrentPosition > 0) { pRet = (*(--aIter)); - if (pRet == 0) + if (pRet == nullptr) { pRet = (*m_aSections.begin()); } @@ -478,7 +478,7 @@ OSectionWindow* OViewsWindow::getMarkedSection(NearSectionAccess nsa) const if ((nCurrentPosition + 1) < nSize) { pRet = *(++aIter); - if (pRet == 0) + if (pRet == nullptr) { pRet = (*(--aEnd)); } @@ -615,7 +615,7 @@ OViewsWindow::TSectionsMap::iterator OViewsWindow::getIteratorAtPos(sal_uInt16 _ void OViewsWindow::setMarked(OSectionView* _pSectionView, bool _bMark) { - OSL_ENSURE(_pSectionView != NULL,"SectionView is NULL!"); + OSL_ENSURE(_pSectionView != nullptr,"SectionView is NULL!"); if ( _pSectionView ) setMarked(_pSectionView->getReportSection()->getSection(),_bMark); } @@ -656,7 +656,7 @@ void OViewsWindow::setMarked(const uno::Sequence< uno::Reference< report::XRepor if ( pSectionWindow ) { SvxShape* pShape = SvxShape::getImplementation( *pIter ); - SdrObject* pObject = pShape ? pShape->GetSdrObject() : NULL; + SdrObject* pObject = pShape ? pShape->GetSdrObject() : nullptr; OSL_ENSURE( pObject, "OViewsWindow::setMarked: no SdrObject for the shape!" ); if ( pObject ) pSectionWindow->getReportSection().getSectionView().MarkObj( pObject, pSectionWindow->getReportSection().getSectionView().GetSdrPageView(), !_bMark ); @@ -951,7 +951,7 @@ sal_uInt16 OViewsWindow::getPosition(const OSectionWindow* _pSectionWindow) cons OSectionWindow* OViewsWindow::getSectionWindow(const sal_uInt16 _nPos) const { - OSectionWindow* aReturn = NULL; + OSectionWindow* aReturn = nullptr; if ( _nPos < m_aSections.size() ) aReturn = m_aSections[_nPos]; @@ -1199,7 +1199,7 @@ void OViewsWindow::BegMarkObj(const Point& _aPnt,const OSectionView* _pSection) OSectionView* OViewsWindow::getSectionRelativeToPosition(const OSectionView* _pSection,Point& _rPnt) { - OSectionView* pSection = NULL; + OSectionView* pSection = nullptr; sal_Int32 nCount = 0; TSectionsMap::iterator aIter = m_aSections.begin(); const TSectionsMap::iterator aEnd = m_aSections.end(); @@ -1517,7 +1517,7 @@ void OViewsWindow::handleKey(const vcl::KeyCode& _rCode) const SdrHdlList& rHdlList = rView.GetHdlList(); SdrHdl* pHdl = rHdlList.GetFocusHdl(); - if ( pHdl == 0 ) + if ( pHdl == nullptr ) { // no handle selected if ( rView.IsMoveAllowed() ) @@ -1552,7 +1552,7 @@ void OViewsWindow::handleKey(const vcl::KeyCode& _rCode) for (size_t i = 0; !bCheck && i < rMarkList.GetMarkCount(); ++i ) { SdrMark* pMark = rMarkList.GetMark(i); - bCheck = dynamic_cast<OUnoObject*>(pMark->GetMarkedSdrObj()) != NULL|| dynamic_cast<OOle2Obj*>(pMark->GetMarkedSdrObj()); + bCheck = dynamic_cast<OUnoObject*>(pMark->GetMarkedSdrObj()) != nullptr|| dynamic_cast<OOle2Obj*>(pMark->GetMarkedSdrObj()); } @@ -1597,8 +1597,8 @@ void OViewsWindow::handleKey(const vcl::KeyCode& _rCode) } pOverlapped = isOver(aMarkRect,*rReportSection.getPage(),rView); } - while(pOverlapped != NULL); - if (pOverlapped != NULL) + while(pOverlapped != nullptr); + if (pOverlapped != nullptr) break; } } @@ -1621,7 +1621,7 @@ void OViewsWindow::handleKey(const vcl::KeyCode& _rCode) const SdrDragStat& rDragStat = rView.GetDragStat(); // start dragging - rView.BegDragObj( aStartPoint, 0, pHdl, 0 ); + rView.BegDragObj( aStartPoint, nullptr, pHdl, 0 ); if ( rView.IsDragObj() ) { @@ -1640,7 +1640,7 @@ void OViewsWindow::handleKey(const vcl::KeyCode& _rCode) for (size_t i = 0; !bCheck && i < rMarkList.GetMarkCount(); ++i ) { SdrMark* pMark = rMarkList.GetMark(i); - bCheck = dynamic_cast<OUnoObject*>(pMark->GetMarkedSdrObj()) != NULL || dynamic_cast<OOle2Obj*>(pMark->GetMarkedSdrObj()) != NULL; + bCheck = dynamic_cast<OUnoObject*>(pMark->GetMarkedSdrObj()) != nullptr || dynamic_cast<OOle2Obj*>(pMark->GetMarkedSdrObj()) != nullptr; if ( bCheck ) aNewRect.Union(pMark->GetMarkedSdrObj()->GetLastBoundRect()); } diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 91379a6518d1..cd743ae9dfa5 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -116,8 +116,8 @@ void DlgEdFunc::ForceScroll( const Point& rPos ) DlgEdFunc::DlgEdFunc( OReportSection* _pParent ) : m_pParent(_pParent) , m_rView(_pParent->getSectionView()) - , m_xOverlappingObj(NULL) - , m_pOverlappingObj(NULL) + , m_xOverlappingObj(nullptr) + , m_pOverlappingObj(nullptr) , m_nOverlappedControlColor(0) , m_nOldColor(0) , m_bSelectionMode(false) @@ -194,7 +194,7 @@ bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) SdrHdl* pHdl = m_rView.PickHandle(m_aMDPos); // if selected object was hit, drag object - if ( pHdl!=NULL || m_rView.IsMarkedHit(m_aMDPos) ) + if ( pHdl!=nullptr || m_rView.IsMarkedHit(m_aMDPos) ) { bHandled = true; m_pParent->CaptureMouse(); @@ -207,11 +207,11 @@ bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) SdrPageView* pPV = m_rView.GetSdrPageView(); SdrViewEvent aVEvt; if ( m_rView.PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt) != SDRHIT_MARKEDOBJECT && !rMEvt.IsShift() ) - m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL); + m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(nullptr); if ( aVEvt.pRootObj ) m_rView.MarkObj(aVEvt.pRootObj, pPV); else - m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL); + m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(nullptr); bHandled = true; } @@ -295,7 +295,7 @@ bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent) if ( pHdl ) ((SdrHdlList&)rHdlList).ResetFocusHdl(); else - m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL); + m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(nullptr); deactivateOle(true); bReturn = false; @@ -490,8 +490,8 @@ void DlgEdFunc::unColorizeOverlappedObj() OXUndoEnvironment::OUndoEnvLock aLock(pRptModel->GetUndoEnv()); lcl_setColorOfObject(m_xOverlappingObj, m_nOldColor); - m_xOverlappingObj = NULL; - m_pOverlappingObj = NULL; + m_xOverlappingObj = nullptr; + m_pOverlappingObj = nullptr; } } } @@ -584,15 +584,15 @@ bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt) { // no drag rect, we have to check every single select rect const SdrDragStat& rDragStat = m_rView.GetDragStat(); - if (rDragStat.GetDragMethod() != NULL) + if (rDragStat.GetDragMethod() != nullptr) { SdrObjListIter aIter(*m_pParent->getPage(),IM_DEEPNOGROUPS); - SdrObject* pObjIter = NULL; + SdrObject* pObjIter = nullptr; // loop through all marked objects and check if there new rect overlapps an old one. - while( (pObjIter = aIter.Next()) != NULL && !bIsSetPoint) + while( (pObjIter = aIter.Next()) != nullptr && !bIsSetPoint) { if ( m_rView.IsObjMarked(pObjIter) - && (dynamic_cast<OUnoObject*>(pObjIter) != NULL || dynamic_cast<OOle2Obj*>(pObjIter) != NULL) ) + && (dynamic_cast<OUnoObject*>(pObjIter) != nullptr || dynamic_cast<OOle2Obj*>(pObjIter) != nullptr) ) { Rectangle aNewRect = pObjIter->GetLastBoundRect(); long nDx = rDragStat.IsHorFixed() ? 0 : rDragStat.GetDX(); @@ -780,7 +780,7 @@ bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) } bIsSetPoint = setMovementPointer(rMEvt); ForceScroll(aPos); - m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPos,&m_rView, m_rView.GetDragMethod() == NULL, false); + m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPos,&m_rView, m_rView.GetDragMethod() == nullptr, false); } if ( !bIsSetPoint ) @@ -816,7 +816,7 @@ bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) { // if not multi selection, unmark all if ( !rMEvt.IsShift() ) - m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL); + m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(nullptr); if ( m_rView.MarkObj(m_aMDPos) && rMEvt.IsLeft() ) { @@ -832,7 +832,7 @@ bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) else { if( !rMEvt.IsShift() ) - m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL); + m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(nullptr); if ( rMEvt.GetClicks() == 1 ) { @@ -886,7 +886,7 @@ bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) { bIsSetPoint = setMovementPointer(rMEvt); ForceScroll(aPnt); - if (m_rView.GetDragMethod()==NULL) + if (m_rView.GetDragMethod()==nullptr) { // create a selection m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPnt, &m_rView, true, false); diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 0f948b2287b6..a11250bbf968 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -94,7 +94,7 @@ PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, vcl::Window* pPare :DockingWindow(pParent,WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE)) ,m_xORB(_xORB) ,m_pDesignView(_pDesignView) - ,m_pView( NULL ) + ,m_pView( nullptr ) ,m_bInitialStateChange(true) { @@ -223,10 +223,10 @@ void PropBrw::implDetachController() implSetNewObject( ); if ( m_xMeAsFrame.is() ) - m_xMeAsFrame->setComponent( NULL, NULL ); + m_xMeAsFrame->setComponent( nullptr, nullptr ); if ( m_xBrowserController.is() ) - m_xBrowserController->attachFrame( NULL ); + m_xBrowserController->attachFrame( nullptr ); m_xMeAsFrame.clear(); m_xBrowserController.clear(); @@ -297,7 +297,7 @@ uno::Sequence< Reference<uno::XInterface> > PropBrw::CreateCompPropSet(const Sdr if (pCurrent->IsGroupObject()) { pGroupIterator.reset(new SdrObjListIter(*pCurrent->GetSubList())); - pCurrent = pGroupIterator->IsMore() ? pGroupIterator->Next() : NULL; + pCurrent = pGroupIterator->IsMore() ? pGroupIterator->Next() : nullptr; } while (pCurrent) @@ -307,7 +307,7 @@ uno::Sequence< Reference<uno::XInterface> > PropBrw::CreateCompPropSet(const Sdr aSets.push_back(CreateComponentPair(pObj)); // next element - pCurrent = pGroupIterator.get() && pGroupIterator->IsMore() ? pGroupIterator->Next() : NULL; + pCurrent = pGroupIterator.get() && pGroupIterator->IsMore() ? pGroupIterator->Next() : nullptr; } } return uno::Sequence< Reference<uno::XInterface> >(aSets.data(), aSets.size()); @@ -477,14 +477,14 @@ void PropBrw::Update( OSectionView* pNewView ) if ( m_pView ) { EndListening( *(m_pView->GetModel()) ); - m_pView = NULL; + m_pView = nullptr; } // set focus on initialization if ( m_bInitialStateChange ) { // if we're just newly created, we want to have the focus - PostUserEvent( LINK( this, PropBrw, OnAsyncGetFocus ), NULL, true ); + PostUserEvent( LINK( this, PropBrw, OnAsyncGetFocus ), nullptr, true ); m_bInitialStateChange = false; // and additionally, we want to show the page which was active during // our previous incarnation @@ -553,7 +553,7 @@ void PropBrw::Update( const uno::Reference< uno::XInterface>& _xReportComponent) if ( m_pView ) { EndListening( *(m_pView->GetModel()) ); - m_pView = NULL; + m_pView = nullptr; } uno::Reference< uno::XInterface> xTemp(CreateComponentPair(_xReportComponent,_xReportComponent)); |