diff options
Diffstat (limited to 'sc/source/filter/xml')
43 files changed, 399 insertions, 399 deletions
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index 7fb7b29eec48..46745b740c1e 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx @@ -104,7 +104,7 @@ SvXMLImportContext *ScXMLCalculationSettingsContext::CreateChildContext( sal_uIn const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if (nPrefix == XML_NAMESPACE_TABLE) { @@ -166,7 +166,7 @@ ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& rImport, if (nPrefix == XML_NAMESPACE_TABLE && IsXMLToken(aLocalName, XML_DATE_VALUE)) { util::DateTime aDateTime; - ::sax::Converter::parseDateTime(aDateTime, 0, sValue); + ::sax::Converter::parseDateTime(aDateTime, nullptr, sValue); util::Date aDate; aDate.Day = aDateTime.Day; aDate.Month = aDateTime.Month; diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index bf0eafd5ad92..8c3b6cc93147 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -45,12 +45,12 @@ using namespace xmloff::token; ScChangeTrackingExportHelper::ScChangeTrackingExportHelper(ScXMLExport& rTempExport) : rExport(rTempExport), - pChangeTrack(NULL), - pEditTextObj(NULL), - pDependings(NULL), + pChangeTrack(nullptr), + pEditTextObj(nullptr), + pDependings(nullptr), sChangeIDPrefix(SC_CHANGE_ID_PREFIX) { - pChangeTrack = rExport.GetDocument() ? rExport.GetDocument()->GetChangeTrack() : NULL; + pChangeTrack = rExport.GetDocument() ? rExport.GetDocument()->GetChangeTrack() : nullptr; pDependings = new ScChangeActionMap(); } diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index cbc0442f1292..2aad7356ee5a 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -80,7 +80,7 @@ const ScCellValue& ScMyCellInfo::CreateCell( ScDocument* pDoc ) ScMyDeleted::ScMyDeleted() : nID(0) - , pCellInfo(NULL) + , pCellInfo(nullptr) { } @@ -128,7 +128,7 @@ ScMyInsAction::~ScMyInsAction() ScMyDelAction::ScMyDelAction(const ScChangeActionType nActionTypeP) : ScMyBaseAction(nActionTypeP), aGeneratedList(), - pInsCutOff(NULL), + pInsCutOff(nullptr), aMoveCutOffs(), nD(0) { @@ -142,7 +142,7 @@ ScMyDelAction::~ScMyDelAction() ScMyMoveAction::ScMyMoveAction() : ScMyBaseAction(SC_CAT_MOVE), aGeneratedList(), - pMoveRanges(NULL) + pMoveRanges(nullptr) { } @@ -153,7 +153,7 @@ ScMyMoveAction::~ScMyMoveAction() ScMyContentAction::ScMyContentAction() : ScMyBaseAction(SC_CAT_CONTENT), - pCellInfo(NULL) + pCellInfo(nullptr) { } @@ -173,9 +173,9 @@ ScMyRejAction::~ScMyRejAction() ScXMLChangeTrackingImportHelper::ScXMLChangeTrackingImportHelper() : aActions(), - pDoc(NULL), - pTrack(NULL), - pCurrentAction(NULL), + pDoc(nullptr), + pTrack(nullptr), + pCurrentAction(nullptr), sIDPrefix(SC_CHANGE_ID_PREFIX), nMultiSpanned(0), nMultiSpannedSlaveCount(0), @@ -426,7 +426,7 @@ void ScXMLChangeTrackingImportHelper::EndChangeAction() OSL_FAIL("no current action"); } - pCurrentAction = NULL; + pCurrentAction = nullptr; } void ScXMLChangeTrackingImportHelper::ConvertInfo(const ScMyActionInfo& aInfo, OUString& rUser, DateTime& aDateTime) @@ -489,7 +489,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateMoveAction(ScMyMoveAction pAction->pMoveRanges->aTargetRange, aUser, aDateTime, sComment, pAction->pMoveRanges->aSourceRange , pTrack); return pNewAction; } - return NULL; + return nullptr; } ScChangeAction* ScXMLChangeTrackingImportHelper::CreateRejectionAction(ScMyRejAction* pAction) @@ -807,7 +807,7 @@ void ScXMLChangeTrackingImportHelper::CreateChangeTrack(ScDocument* pTempDoc) ScMyActions::iterator aEndItr(aActions.end()); while (aItr != aEndItr) { - ScChangeAction* pAction = NULL; + ScChangeAction* pAction = nullptr; switch ((*aItr)->nActionType) { diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx index 525aacf97586..f47bd10bc5d9 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.cxx +++ b/sc/source/filter/xml/XMLConsolidationContext.cxx @@ -100,7 +100,7 @@ void ScXMLConsolidationContext::EndElement() aConsParam.eFunction = eFunction; sal_uInt16 nCount = (sal_uInt16) std::min( ScRangeStringConverter::GetTokenCount( sSourceList ), (sal_Int32)0xFFFF ); - ScArea** ppAreas = nCount ? new ScArea*[ nCount ] : NULL; + ScArea** ppAreas = nCount ? new ScArea*[ nCount ] : nullptr; if( ppAreas ) { sal_Int32 nOffset = 0; diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index a3a9986a0563..4a94d3848cf8 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.cxx @@ -37,9 +37,9 @@ ScDocument* ScXMLConverter::GetScDocument( uno::Reference< frame::XModel > xMode if (xModel.is()) { ScModelObj* pDocObj = ScModelObj::getImplementation( xModel ); - return pDocObj ? pDocObj->GetDocument() : NULL; + return pDocObj ? pDocObj->GetDocument() : nullptr; } - return NULL; + return nullptr; } sheet::GeneralFunction ScXMLConverter::GetFunctionFromString( const OUString& sFunction ) @@ -313,7 +313,7 @@ void ScXMLConverter::ParseFormula(OUString& sFormula, const bool bIsFormula) void ScXMLConverter::ConvertDateTimeToString(const DateTime& aDateTime, OUStringBuffer& sDate) { css::util::DateTime aAPIDateTime = aDateTime.GetUNODateTime(); - ::sax::Converter::convertDateTime(sDate, aAPIDateTime, 0); + ::sax::Converter::convertDateTime(sDate, aAPIDateTime, nullptr); } namespace { @@ -375,7 +375,7 @@ const ScXMLConditionInfo* lclGetConditionInfo( const sal_Unicode*& rpcString, co if( (nLength == pInfo->mnIdentLength) && (::rtl_ustr_ascii_shortenedCompare_WithLength( pcIdStart, nLength, pInfo->mpcIdentifier, nLength ) == 0) ) return pInfo; - return 0; + return nullptr; } sheet::ConditionOperator lclGetConditionOperator( const sal_Unicode*& rpcString, const sal_Unicode* pcEnd ) diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index ceb7eba48a52..5216fa02c232 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -50,7 +50,7 @@ SvXMLImportContext *ScXMLDDELinksContext::CreateChildContext( sal_uInt16 nPrefix const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if ((nPrefix == XML_NAMESPACE_TABLE) && IsXMLToken(rLName, XML_DDE_LINK)) pContext = new ScXMLDDELinkContext(GetScImport(), nPrefix, rLName, xAttrList); @@ -91,7 +91,7 @@ SvXMLImportContext *ScXMLDDELinkContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if ((nPrefix == XML_NAMESPACE_OFFICE) && IsXMLToken(rLName, XML_DDE_SOURCE)) pContext = new ScXMLDDESourceContext(GetScImport(), nPrefix, rLName, xAttrList, this); @@ -265,7 +265,7 @@ SvXMLImportContext *ScXMLDDETableContext::CreateChildContext( sal_uInt16 nPrefix const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = NULL; + SvXMLImportContext *pContext = nullptr; if (nPrefix == XML_NAMESPACE_TABLE) { @@ -368,7 +368,7 @@ SvXMLImportContext *ScXMLDDERowContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = NULL; + SvXMLImportContext *pContext = nullptr; if (nPrefix == XML_NAMESPACE_TABLE) if (IsXMLToken(rLName, XML_TABLE_CELL)) diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx index c01c7cb9643c..543c4bb069db 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.cxx +++ b/sc/source/filter/xml/XMLDetectiveContext.cxx @@ -78,7 +78,7 @@ SvXMLImportContext *ScXMLDetectiveContext::CreateChildContext( const OUString& rLName, const uno::Reference< xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext* pContext = NULL; + SvXMLImportContext* pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetScImport().GetDetectiveElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index da683d42cc65..160cbf5e73c9 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -57,7 +57,7 @@ using namespace xmloff::token; ScXMLExportDataPilot::ScXMLExportDataPilot(ScXMLExport& rTempExport) : rExport(rTempExport), - pDoc( NULL ) + pDoc( nullptr ) { } @@ -433,7 +433,7 @@ void ScXMLExportDataPilot::WriteSubTotals(ScDPSaveDimension* pDim) using sheet::GeneralFunction; sal_Int32 nSubTotalCount = pDim->GetSubTotalsCount(); - const OUString* pLayoutName = NULL; + const OUString* pLayoutName = nullptr; if (rExport.getDefaultVersion() > SvtSaveOptions::ODFVER_012) // Export display names only for 1.2 extended or later. pLayoutName = pDim->GetSubtotalName(); @@ -632,8 +632,8 @@ void ScXMLExportDataPilot::WriteNumGroupDim(const ScDPSaveNumGroupDimension* pNu void ScXMLExportDataPilot::WriteGroupDimElements(ScDPSaveDimension* pDim, const ScDPDimensionSaveData* pDimData) { - const ScDPSaveGroupDimension* pGroupDim = NULL; - const ScDPSaveNumGroupDimension* pNumGroupDim = NULL; + const ScDPSaveGroupDimension* pGroupDim = nullptr; + const ScDPSaveNumGroupDimension* pNumGroupDim = nullptr; if (pDimData) { pGroupDim = pDimData->GetNamedGroupDim(pDim->GetName()); diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index 88f56982ae34..208476751da2 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -58,7 +58,7 @@ using namespace xmloff::token; ScXMLExportDatabaseRanges::ScXMLExportDatabaseRanges(ScXMLExport& rTempExport) : rExport(rTempExport), - pDoc( NULL ) + pDoc( nullptr ) { } diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx index 319b3d086c9f..188770ef0bd9 100644 --- a/sc/source/filter/xml/XMLExportIterator.cxx +++ b/sc/source/filter/xml/XMLExportIterator.cxx @@ -572,7 +572,7 @@ void ScMyDetectiveOpContainer::Sort() ScMyCell::ScMyCell() : aShapeList(), aDetectiveObjVec(), - pNote(NULL), + pNote(nullptr), nValidationIndex(-1), nStyleIndex(-1), nNumberFormat(-1), @@ -596,13 +596,13 @@ ScMyCell::~ScMyCell() } ScMyNotEmptyCellsIterator::ScMyNotEmptyCellsIterator(ScXMLExport& rTempXMLExport) - : pShapes(NULL), - pNoteShapes(NULL), - pEmptyDatabaseRanges(NULL), - pMergedRanges(NULL), - pAreaLinks(NULL), - pDetectiveObj(NULL), - pDetectiveOp(NULL), + : pShapes(nullptr), + pNoteShapes(nullptr), + pEmptyDatabaseRanges(nullptr), + pMergedRanges(nullptr), + pAreaLinks(nullptr), + pDetectiveObj(nullptr), + pDetectiveOp(nullptr), rExport(rTempXMLExport), nCellCol(0), nCellRow(0), @@ -618,13 +618,13 @@ ScMyNotEmptyCellsIterator::~ScMyNotEmptyCellsIterator() void ScMyNotEmptyCellsIterator::Clear() { mpCellItr.reset(); - pShapes = NULL; - pNoteShapes = NULL; - pMergedRanges = NULL; - pAreaLinks = NULL; - pEmptyDatabaseRanges = NULL; - pDetectiveObj = NULL; - pDetectiveOp = NULL; + pShapes = nullptr; + pNoteShapes = nullptr; + pMergedRanges = nullptr; + pAreaLinks = nullptr; + pEmptyDatabaseRanges = nullptr; + pDetectiveObj = nullptr; + pDetectiveOp = nullptr; nCurrentTable = SCTAB_MAX; } diff --git a/sc/source/filter/xml/XMLExportSharedData.cxx b/sc/source/filter/xml/XMLExportSharedData.cxx index 0e3fd2c61f50..59e3bef03fca 100644 --- a/sc/source/filter/xml/XMLExportSharedData.cxx +++ b/sc/source/filter/xml/XMLExportSharedData.cxx @@ -26,11 +26,11 @@ using namespace com::sun::star; ScMySharedData::ScMySharedData(const sal_Int32 nTempTableCount) : nLastColumns(nTempTableCount, 0), nLastRows(nTempTableCount, 0), - pTableShapes(NULL), - pDrawPages(NULL), - pShapesContainer(NULL), + pTableShapes(nullptr), + pDrawPages(nullptr), + pShapesContainer(nullptr), pDetectiveObjContainer(new ScMyDetectiveObjContainer()), - pNoteShapes(NULL), + pNoteShapes(nullptr), nTableCount(nTempTableCount) { } diff --git a/sc/source/filter/xml/XMLExportSharedData.hxx b/sc/source/filter/xml/XMLExportSharedData.hxx index 645d22489d5f..926957e3066a 100644 --- a/sc/source/filter/xml/XMLExportSharedData.hxx +++ b/sc/source/filter/xml/XMLExportSharedData.hxx @@ -64,7 +64,7 @@ public: void AddDrawPage(const ScMyDrawPage& aDrawPage, const sal_Int32 nTable); void SetDrawPageHasForms(const sal_Int32 nTable, bool bHasForms); css::uno::Reference<css::drawing::XDrawPage> GetDrawPage(const sal_Int32 nTable); - bool HasDrawPage() const { return pDrawPages != NULL; } + bool HasDrawPage() const { return pDrawPages != nullptr; } bool HasForm(const sal_Int32 nTable, css::uno::Reference<css::drawing::XDrawPage>& xDrawPage); void AddNewShape(const ScMyShape& aMyShape); void SortShapesContainer(); diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 0ac150c62003..979024ae0e76 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -311,7 +311,7 @@ void ScMyValidationsContainer::WriteMessage(ScXMLExport& rExport, rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TRUE); else rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY, XML_FALSE); - SvXMLElementExport* pMessage(NULL); + SvXMLElementExport* pMessage(nullptr); if (bIsHelpMessage) pMessage = new SvXMLElementExport(rExport, XML_NAMESPACE_TABLE, XML_HELP_MESSAGE, true, true); else @@ -525,7 +525,7 @@ bool ScMyRowFormatRange::operator< (const ScMyRowFormatRange& rRange) const ScRowFormatRanges::ScRowFormatRanges() : aRowFormatRanges(), - pColDefaults(NULL), + pColDefaults(nullptr), nSize(0) { } @@ -705,7 +705,7 @@ ScFormatRangeStyles::ScFormatRangeStyles() : aTables(), aStyleNames(), aAutoStyleNames(), - pColDefaults(0) + pColDefaults(nullptr) { } diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx index fa5c289b4820..1cf65b434584 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx @@ -41,7 +41,7 @@ sal_Int32 ScMyStyleNumberFormats::GetStyleNumberFormat(const OUString& rStyleNam } ScMyStyleRanges::ScMyStyleRanges() : - pCurrencyList(NULL) + pCurrencyList(nullptr) { } @@ -176,49 +176,49 @@ void ScMyStyleRanges::SetStylesToRanges(const OUString* pStyleName, ScXMLImport& { list<ScRange> aList; mpNumberList->getRangeList(aList); - SetStylesToRanges(aList, pStyleName, util::NumberFormat::NUMBER, NULL, rImport); + SetStylesToRanges(aList, pStyleName, util::NumberFormat::NUMBER, nullptr, rImport); mpNumberList->clear(); } if (mpTextList) { list<ScRange> aList; mpTextList->getRangeList(aList); - SetStylesToRanges(aList, pStyleName, util::NumberFormat::TEXT, NULL, rImport); + SetStylesToRanges(aList, pStyleName, util::NumberFormat::TEXT, nullptr, rImport); mpTextList->clear(); } if (mpTimeList) { list<ScRange> aList; mpTimeList->getRangeList(aList); - SetStylesToRanges(aList, pStyleName, util::NumberFormat::TIME, NULL, rImport); + SetStylesToRanges(aList, pStyleName, util::NumberFormat::TIME, nullptr, rImport); mpTimeList->clear(); } if (mpDateTimeList) { list<ScRange> aList; mpDateTimeList->getRangeList(aList); - SetStylesToRanges(aList, pStyleName, util::NumberFormat::DATETIME, NULL, rImport); + SetStylesToRanges(aList, pStyleName, util::NumberFormat::DATETIME, nullptr, rImport); mpDateTimeList->clear(); } if (mpPercentList) { list<ScRange> aList; mpPercentList->getRangeList(aList); - SetStylesToRanges(aList, pStyleName, util::NumberFormat::PERCENT, NULL, rImport); + SetStylesToRanges(aList, pStyleName, util::NumberFormat::PERCENT, nullptr, rImport); mpPercentList->clear(); } if (mpLogicalList) { list<ScRange> aList; mpLogicalList->getRangeList(aList); - SetStylesToRanges(aList, pStyleName, util::NumberFormat::LOGICAL, NULL, rImport); + SetStylesToRanges(aList, pStyleName, util::NumberFormat::LOGICAL, nullptr, rImport); mpLogicalList->clear(); } if (mpUndefinedList) { list<ScRange> aList; mpUndefinedList->getRangeList(aList); - SetStylesToRanges(aList, pStyleName, util::NumberFormat::UNDEFINED, NULL, rImport); + SetStylesToRanges(aList, pStyleName, util::NumberFormat::UNDEFINED, nullptr, rImport); mpUndefinedList->clear(); } if (pCurrencyList) @@ -239,10 +239,10 @@ ScMyStylesImportHelper::ScMyStylesImportHelper(ScXMLImport& rTempImport) : aRowDefaultStyle(aCellStyles.end()), rImport(rTempImport), - pStyleName(NULL), - pPrevStyleName(NULL), - pCurrency(NULL), - pPrevCurrency(NULL), + pStyleName(nullptr), + pPrevStyleName(nullptr), + pCurrency(nullptr), + pPrevCurrency(nullptr), nCellType(0), nPrevCellType(0), bPrevRangeAdded(true) @@ -264,8 +264,8 @@ void ScMyStylesImportHelper::ResetAttributes() pPrevStyleName = pStyleName; pPrevCurrency = pCurrency; nPrevCellType = nCellType; - pStyleName = NULL; - pCurrency = NULL; + pStyleName = nullptr; + pCurrency = nullptr; nCellType = 0; } diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx index 7606526ceced..d14e39bb8f8d 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx @@ -107,7 +107,7 @@ SvXMLImportContext *XMLTableHeaderFooterContext::CreateChildContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); if ((nPrefix == XML_NAMESPACE_TEXT) && IsXMLToken(rLocalName, XML_P)) @@ -219,7 +219,7 @@ SvXMLImportContext *XMLHeaderFooterRegionContext::CreateChildContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); if ((nPrefix == XML_NAMESPACE_TEXT) && IsXMLToken(rLocalName, XML_P)) diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index fc96546e7a8c..553c36fae9c2 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -43,7 +43,7 @@ using namespace xmloff::token; XMLTableShapeImportHelper::XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper ) : XMLShapeImportHelper(rImp, rImp.GetModel(), pImpMapper ), - pAnnotationContext(NULL), + pAnnotationContext(nullptr), bOnTable(false) { } @@ -97,7 +97,7 @@ void XMLTableShapeImportHelper::finishShape( sal_Int32 nEndY(-1); sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; table::CellAddress aEndCell; - OUString* pRangeList(NULL); + OUString* pRangeList(nullptr); sal_Int16 nLayerID(-1); for( sal_Int16 i=0; i < nAttrCount; ++i ) { diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx index 4ecc44db4af7..1e1fcf91f72c 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx @@ -34,7 +34,7 @@ class XMLTableShapeImportHelper : public XMLShapeImportHelper public: - XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper=0 ); + XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper=nullptr ); virtual ~XMLTableShapeImportHelper(); static void SetLayer(css::uno::Reference<css::drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType); diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx index 21f854c7944f..098b2371d54a 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.cxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx @@ -43,7 +43,7 @@ using ::std::vector; ScMyOLEFixer::ScMyOLEFixer(ScXMLImport& rTempImport) : rImport(rTempImport), aShapes(), - pCollection(NULL) + pCollection(nullptr) { } diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx index 2650de14dfc0..05530fcf2b29 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.cxx +++ b/sc/source/filter/xml/XMLTableShapesContext.cxx @@ -42,7 +42,7 @@ SvXMLImportContext *ScXMLTableShapesContext::CreateChildContext( sal_uInt16 nPre const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); if (!pContext) { diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index 368326371fda..172dd658c327 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -254,7 +254,7 @@ public: const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; void CreateTextPContext(bool bIsNewParagraph); - bool IsEditCell() { return pEditTextObj != 0; } + bool IsEditCell() { return pEditTextObj != nullptr; } void SetText(const OUString& sTempText) { sText = sTempText; } virtual void EndElement() override; @@ -481,7 +481,7 @@ SvXMLImportContext *ScXMLTrackedChangesContext::CreateChildContext( sal_uInt16 n const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -558,7 +558,7 @@ SvXMLImportContext *ScXMLChangeInfoContext::CreateChildContext( sal_uInt16 nPref const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); if( XML_NAMESPACE_DC == nPrefix ) { @@ -586,7 +586,7 @@ SvXMLImportContext *ScXMLChangeInfoContext::CreateChildContext( sal_uInt16 nPref void ScXMLChangeInfoContext::EndElement() { aInfo.sUser = sAuthorBuffer.makeStringAndClear(); - ::sax::Converter::parseDateTime(aInfo.aDateTime, 0, + ::sax::Converter::parseDateTime(aInfo.aDateTime, nullptr, sDateTimeBuffer.makeStringAndClear()); aInfo.sComment = sCommentBuffer.makeStringAndClear(); pChangeTrackingImportHelper->SetActionInfo(aInfo); @@ -719,7 +719,7 @@ SvXMLImportContext *ScXMLCellContentDeletionContext::CreateChildContext( sal_uIn const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -814,7 +814,7 @@ SvXMLImportContext *ScXMLDependingsContext::CreateChildContext( sal_uInt16 nPref const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -894,7 +894,7 @@ SvXMLImportContext *ScXMLDeletionsContext::CreateChildContext( sal_uInt16 nPrefi const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -924,7 +924,7 @@ ScXMLChangeTextPContext::ScXMLChangeTextPContext( ScXMLImport& rImport, sLName(rLName), sText(), pChangeCellContext(pTempChangeCellContext), - pTextPContext(NULL), + pTextPContext(nullptr), nPrefix(nPrfx) { // here are no attributes @@ -939,7 +939,7 @@ SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( sal_uInt16 nTem const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xTempAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); if ((nPrefix == XML_NAMESPACE_TEXT) && (IsXMLToken(rLName, XML_S)) && !pTextPContext) { @@ -1012,7 +1012,7 @@ ScXMLChangeCellContext::ScXMLChangeCellContext( ScXMLImport& rImport, : SvXMLImportContext( rImport, nPrfx, rLName ) , mrOldCell(rOldCell) , rInputString(rTempInputString) - , pEditTextObj(NULL) + , pEditTextObj(nullptr) , rDateTimeValue(fDateTimeValue) , fValue(0.0) , rType(nType) @@ -1110,7 +1110,7 @@ SvXMLImportContext *ScXMLChangeCellContext::CreateChildContext( sal_uInt16 nPref const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); if ((nPrefix == XML_NAMESPACE_TEXT) && (IsXMLToken(rLocalName, XML_P))) { @@ -1246,7 +1246,7 @@ SvXMLImportContext *ScXMLPreviousContext::CreateChildContext( sal_uInt16 nPrefix const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); if ((nPrefix == XML_NAMESPACE_TABLE) && (IsXMLToken(rLocalName, XML_CHANGE_TRACK_TABLE_CELL))) pContext = new ScXMLChangeCellContext(GetScImport(), nPrefix, rLocalName, xAttrList, @@ -1319,7 +1319,7 @@ SvXMLImportContext *ScXMLContentChangeContext::CreateChildContext( sal_uInt16 nP const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); if ((nPrefix == XML_NAMESPACE_OFFICE) && (IsXMLToken(rLocalName, XML_CHANGE_INFO))) { @@ -1434,7 +1434,7 @@ SvXMLImportContext *ScXMLInsertionContext::CreateChildContext( sal_uInt16 nPrefi const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); if ((nPrefix == XML_NAMESPACE_OFFICE) && (IsXMLToken(rLocalName, XML_CHANGE_INFO))) { @@ -1590,7 +1590,7 @@ SvXMLImportContext *ScXMLCutOffsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1694,7 +1694,7 @@ SvXMLImportContext *ScXMLDeletionContext::CreateChildContext( sal_uInt16 nPrefix const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); if ((nPrefix == XML_NAMESPACE_OFFICE) && (IsXMLToken(rLocalName, XML_CHANGE_INFO))) { @@ -1780,7 +1780,7 @@ SvXMLImportContext *ScXMLMovementContext::CreateChildContext( sal_uInt16 nPrefix const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); if ((nPrefix == XML_NAMESPACE_OFFICE) && (IsXMLToken(rLocalName, XML_CHANGE_INFO))) { @@ -1865,7 +1865,7 @@ SvXMLImportContext *ScXMLRejectionContext::CreateChildContext( sal_uInt16 nPrefi const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); if ((nPrefix == XML_NAMESPACE_OFFICE) && (IsXMLToken(rLocalName, XML_CHANGE_INFO))) { diff --git a/sc/source/filter/xml/editattributemap.cxx b/sc/source/filter/xml/editattributemap.cxx index fd5de8cc0380..014edd3a6495 100644 --- a/sc/source/filter/xml/editattributemap.cxx +++ b/sc/source/filter/xml/editattributemap.cxx @@ -79,13 +79,13 @@ ScXMLEditAttributeMap::ScXMLEditAttributeMap() const ScXMLEditAttributeMap::Entry* ScXMLEditAttributeMap::getEntryByAPIName(const OUString& rAPIName) const { StrToEntriesType::const_iterator it = maAPIEntries.find(rAPIName); - return it == maAPIEntries.end() ? NULL : it->second; + return it == maAPIEntries.end() ? nullptr : it->second; } const ScXMLEditAttributeMap::Entry* ScXMLEditAttributeMap::getEntryByItemID(sal_uInt16 nItemID) const { IndexToEntriesType::const_iterator it = maItemIDEntries.find(nItemID); - return it == maItemIDEntries.end() ? NULL : it->second; + return it == maItemIDEntries.end() ? nullptr : it->second; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx index 9063d4a4920f..0dab506b09b7 100644 --- a/sc/source/filter/xml/xmlannoi.cxx +++ b/sc/source/filter/xml/xmlannoi.cxx @@ -49,7 +49,7 @@ ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport, SvXMLImportContext( rImport, nPrfx, rLName ), mrAnnotationData( rAnnotationData ), pCellContext(pTempCellContext), - pShapeContext(NULL) + pShapeContext(nullptr) { uno::Reference<drawing::XShapes> xLocalShapes (GetScImport().GetTables().GetCurrentXShapes()); if (xLocalShapes.is()) @@ -121,7 +121,7 @@ SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( sal_uInt16 nPref const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if( XML_NAMESPACE_DC == nPrefix ) { @@ -159,7 +159,7 @@ void ScXMLAnnotationContext::EndElement() { pShapeContext->EndElement(); delete pShapeContext; - pShapeContext = NULL; + pShapeContext = nullptr; } mrAnnotationData.maAuthor = maAuthorBuffer.makeStringAndClear(); @@ -169,7 +169,7 @@ void ScXMLAnnotationContext::EndElement() mrAnnotationData.maSimpleText = maTextBuffer.makeStringAndClear(); XMLTableShapeImportHelper* pTableShapeImport = static_cast<XMLTableShapeImportHelper*>(GetScImport().GetShapeImport().get()); - pTableShapeImport->SetAnnotation(NULL); + pTableShapeImport->SetAnnotation(nullptr); } void ScXMLAnnotationContext::SetShape( const uno::Reference< drawing::XShape >& rxShape, const uno::Reference< drawing::XShapes >& rxShapes, diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 03da40290d6c..c04c287974fe 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -66,7 +66,7 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport, meHash2(PASSHASH_UNSPECIFIED), bProtected(false), bHadCalculationSettings(false), - pChangeTrackingImportHelper(NULL) + pChangeTrackingImportHelper(nullptr) { ScDocument* pDoc = GetScImport().GetDocument(); if (pDoc) @@ -138,7 +138,7 @@ SvXMLImportContext *ScXMLBodyContext::CreateChildContext( sal_uInt16 nPrefix, pSheetData->EndStreamPos( nEndOffset ); } - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetScImport().GetBodyElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) @@ -239,7 +239,7 @@ void ScXMLBodyContext::EndElement() if (!bHadCalculationSettings) { // #111055#; set calculation settings defaults if there is no calculation settings element - ScXMLCalculationSettingsContext aContext( GetScImport(), XML_NAMESPACE_TABLE, GetXMLToken(XML_CALCULATION_SETTINGS), NULL ); + ScXMLCalculationSettingsContext aContext( GetScImport(), XML_NAMESPACE_TABLE, GetXMLToken(XML_CALCULATION_SETTINGS), nullptr ); aContext.EndElement(); } diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index b0e48691458f..904f8c22b0ab 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -139,8 +139,8 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, ScXMLImportContext(rImport, nPrfx, rLName), mpEditEngine(GetScImport().GetEditEngine()), mnCurParagraph(0), - pDetectiveObjVec(NULL), - pCellRangeSource(NULL), + pDetectiveObjVec(nullptr), + pCellRangeSource(nullptr), fValue(0.0), nMergedRows(1), nMatrixRows(0), @@ -171,8 +171,8 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, rXMLImport.GetTables().AddColumn(bTempIsCovered); const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; OUString aLocalName; - OUString* pStyleName = NULL; - OUString* pCurrencySymbol = NULL; + OUString* pStyleName = nullptr; + OUString* pCurrencySymbol = nullptr; const SvXMLTokenMap& rTokenMap = rImport.GetTableRowCellAttrTokenMap(); for (sal_Int16 i = 0; i < nAttrCount; ++i) { @@ -668,7 +668,7 @@ SvXMLImportContext *ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPr const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = rXMLImport.GetTableRowCellElemTokenMap(); bool bTextP(false); @@ -865,7 +865,7 @@ void ScXMLTableRowCellContext::SetAnnotation(const ScAddress& rPos) LockSolarMutex(); - ScPostIt* pNote = 0; + ScPostIt* pNote = nullptr; uno::Reference< drawing::XShapes > xShapes = rXMLImport.GetTables().GetCurrentXShapes(); uno::Reference< container::XIndexAccess > xShapesIA( xShapes, uno::UNO_QUERY ); @@ -889,7 +889,7 @@ void ScXMLTableRowCellContext::SetAnnotation(const ScAddress& rPos) // create the cell note with the caption object pNote = ScNoteUtil::CreateNoteFromCaption( *pDoc, rPos, *pCaption, true ); // forget pointer to object (do not create note again below) - pObject = 0; + pObject = nullptr; } } @@ -906,7 +906,7 @@ void ScXMLTableRowCellContext::SetAnnotation(const ScAddress& rPos) aCaptionRect = pObject->GetLogicRect(); // remove the shape from the drawing page, this invalidates pObject mxAnnotationData->mxShapes->remove( mxAnnotationData->mxShape ); - pObject = 0; + pObject = nullptr; // update current number of existing objects if( xShapesIA.is() ) nOldShapeCount = xShapesIA->getCount(); @@ -937,7 +937,7 @@ void ScXMLTableRowCellContext::SetAnnotation(const ScAddress& rPos) SvNumberFormatter* pNumForm = pDoc->GetFormatTable(); sal_uInt32 nfIndex = pNumForm->GetFormatIndex( NF_DATE_SYS_DDMMYYYY, LANGUAGE_SYSTEM ); OUString aDate; - Color* pColor = 0; + Color* pColor = nullptr; Color** ppColor = &pColor; pNumForm->GetOutputString( fDate, nfIndex, aDate, ppColor ); pNote->SetDate( aDate ); diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index 7399136a9fa2..2f88e644083d 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -94,7 +94,7 @@ SvXMLImportContext *ScXMLTableColContext::CreateChildContext( sal_uInt16 nPrefix const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if( !pContext ) pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); @@ -204,7 +204,7 @@ SvXMLImportContext *ScXMLTableColsContext::CreateChildContext( sal_uInt16 nPrefi const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetScImport().GetTableColsElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index 2d6884bb68a8..7a06e0e797ee 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -34,7 +34,7 @@ SvXMLImportContext* ScXMLConditionalFormatsContext::CreateChildContext( sal_uInt { const SvXMLTokenMap& rTokenMap = GetScImport().GetCondFormatsTokenMap(); sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLocalName); - SvXMLImportContext* pContext = NULL; + SvXMLImportContext* pContext = nullptr; switch (nToken) { case XML_TOK_CONDFORMATS_CONDFORMAT: @@ -95,7 +95,7 @@ SvXMLImportContext* ScXMLConditionalFormatContext::CreateChildContext( sal_uInt1 { const SvXMLTokenMap& rTokenMap = GetScImport().GetCondFormatTokenMap(); sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLocalName); - SvXMLImportContext* pContext = NULL; + SvXMLImportContext* pContext = nullptr; switch (nToken) { case XML_TOK_CONDFORMAT_CONDITION: @@ -139,7 +139,7 @@ ScXMLConditionalFormatContext::~ScXMLConditionalFormatContext() ScXMLColorScaleFormatContext::ScXMLColorScaleFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, ScConditionalFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ), - pColorScaleFormat(NULL) + pColorScaleFormat(nullptr) { pColorScaleFormat = new ScColorScaleFormat(GetScImport().GetDocument()); pFormat->AddEntry(pColorScaleFormat); @@ -151,7 +151,7 @@ SvXMLImportContext* ScXMLColorScaleFormatContext::CreateChildContext( sal_uInt16 { const SvXMLTokenMap& rTokenMap = GetScImport().GetColorScaleTokenMap(); sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLocalName); - SvXMLImportContext* pContext = NULL; + SvXMLImportContext* pContext = nullptr; switch (nToken) { case XML_TOK_COLORSCALE_COLORSCALEENTRY: @@ -168,8 +168,8 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_ const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ), - mpDataBarFormat(NULL), - mpFormatData(NULL) + mpDataBarFormat(nullptr), + mpFormatData(nullptr) { OUString sPositiveColor; OUString sNegativeColor; @@ -293,13 +293,13 @@ SvXMLImportContext* ScXMLDataBarFormatContext::CreateChildContext( sal_uInt16 nP { const SvXMLTokenMap& rTokenMap = GetScImport().GetFormattingTokenMap(); sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLocalName); - SvXMLImportContext* pContext = NULL; + SvXMLImportContext* pContext = nullptr; switch (nToken) { case XML_TOK_FORMATTING_ENTRY: case XML_TOK_DATABAR_DATABARENTRY: { - ScColorScaleEntry* pEntry(0); + ScColorScaleEntry* pEntry(nullptr); pContext = new ScXMLFormattingEntryContext( GetScImport(), nPrefix, rLocalName, xAttrList, pEntry ); if(mpFormatData->mpLowerLimit) { @@ -383,12 +383,12 @@ SvXMLImportContext* ScXMLIconSetFormatContext::CreateChildContext( sal_uInt16 nP { const SvXMLTokenMap& rTokenMap = GetScImport().GetFormattingTokenMap(); sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLocalName); - SvXMLImportContext* pContext = NULL; + SvXMLImportContext* pContext = nullptr; switch (nToken) { case XML_TOK_FORMATTING_ENTRY: { - ScColorScaleEntry* pEntry(0); + ScColorScaleEntry* pEntry(nullptr); pContext = new ScXMLFormattingEntryContext( GetScImport(), nPrefix, rLocalName, xAttrList, pEntry ); mpFormatData->m_Entries.push_back(std::unique_ptr<ScColorScaleEntry>(pEntry)); } @@ -642,7 +642,7 @@ ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImpor const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, ScColorScaleFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ), - mpFormatEntry( NULL ) + mpFormatEntry( nullptr ) { double nVal = 0; Color aColor; diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx index dcbf27324a8c..de74e8148c06 100644 --- a/sc/source/filter/xml/xmlconti.cxx +++ b/sc/source/filter/xml/xmlconti.cxx @@ -48,7 +48,7 @@ SvXMLImportContext *ScXMLContentContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if ((nPrefix == XML_NAMESPACE_TEXT) && IsXMLToken(rLName, XML_S)) { diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 4a083dca5999..a8c768956d4e 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -174,7 +174,7 @@ SvXMLImportContext *ScXMLContentValidationsContext::CreateChildContext( sal_uInt const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetScImport().GetContentValidationsElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -262,7 +262,7 @@ SvXMLImportContext *ScXMLContentValidationContext::CreateChildContext( sal_uInt1 const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetScImport().GetContentValidationElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -505,7 +505,7 @@ SvXMLImportContext *ScXMLHelpMessageContext::CreateChildContext( sal_uInt16 nPre const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetScImport().GetContentValidationMessageElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -577,7 +577,7 @@ SvXMLImportContext *ScXMLErrorMessageContext::CreateChildContext( sal_uInt16 nPr const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetScImport().GetContentValidationMessageElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -643,7 +643,7 @@ SvXMLImportContext *ScXMLErrorMacroContext::CreateChildContext( sal_uInt16 nPref const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { - SvXMLImportContext *pContext = NULL; + SvXMLImportContext *pContext = nullptr; if ((nPrefix == XML_NAMESPACE_SCRIPT) && IsXMLToken(rLName, XML_EVENTS)) { diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index a50915277e7a..61e3db86d9da 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -73,7 +73,7 @@ SvXMLImportContext *ScXMLDataPilotTablesContext::CreateChildContext( sal_uInt16 const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetScImport().GetDataPilotTablesElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -105,8 +105,8 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), pDoc(GetScImport().GetDocument()), - pDPObject(NULL), - pDPDimSaveData(NULL), + pDPObject(nullptr), + pDPDimSaveData(nullptr), sDataPilotTableName(), sApplicationData(), nSourceType(SQL), @@ -222,7 +222,7 @@ SvXMLImportContext *ScXMLDataPilotTableContext::CreateChildContext( sal_uInt16 n const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetScImport().GetDataPilotTableElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -287,21 +287,21 @@ const ScDPSaveDimension* getDimension( case ScDPOutputGeometry::Column: { if (rColDims.size() <= nPos) - return NULL; + return nullptr; return rColDims[nPos]; } case ScDPOutputGeometry::Row: { if (rRowDims.size() <= nPos) - return NULL; + return nullptr; return rRowDims[nPos]; } case ScDPOutputGeometry::Page: { if (rPageDims.size() <= nPos) - return NULL; + return nullptr; return rPageDims[nPos]; } @@ -312,7 +312,7 @@ const ScDPSaveDimension* getDimension( default: break; } - return NULL; + return nullptr; } ScDPOutputGeometry::FieldType toFieldType(sal_uInt16 nOrient) @@ -366,7 +366,7 @@ void ScXMLDataPilotTableContext::SetButtons() const ScDPSaveDimension* pDim = getDimension( aRowDims, aColDims, aPageDims, aBtnType.first, aBtnType.second); - bool bDimension = pDim != NULL; + bool bDimension = pDim != nullptr; bool bDataLayout = pDim && pDim->IsDataLayout(); bool bHasHidden = pDim && pDim->HasInvisibleMember(); bool bPageDim = pDim && pDim->GetOrientation() == sheet::DataPilotFieldOrientation_PAGE; @@ -634,7 +634,7 @@ SvXMLImportContext *ScXMLDPSourceSQLContext::CreateChildContext( sal_uInt16 nPre const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if( !pContext ) pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); @@ -688,7 +688,7 @@ SvXMLImportContext *ScXMLDPSourceTableContext::CreateChildContext( sal_uInt16 nP const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if( !pContext ) pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); @@ -742,7 +742,7 @@ SvXMLImportContext *ScXMLDPSourceQueryContext::CreateChildContext( sal_uInt16 nP const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if( !pContext ) pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); @@ -811,7 +811,7 @@ SvXMLImportContext *ScXMLSourceServiceContext::CreateChildContext( sal_uInt16 nP const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if( !pContext ) pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); @@ -942,7 +942,7 @@ SvXMLImportContext *ScXMLSourceCellRangeContext::CreateChildContext( sal_uInt16 const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetScImport().GetDataPilotTableSourceCellRangeElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -969,7 +969,7 @@ ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport, ScXMLDataPilotTableContext* pTempDataPilotTable) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotTable(pTempDataPilotTable), - pDim(NULL), + pDim(nullptr), fStart(0.0), fEnd(0.0), fStep(0.0), @@ -1066,7 +1066,7 @@ SvXMLImportContext *ScXMLDataPilotFieldContext::CreateChildContext( sal_uInt16 n const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetScImport().GetDataPilotFieldElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -1281,7 +1281,7 @@ SvXMLImportContext *ScXMLDataPilotLevelContext::CreateChildContext( sal_uInt16 n const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetScImport().GetDataPilotLevelElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -1462,7 +1462,7 @@ ScXMLDataPilotSubTotalsContext::ScXMLDataPilotSubTotalsContext( ScXMLImport& rIm SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotField(pTempDataPilotField), nFunctionCount(0), - pFunctions(NULL) + pFunctions(nullptr) { // has no attributes @@ -1477,7 +1477,7 @@ SvXMLImportContext *ScXMLDataPilotSubTotalsContext::CreateChildContext( sal_uInt const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetScImport().GetDataPilotSubTotalsElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -1567,7 +1567,7 @@ SvXMLImportContext *ScXMLDataPilotSubTotalContext::CreateChildContext( sal_uInt1 const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if( !pContext ) pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); @@ -1599,7 +1599,7 @@ SvXMLImportContext *ScXMLDataPilotMembersContext::CreateChildContext( sal_uInt16 const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetScImport().GetDataPilotMembersElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -1676,7 +1676,7 @@ SvXMLImportContext *ScXMLDataPilotMemberContext::CreateChildContext( sal_uInt16 const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if( !pContext ) pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); @@ -1802,7 +1802,7 @@ SvXMLImportContext *ScXMLDataPilotGroupsContext::CreateChildContext( sal_uInt16 const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1853,7 +1853,7 @@ SvXMLImportContext *ScXMLDataPilotGroupContext::CreateChildContext( sal_uInt16 n const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1905,7 +1905,7 @@ SvXMLImportContext *ScXMLDataPilotGroupMemberContext::CreateChildContext( sal_uI const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if( !pContext ) pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index c12fea50426c..22a4f7622afd 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -77,7 +77,7 @@ SvXMLImportContext *ScXMLDatabaseRangesContext::CreateChildContext( sal_uInt16 n const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetScImport().GetDatabaseRangesElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -224,7 +224,7 @@ SvXMLImportContext *ScXMLDatabaseRangeContext::CreateChildContext( sal_uInt16 nP const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetScImport().GetDatabaseRangeElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -278,7 +278,7 @@ SvXMLImportContext *ScXMLDatabaseRangeContext::CreateChildContext( sal_uInt16 nP std::unique_ptr<ScDBData> ScXMLDatabaseRangeContext::ConvertToDBData(const OUString& rName) { if (!mbValidRange) - return NULL; + return nullptr; ScDocument* pDoc = GetScImport().GetDocument(); @@ -395,8 +395,8 @@ std::unique_ptr<ScDBData> ScXMLDatabaseRangeContext::ConvertToDBData(const OUStr } else { - aParam.pSubTotals[nPos] = NULL; - aParam.pFunctions[nPos] = NULL; + aParam.pSubTotals[nPos] = nullptr; + aParam.pFunctions[nPos] = nullptr; } } @@ -532,7 +532,7 @@ SvXMLImportContext *ScXMLSourceSQLContext::CreateChildContext( sal_uInt16 nPrefi const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if ( nPrefix == XML_NAMESPACE_FORM ) { @@ -598,7 +598,7 @@ SvXMLImportContext *ScXMLSourceTableContext::CreateChildContext( sal_uInt16 nPre const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if ( nPrefix == XML_NAMESPACE_FORM ) { @@ -664,7 +664,7 @@ SvXMLImportContext *ScXMLSourceQueryContext::CreateChildContext( sal_uInt16 nPre const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if ( nPrefix == XML_NAMESPACE_FORM ) { @@ -723,7 +723,7 @@ SvXMLImportContext *ScXMLConResContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if( !pContext ) pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); @@ -782,7 +782,7 @@ SvXMLImportContext *ScXMLSubTotalRulesContext::CreateChildContext( sal_uInt16 nP const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetScImport().GetDatabaseRangeSubTotalRulesElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -881,7 +881,7 @@ SvXMLImportContext *ScXMLSortGroupsContext::CreateChildContext( sal_uInt16 nPref const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if( !pContext ) pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); @@ -930,7 +930,7 @@ SvXMLImportContext *ScXMLSubTotalRuleContext::CreateChildContext( sal_uInt16 nPr const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap = GetScImport().GetSubTotalRulesSubTotalRuleElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -997,7 +997,7 @@ SvXMLImportContext *ScXMLSubTotalFieldContext::CreateChildContext( sal_uInt16 nP const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if( !pContext ) pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index e06e29fc2137..f1ebdc5d996d 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -341,23 +341,23 @@ ScXMLExport::ScXMLExport( OUString const & implementationName, SvXMLExportFlags nExportFlag) : SvXMLExport( GetMeasureUnit(), rContext, implementationName, XML_SPREADSHEET, nExportFlag ), - pDoc(NULL), + pDoc(nullptr), nSourceStreamPos(0), - pNumberFormatAttributesExportHelper(NULL), - pSharedData(NULL), - pColumnStyles(NULL), - pRowStyles(NULL), - pCellStyles(NULL), - pRowFormatRanges(NULL), + pNumberFormatAttributesExportHelper(nullptr), + pSharedData(nullptr), + pColumnStyles(nullptr), + pRowStyles(nullptr), + pCellStyles(nullptr), + pRowFormatRanges(nullptr), aTableStyles(), - pGroupColumns (NULL), - pGroupRows (NULL), - pDefaults(NULL), - pChartListener(NULL), - pCurrentCell(NULL), - pMergedRangesContainer(NULL), - pValidationsContainer(NULL), - pChangeTrackingExportHelper(NULL), + pGroupColumns (nullptr), + pGroupRows (nullptr), + pDefaults(nullptr), + pChartListener(nullptr), + pCurrentCell(nullptr), + pMergedRangesContainer(nullptr), + pValidationsContainer(nullptr), + pChangeTrackingExportHelper(nullptr), sLayerID( SC_LAYERID ), sCaptionShape("com.sun.star.drawing.CaptionShape"), nOpenRow(-1), @@ -588,7 +588,7 @@ void ScXMLExport::CollectShapesAutoStyles(SCTAB nTableCount) pSharedData->SortShapesContainer(); pSharedData->SortNoteShapes(); - const ScMyShapeList* pShapeList(NULL); + const ScMyShapeList* pShapeList(nullptr); ScMyShapeList::const_iterator aShapeItr = aDummyInitList.end(); if (pSharedData->GetShapesContainer()) { @@ -971,7 +971,7 @@ const SvxFieldData* toXMLPropertyStates( std::vector<XMLPropertyState>& rPropStates, const std::vector<const SfxPoolItem*>& rSecAttrs, const rtl::Reference<XMLPropertySetMapper>& xMapper, const ScXMLEditAttributeMap& rAttrMap ) { - const SvxFieldData* pField = NULL; + const SvxFieldData* pField = nullptr; sal_Int32 nEntryCount = xMapper->GetEntryCount(); rPropStates.reserve(rSecAttrs.size()); std::vector<const SfxPoolItem*>::const_iterator it = rSecAttrs.begin(), itEnd = rSecAttrs.end(); @@ -2055,7 +2055,7 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x if (!pCellStyles->AddStyleName(pTemp, nIndex, false)) { delete pTemp; - pTemp = NULL; + pTemp = nullptr; } if ( !pOldName ) { @@ -2494,7 +2494,7 @@ void ScXMLExport::_ExportAutoStyles() Reference <beans::XPropertySet> xProperties (xCellRanges, uno::UNO_QUERY); if (xProperties.is()) { - AddStyleFromCells(xProperties, xTable, nTable, NULL); + AddStyleFromCells(xProperties, xTable, nTable, nullptr); IncrementProgressBar(false); } } @@ -2528,7 +2528,7 @@ void ScXMLExport::_ExportAutoStyles() Reference <beans::XPropertySet> xColumnProperties(xTableColumns->getByIndex(nColumn), uno::UNO_QUERY); if (xColumnProperties.is()) { - AddStyleFromColumn( xColumnProperties, NULL, nIndex, bIsVisible ); + AddStyleFromColumn( xColumnProperties, nullptr, nIndex, bIsVisible ); pColumnStyles->AddFieldStyleName(nTable, nColumn, nIndex, bIsVisible); } sal_Int32 nOld(nColumn); @@ -2558,7 +2558,7 @@ void ScXMLExport::_ExportAutoStyles() Reference <beans::XPropertySet> xRowProperties(xTableRows->getByIndex(nRow), uno::UNO_QUERY); if(xRowProperties.is()) { - AddStyleFromRow( xRowProperties, NULL, nIndex ); + AddStyleFromRow( xRowProperties, nullptr, nIndex ); pRowStyles->AddFieldStyleName(nTable, nRow, nIndex); } sal_Int32 nOld(nRow); @@ -2749,7 +2749,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe AddAttribute(sAttrStyleName, aTableStyles[nTable]); uno::Reference<util::XProtectable> xProtectable (xTable, uno::UNO_QUERY); - ScTableProtection* pProtect = NULL; + ScTableProtection* pProtect = nullptr; if (xProtectable.is() && xProtectable->isProtected()) { AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTED, XML_TRUE); @@ -2945,7 +2945,7 @@ void writeContent( if (pField) { // Write an field item. - OUString aFieldVal = ScEditUtil::GetCellFieldValue(*pField, rExport.GetDocument(), NULL); + OUString aFieldVal = ScEditUtil::GetCellFieldValue(*pField, rExport.GetDocument(), nullptr); switch (pField->GetClassId()) { case text::textfield::Type::URL: @@ -3357,7 +3357,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, bIsChart = true; uno::Sequence< OUString > aRepresentations( xReceiver->getUsedRangeRepresentations()); - SvXMLAttributeList* pAttrList = 0; + SvXMLAttributeList* pAttrList = nullptr; if(aRepresentations.getLength()) { // add the ranges used by the chart to the shape @@ -3479,7 +3479,7 @@ void ScXMLExport::WriteTableShapes() ExportShape(*aItr, &aPoint); } else - ExportShape(*aItr, NULL); + ExportShape(*aItr, nullptr); } aItr = (*pTableShapes)[nCurrentTable].erase(aItr); } @@ -3586,7 +3586,7 @@ void ScXMLExport::WriteAnnotation(ScMyCell& rMyCell) GetShapeExport()->exportShape(xShape, SEF_DEFAULT|XMLShapeExportFlags::ANNOTATION); } - pCurrentCell = NULL; + pCurrentCell = nullptr; } } @@ -4092,7 +4092,7 @@ OUString getCondFormatEntryType(const ScColorScaleEntry& rEntry, bool bFirst = t OUString getIconSetName(ScIconSetType eType) { - const char* pName = NULL; + const char* pName = nullptr; ScIconSetMap* pMap = ScIconSetFormat::getIconSetMap(); for(;pMap->pName;++pMap) { @@ -4682,7 +4682,7 @@ XMLPageExport* ScXMLExport::CreatePageExport() void ScXMLExport::GetChangeTrackViewSettings(uno::Sequence<beans::PropertyValue>& rProps) { - ScChangeViewSettings* pViewSettings(GetDocument() ? GetDocument()->GetChangeViewSettings() : NULL); + ScChangeViewSettings* pViewSettings(GetDocument() ? GetDocument()->GetChangeViewSettings() : nullptr); if (pViewSettings) { sal_Int32 nChangePos(rProps.getLength()); @@ -4848,7 +4848,7 @@ void ScXMLExport::CollectUserDefinedNamespaces(const SfxItemPool* pPool, sal_uIn for( sal_uInt32 i = 0; i < nItems; ++i ) { const SfxPoolItem* pItem; - if( 0 != (pItem = pPool->GetItem2( nAttrib, i ) ) ) + if( nullptr != (pItem = pPool->GetItem2( nAttrib, i ) ) ) { const SvXMLAttrContainerItem *pUnknown(static_cast<const SvXMLAttrContainerItem *>(pItem)); if( (pUnknown->GetAttrCount() > 0) ) @@ -5011,8 +5011,8 @@ sal_Int64 SAL_CALL ScXMLExport::getSomething( const css::uno::Sequence< sal_Int8 void ScXMLExport::DisposingModel() { SvXMLExport::DisposingModel(); - pDoc = NULL; - xCurrentTable = 0; + pDoc = nullptr; + xCurrentTable = nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index 2c718ed11541..f9b96b3107a6 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.cxx @@ -106,7 +106,7 @@ SvXMLImportContext *ScXMLFilterContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); const SvXMLTokenMap& rTokenMap(GetScImport().GetFilterElemTokenMap()); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -216,7 +216,7 @@ SvXMLImportContext *ScXMLAndContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); const SvXMLTokenMap& rTokenMap(GetScImport().GetFilterElemTokenMap()); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -266,7 +266,7 @@ SvXMLImportContext *ScXMLOrContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); const SvXMLTokenMap& rTokenMap(GetScImport().GetFilterElemTokenMap()); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -358,7 +358,7 @@ SvXMLImportContext *ScXMLConditionContext::CreateChildContext( sal_uInt16 nPrefi const OUString& rLName, const Reference<XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = NULL; + SvXMLImportContext *pContext = nullptr; const SvXMLTokenMap& rTokenMap(GetScImport().GetFilterConditionElemTokenMap()); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -595,7 +595,7 @@ SvXMLImportContext *ScXMLDPFilterContext::CreateChildContext( sal_uInt16 nPrefix const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); const SvXMLTokenMap& rTokenMap(GetScImport().GetFilterElemTokenMap()); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -667,7 +667,7 @@ SvXMLImportContext *ScXMLDPAndContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); const SvXMLTokenMap& rTokenMap(GetScImport().GetFilterElemTokenMap()); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -715,7 +715,7 @@ SvXMLImportContext *ScXMLDPOrContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); const SvXMLTokenMap& rTokenMap(GetScImport().GetFilterElemTokenMap()); switch( rTokenMap.Get( nPrefix, rLName ) ) diff --git a/sc/source/filter/xml/xmlfonte.cxx b/sc/source/filter/xml/xmlfonte.cxx index 63e5d94ac455..40a9af7a4da0 100644 --- a/sc/source/filter/xml/xmlfonte.cxx +++ b/sc/source/filter/xml/xmlfonte.cxx @@ -49,7 +49,7 @@ void ScXMLFontAutoStylePool_Impl::AddFontItems(sal_uInt16* pWhichIds, sal_uInt8 { const SfxPoolItem* pItem; sal_uInt16 nWhichId(pWhichIds[i]); - if (bExportDefaults && (0 != (pItem = &pItemPool->GetDefaultItem(nWhichId)))) + if (bExportDefaults && (nullptr != (pItem = &pItemPool->GetDefaultItem(nWhichId)))) { const SvxFontItem *pFont(static_cast<const SvxFontItem *>(pItem)); Add( pFont->GetFamilyName(), pFont->GetStyleName(), @@ -59,7 +59,7 @@ void ScXMLFontAutoStylePool_Impl::AddFontItems(sal_uInt16* pWhichIds, sal_uInt8 sal_uInt32 nItems(pItemPool->GetItemCount2( nWhichId )); for( sal_uInt32 j = 0; j < nItems; ++j ) { - if( 0 != (pItem = pItemPool->GetItem2( nWhichId, j ) ) ) + if( nullptr != (pItem = pItemPool->GetItem2( nWhichId, j ) ) ) { const SvxFontItem *pFont(static_cast<const SvxFontItem *>(pItem)); Add( pFont->GetFamilyName(), pFont->GetStyleName(), @@ -72,7 +72,7 @@ void ScXMLFontAutoStylePool_Impl::AddFontItems(sal_uInt16* pWhichIds, sal_uInt8 ScXMLFontAutoStylePool_Impl::ScXMLFontAutoStylePool_Impl(ScXMLExport& rExportP, bool bBlockFontEmbedding) : XMLFontAutoStylePool(rExportP, bBlockFontEmbedding) - , mpEditEnginePool(NULL) + , mpEditEnginePool(nullptr) { sal_uInt16 aWhichIds[3] = { ATTR_FONT, ATTR_CJK_FONT, ATTR_CTL_FONT }; @@ -110,7 +110,7 @@ ScXMLFontAutoStylePool_Impl::ScXMLFontAutoStylePool_Impl(ScXMLExport& rExportP, for (sal_uInt32 k = 0; k < nPageHFItems; ++k) { const ScPageHFItem* pPageItem; - if (0 != (pPageItem = static_cast<const ScPageHFItem*>(rPagePool.GetItem2(nPageWhichId, k)))) + if (nullptr != (pPageItem = static_cast<const ScPageHFItem*>(rPagePool.GetItem2(nPageWhichId, k)))) { const EditTextObject* pLeftArea(pPageItem->GetLeftArea()); if (pLeftArea) diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index ad11e91e3e4b..bbcdbca36445 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -343,7 +343,7 @@ SvXMLImportContext *ScXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); const SvXMLTokenMap& rTokenMap(GetScImport().GetDocElemTokenMap()); switch( rTokenMap.Get( nPrefix, rLocalName ) ) @@ -1950,7 +1950,7 @@ SvXMLImportContext *ScXMLImport::CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; if( (XML_NAMESPACE_OFFICE == nPrefix) && ( IsXMLToken(rLocalName, XML_DOCUMENT_STYLES) || @@ -1979,107 +1979,107 @@ ScXMLImport::ScXMLImport( const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLImportFlags nImportFlag) : SvXMLImport( rContext, implementationName, nImportFlag ), - pDoc( NULL ), - pChangeTrackingImportHelper(NULL), - pStylesImportHelper(NULL), + pDoc( nullptr ), + pChangeTrackingImportHelper(nullptr), + pStylesImportHelper(nullptr), sNumberFormat(SC_UNONAME_NUMFMT), sLocale(SC_LOCALE), sCellStyle(SC_UNONAME_CELLSTYL), - pDocElemTokenMap( 0 ), - pStylesElemTokenMap( 0 ), - pStylesAttrTokenMap( 0 ), - pStyleElemTokenMap( 0 ), - pBodyElemTokenMap( 0 ), - pContentValidationsElemTokenMap( 0 ), - pContentValidationElemTokenMap( 0 ), - pContentValidationAttrTokenMap( 0 ), - pContentValidationMessageElemTokenMap( 0 ), - pContentValidationHelpMessageAttrTokenMap( 0 ), - pContentValidationErrorMessageAttrTokenMap( 0 ), - pContentValidationErrorMacroAttrTokenMap( 0 ), - pCondFormatsTokenMap( 0 ), - pCondFormatTokenMap( 0 ), - pCondFormatAttrMap( 0 ), - pCondDateAttrMap( 0 ), - pConditionAttrMap( 0 ), - pColorScaleTokenMap( 0 ), - pColorScaleEntryAttrTokenMap( 0 ), - pDataBarTokenMap( 0 ), - pDataBarAttrMap( 0 ), - pFormattingEntryAttrMap( 0 ), - pIconSetAttrMap( 0 ), - pLabelRangesElemTokenMap( 0 ), - pLabelRangeAttrTokenMap( 0 ), - pTableElemTokenMap( 0 ), - pTableProtectionElemTokenMap(NULL), - pTableRowsElemTokenMap( 0 ), - pTableColsElemTokenMap( 0 ), - pTableScenarioAttrTokenMap( 0 ), - pTableAttrTokenMap( 0 ), - pTableColAttrTokenMap( 0 ), - pTableRowElemTokenMap( 0 ), - pTableRowAttrTokenMap( 0 ), - pTableRowCellElemTokenMap( 0 ), - pTableRowCellAttrTokenMap( 0 ), - pTableAnnotationAttrTokenMap( 0 ), - pDetectiveElemTokenMap( 0 ), - pDetectiveHighlightedAttrTokenMap( 0 ), - pDetectiveOperationAttrTokenMap( 0 ), - pTableCellRangeSourceAttrTokenMap( 0 ), - pNamedExpressionsElemTokenMap( 0 ), - pNamedRangeAttrTokenMap( 0 ), - pNamedExpressionAttrTokenMap( 0 ), - pDatabaseRangesElemTokenMap( 0 ), - pDatabaseRangeElemTokenMap( 0 ), - pDatabaseRangeAttrTokenMap( 0 ), - pDatabaseRangeSourceSQLAttrTokenMap( 0 ), - pDatabaseRangeSourceTableAttrTokenMap( 0 ), - pDatabaseRangeSourceQueryAttrTokenMap( 0 ), - pFilterElemTokenMap( 0 ), - pFilterAttrTokenMap( 0 ), - pFilterConditionElemTokenMap( 0 ), - pFilterConditionAttrTokenMap( 0 ), - pFilterSetItemAttrTokenMap( 0 ), - pSortElemTokenMap( 0 ), - pSortAttrTokenMap( 0 ), - pSortSortByAttrTokenMap( 0 ), - pDatabaseRangeSubTotalRulesElemTokenMap( 0 ), - pDatabaseRangeSubTotalRulesAttrTokenMap( 0 ), - pSubTotalRulesSortGroupsAttrTokenMap( 0 ), - pSubTotalRulesSubTotalRuleElemTokenMap( 0 ), - pSubTotalRulesSubTotalRuleAttrTokenMap( 0 ), - pSubTotalRuleSubTotalFieldAttrTokenMap( 0 ), - pDataPilotTablesElemTokenMap( 0 ), - pDataPilotTableAttrTokenMap( 0 ), - pDataPilotTableElemTokenMap( 0 ), - pDataPilotTableSourceServiceAttrTokenMap( 0 ), - pDataPilotGrandTotalAttrTokenMap(NULL), - pDataPilotTableSourceCellRangeElemTokenMap( 0 ), - pDataPilotTableSourceCellRangeAttrTokenMap( 0 ), - pDataPilotFieldAttrTokenMap( 0 ), - pDataPilotFieldElemTokenMap( 0 ), - pDataPilotLevelAttrTokenMap( 0 ), - pDataPilotLevelElemTokenMap( 0 ), - pDataPilotSubTotalsElemTokenMap( 0 ), - pDataPilotSubTotalAttrTokenMap( 0 ), - pDataPilotMembersElemTokenMap( 0 ), - pDataPilotMemberAttrTokenMap( 0 ), - pConsolidationAttrTokenMap( 0 ), - pCellTextParaElemTokenMap(NULL), - pCellTextSpanElemTokenMap(NULL), - pCellTextSpanAttrTokenMap(NULL), - pCellTextURLAttrTokenMap(NULL), - pCellTextSAttrTokenMap(NULL), - pDataStreamAttrTokenMap(NULL), - mpPostProcessData(NULL), + pDocElemTokenMap( nullptr ), + pStylesElemTokenMap( nullptr ), + pStylesAttrTokenMap( nullptr ), + pStyleElemTokenMap( nullptr ), + pBodyElemTokenMap( nullptr ), + pContentValidationsElemTokenMap( nullptr ), + pContentValidationElemTokenMap( nullptr ), + pContentValidationAttrTokenMap( nullptr ), + pContentValidationMessageElemTokenMap( nullptr ), + pContentValidationHelpMessageAttrTokenMap( nullptr ), + pContentValidationErrorMessageAttrTokenMap( nullptr ), + pContentValidationErrorMacroAttrTokenMap( nullptr ), + pCondFormatsTokenMap( nullptr ), + pCondFormatTokenMap( nullptr ), + pCondFormatAttrMap( nullptr ), + pCondDateAttrMap( nullptr ), + pConditionAttrMap( nullptr ), + pColorScaleTokenMap( nullptr ), + pColorScaleEntryAttrTokenMap( nullptr ), + pDataBarTokenMap( nullptr ), + pDataBarAttrMap( nullptr ), + pFormattingEntryAttrMap( nullptr ), + pIconSetAttrMap( nullptr ), + pLabelRangesElemTokenMap( nullptr ), + pLabelRangeAttrTokenMap( nullptr ), + pTableElemTokenMap( nullptr ), + pTableProtectionElemTokenMap(nullptr), + pTableRowsElemTokenMap( nullptr ), + pTableColsElemTokenMap( nullptr ), + pTableScenarioAttrTokenMap( nullptr ), + pTableAttrTokenMap( nullptr ), + pTableColAttrTokenMap( nullptr ), + pTableRowElemTokenMap( nullptr ), + pTableRowAttrTokenMap( nullptr ), + pTableRowCellElemTokenMap( nullptr ), + pTableRowCellAttrTokenMap( nullptr ), + pTableAnnotationAttrTokenMap( nullptr ), + pDetectiveElemTokenMap( nullptr ), + pDetectiveHighlightedAttrTokenMap( nullptr ), + pDetectiveOperationAttrTokenMap( nullptr ), + pTableCellRangeSourceAttrTokenMap( nullptr ), + pNamedExpressionsElemTokenMap( nullptr ), + pNamedRangeAttrTokenMap( nullptr ), + pNamedExpressionAttrTokenMap( nullptr ), + pDatabaseRangesElemTokenMap( nullptr ), + pDatabaseRangeElemTokenMap( nullptr ), + pDatabaseRangeAttrTokenMap( nullptr ), + pDatabaseRangeSourceSQLAttrTokenMap( nullptr ), + pDatabaseRangeSourceTableAttrTokenMap( nullptr ), + pDatabaseRangeSourceQueryAttrTokenMap( nullptr ), + pFilterElemTokenMap( nullptr ), + pFilterAttrTokenMap( nullptr ), + pFilterConditionElemTokenMap( nullptr ), + pFilterConditionAttrTokenMap( nullptr ), + pFilterSetItemAttrTokenMap( nullptr ), + pSortElemTokenMap( nullptr ), + pSortAttrTokenMap( nullptr ), + pSortSortByAttrTokenMap( nullptr ), + pDatabaseRangeSubTotalRulesElemTokenMap( nullptr ), + pDatabaseRangeSubTotalRulesAttrTokenMap( nullptr ), + pSubTotalRulesSortGroupsAttrTokenMap( nullptr ), + pSubTotalRulesSubTotalRuleElemTokenMap( nullptr ), + pSubTotalRulesSubTotalRuleAttrTokenMap( nullptr ), + pSubTotalRuleSubTotalFieldAttrTokenMap( nullptr ), + pDataPilotTablesElemTokenMap( nullptr ), + pDataPilotTableAttrTokenMap( nullptr ), + pDataPilotTableElemTokenMap( nullptr ), + pDataPilotTableSourceServiceAttrTokenMap( nullptr ), + pDataPilotGrandTotalAttrTokenMap(nullptr), + pDataPilotTableSourceCellRangeElemTokenMap( nullptr ), + pDataPilotTableSourceCellRangeAttrTokenMap( nullptr ), + pDataPilotFieldAttrTokenMap( nullptr ), + pDataPilotFieldElemTokenMap( nullptr ), + pDataPilotLevelAttrTokenMap( nullptr ), + pDataPilotLevelElemTokenMap( nullptr ), + pDataPilotSubTotalsElemTokenMap( nullptr ), + pDataPilotSubTotalAttrTokenMap( nullptr ), + pDataPilotMembersElemTokenMap( nullptr ), + pDataPilotMemberAttrTokenMap( nullptr ), + pConsolidationAttrTokenMap( nullptr ), + pCellTextParaElemTokenMap(nullptr), + pCellTextSpanElemTokenMap(nullptr), + pCellTextSpanAttrTokenMap(nullptr), + pCellTextURLAttrTokenMap(nullptr), + pCellTextSAttrTokenMap(nullptr), + pDataStreamAttrTokenMap(nullptr), + mpPostProcessData(nullptr), aTables(*this), m_pMyNamedExpressions(nullptr), - pMyLabelRanges(NULL), - pValidations(NULL), - pDetectiveOpArray(NULL), - pSolarMutexGuard(NULL), - pNumberFormatAttributesExportHelper(NULL), - pStyleNumberFormats(NULL), + pMyLabelRanges(nullptr), + pValidations(nullptr), + pDetectiveOpArray(nullptr), + pSolarMutexGuard(nullptr), + pNumberFormatAttributesExportHelper(nullptr), + pStyleNumberFormats(nullptr), sPrevStyleName(), sPrevCurrency(), nSolarMutexLocked(0), @@ -2281,14 +2281,14 @@ SvXMLImportContext *ScXMLImport::CreateBodyContext(const OUString& rLocalName, SvXMLImportContext *ScXMLImport::CreateMetaContext( const OUString& rLocalName ) { - SvXMLImportContext* pContext = NULL; + SvXMLImportContext* pContext = nullptr; if (getImportFlags() & SvXMLImportFlags::META) { uno::Reference<document::XDocumentPropertiesSupplier> xDPS( GetModel(), uno::UNO_QUERY_THROW); uno::Reference<document::XDocumentProperties> const xDocProps( - (IsStylesOnlyMode()) ? 0 : xDPS->getDocumentProperties()); + (IsStylesOnlyMode()) ? nullptr : xDPS->getDocumentProperties()); pContext = new SvXMLMetaDocumentContext(*this, XML_NAMESPACE_OFFICE, rLocalName, xDocProps); @@ -2304,7 +2304,7 @@ SvXMLImportContext *ScXMLImport::CreateMetaContext( SvXMLImportContext *ScXMLImport::CreateScriptContext( const OUString& rLocalName ) { - SvXMLImportContext* pContext = NULL; + SvXMLImportContext* pContext = nullptr; if( !(IsStylesOnlyMode()) ) { @@ -2324,13 +2324,13 @@ void ScXMLImport::SetStatistics( const uno::Sequence<beans::NamedValue> & i_rStats) { static const char* s_stats[] = - { "TableCount", "CellCount", "ObjectCount", 0 }; + { "TableCount", "CellCount", "ObjectCount", nullptr }; SvXMLImport::SetStatistics(i_rStats); sal_uInt32 nCount(0); for (sal_Int32 i = 0; i < i_rStats.getLength(); ++i) { - for (const char** pStat = s_stats; *pStat != 0; ++pStat) { + for (const char** pStat = s_stats; *pStat != nullptr; ++pStat) { if (i_rStats[i].Name.equalsAscii(*pStat)) { sal_Int32 val = 0; if (i_rStats[i].Value >>= val) { @@ -2707,7 +2707,7 @@ bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString if (sCurrentCurrency.equals(sTemp)) return true; // #i61657# This may be a legacy currency symbol that changed in the meantime. - if (SvNumberFormatter::GetLegacyOnlyCurrencyEntry( sCurrentCurrency, sBankSymbol) != NULL) + if (SvNumberFormatter::GetLegacyOnlyCurrencyEntry( sCurrentCurrency, sBankSymbol) != nullptr) return true; // In the rare case that sCurrentCurrency is not the // currency symbol, but a matching ISO code @@ -2718,7 +2718,7 @@ bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString // B$,BOB matched B$->BOP, which leads to // sCurrentCurrency being BOP, and the previous call // with BOP,BOB didn't find an entry, but B$,BOB will. - return SvNumberFormatter::GetLegacyOnlyCurrencyEntry( sTemp, sBankSymbol) != NULL; + return SvNumberFormatter::GetLegacyOnlyCurrencyEntry( sTemp, sBankSymbol) != nullptr; } } } @@ -2831,7 +2831,7 @@ void ScXMLImport::SetStyleToRanges() if (xProperties.is()) { XMLTableStylesContext *pStyles(static_cast<XMLTableStylesContext *>(GetAutoStyles())); - XMLTableStyleContext* pStyle = NULL; + XMLTableStyleContext* pStyle = nullptr; if ( pStyles ) pStyle = const_cast<XMLTableStyleContext*>(static_cast<const XMLTableStyleContext *>(pStyles->FindStyleChildContext( XML_STYLE_FAMILY_TABLE_CELL, sPrevStyleName, true))); @@ -3002,7 +3002,7 @@ throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) uno::Reference< beans::XPropertySet > const xImportInfo( getImportInfo() ); uno::Reference< beans::XPropertySetInfo > const xPropertySetInfo( - xImportInfo.is() ? xImportInfo->getPropertySetInfo() : 0); + xImportInfo.is() ? xImportInfo->getPropertySetInfo() : nullptr); if (xPropertySetInfo.is()) { OUString const sOrganizerMode( @@ -3282,7 +3282,7 @@ void SAL_CALL ScXMLImport::endDocument() void ScXMLImport::DisposingModel() { SvXMLImport::DisposingModel(); - pDoc = NULL; + pDoc = nullptr; } ScXMLImport::MutexGuard::MutexGuard(ScXMLImport& rImport) : @@ -3323,7 +3323,7 @@ void ScXMLImport::UnlockSolarMutex() { OSL_ENSURE(pSolarMutexGuard, "Solar Mutex is always unlocked"); delete pSolarMutexGuard; - pSolarMutexGuard = NULL; + pSolarMutexGuard = nullptr; } } } @@ -3364,7 +3364,7 @@ void ScXMLImport::ExtractFormulaNamespaceGrammar( { // parse the attribute value, extract namespace ID, literal namespace, and formula string rFormulaNmsp.clear(); - sal_uInt16 nNsId = GetNamespaceMap()._GetKeyByAttrName( rAttrValue, 0, &rFormula, &rFormulaNmsp, false ); + sal_uInt16 nNsId = GetNamespaceMap()._GetKeyByAttrName( rAttrValue, nullptr, &rFormula, &rFormulaNmsp, false ); // check if we have an ODF formula namespace if( !bRestrictToExternalNmsp ) switch( nNsId ) diff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxx index 82cc26d23c4c..d84daf0101aa 100644 --- a/sc/source/filter/xml/xmllabri.cxx +++ b/sc/source/filter/xml/xmllabri.cxx @@ -45,7 +45,7 @@ SvXMLImportContext* ScXMLLabelRangesContext::CreateChildContext( const OUString& rLName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { - SvXMLImportContext* pContext(NULL); + SvXMLImportContext* pContext(nullptr); const SvXMLTokenMap& rTokenMap(GetScImport().GetLabelRangesElemTokenMap()); switch( rTokenMap.Get( nPrefix, rLName ) ) diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx index 57a92722f208..99f5def87f61 100644 --- a/sc/source/filter/xml/xmlnexpi.cxx +++ b/sc/source/filter/xml/xmlnexpi.cxx @@ -65,7 +65,7 @@ SvXMLImportContext *ScXMLNamedExpressionsContext::CreateChildContext( sal_uInt16 const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); const SvXMLTokenMap& rTokenMap(GetScImport().GetNamedExpressionsElemTokenMap()); switch( rTokenMap.Get( nPrefix, rLName ) ) diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index ae29109c62ef..521209bf077a 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -107,7 +107,7 @@ SvXMLImportContext *ScXMLTableRowContext::CreateChildContext( sal_uInt16 nPrefix const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); const SvXMLTokenMap& rTokenMap(GetScImport().GetTableRowElemTokenMap()); switch( rTokenMap.Get( nPrefix, rLName ) ) @@ -256,7 +256,7 @@ SvXMLImportContext *ScXMLTableRowsContext::CreateChildContext( sal_uInt16 nPrefi const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); const SvXMLTokenMap& rTokenMap(GetScImport().GetTableRowsElemTokenMap()); switch( rTokenMap.Get( nPrefix, rLName ) ) diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx index 9c84b14bbfde..6abdc921d025 100644 --- a/sc/source/filter/xml/xmlsorti.cxx +++ b/sc/source/filter/xml/xmlsorti.cxx @@ -107,7 +107,7 @@ SvXMLImportContext *ScXMLSortContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); const SvXMLTokenMap& rTokenMap(GetScImport().GetSortElemTokenMap()); switch( rTokenMap.Get( nPrefix, rLName ) ) diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index aa8d133e5a40..ea45c1bd5df1 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -58,7 +58,7 @@ using namespace ::formula; #define MAP_EXT(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT, false } // extensions import only #define MAP_EXT_I(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT, true } -#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 } const XMLPropertyMapEntry aXMLScCellStylesProperties[] = { @@ -193,47 +193,47 @@ void ScXMLCellExportPropertyMapper::ContextFilter( ::std::vector< XMLPropertyState >& rProperties, uno::Reference< beans::XPropertySet > rPropSet ) const { - XMLPropertyState* pPadding = NULL; - XMLPropertyState* pPadding_Bottom = NULL; - XMLPropertyState* pPadding_Left = NULL; - XMLPropertyState* pPadding_Right = NULL; - XMLPropertyState* pPadding_Top = NULL; - - XMLPropertyState* pBorder = NULL; - XMLPropertyState* pBorder_Bottom = NULL; - XMLPropertyState* pBorder_Left = NULL; - XMLPropertyState* pBorder_Right = NULL; - XMLPropertyState* pBorder_Top = NULL; - XMLPropertyState* pSWBorder = NULL; - XMLPropertyState* pSWBorder_Bottom = NULL; - XMLPropertyState* pSWBorder_Left = NULL; - XMLPropertyState* pSWBorder_Right = NULL; - XMLPropertyState* pSWBorder_Top = NULL; - - XMLPropertyState* pAllBorderWidthState = NULL; - XMLPropertyState* pLeftBorderWidthState = NULL; - XMLPropertyState* pRightBorderWidthState = NULL; - XMLPropertyState* pTopBorderWidthState = NULL; - XMLPropertyState* pBottomBorderWidthState = NULL; - XMLPropertyState* pSWAllBorderWidthState = NULL; - XMLPropertyState* pSWLeftBorderWidthState = NULL; - XMLPropertyState* pSWRightBorderWidthState = NULL; - XMLPropertyState* pSWTopBorderWidthState = NULL; - XMLPropertyState* pSWBottomBorderWidthState = NULL; - XMLPropertyState* pDiagonalTLBRWidthState = NULL; - XMLPropertyState* pDiagonalBLTRWidthState = NULL; - - XMLPropertyState* pParaMarginLeft = NULL; - XMLPropertyState* pParaMarginLeftRel = NULL; - XMLPropertyState* pParaMarginRight = NULL; - XMLPropertyState* pParaMarginRightRel = NULL; - XMLPropertyState* pParaMarginTop = NULL; - XMLPropertyState* pParaMarginTopRel = NULL; - XMLPropertyState* pParaMarginBottom = NULL; - XMLPropertyState* pParaMarginBottomRel = NULL; - - XMLPropertyState* pParaAdjust = NULL; - XMLPropertyState* pParaAdjustLast = NULL; + XMLPropertyState* pPadding = nullptr; + XMLPropertyState* pPadding_Bottom = nullptr; + XMLPropertyState* pPadding_Left = nullptr; + XMLPropertyState* pPadding_Right = nullptr; + XMLPropertyState* pPadding_Top = nullptr; + + XMLPropertyState* pBorder = nullptr; + XMLPropertyState* pBorder_Bottom = nullptr; + XMLPropertyState* pBorder_Left = nullptr; + XMLPropertyState* pBorder_Right = nullptr; + XMLPropertyState* pBorder_Top = nullptr; + XMLPropertyState* pSWBorder = nullptr; + XMLPropertyState* pSWBorder_Bottom = nullptr; + XMLPropertyState* pSWBorder_Left = nullptr; + XMLPropertyState* pSWBorder_Right = nullptr; + XMLPropertyState* pSWBorder_Top = nullptr; + + XMLPropertyState* pAllBorderWidthState = nullptr; + XMLPropertyState* pLeftBorderWidthState = nullptr; + XMLPropertyState* pRightBorderWidthState = nullptr; + XMLPropertyState* pTopBorderWidthState = nullptr; + XMLPropertyState* pBottomBorderWidthState = nullptr; + XMLPropertyState* pSWAllBorderWidthState = nullptr; + XMLPropertyState* pSWLeftBorderWidthState = nullptr; + XMLPropertyState* pSWRightBorderWidthState = nullptr; + XMLPropertyState* pSWTopBorderWidthState = nullptr; + XMLPropertyState* pSWBottomBorderWidthState = nullptr; + XMLPropertyState* pDiagonalTLBRWidthState = nullptr; + XMLPropertyState* pDiagonalBLTRWidthState = nullptr; + + XMLPropertyState* pParaMarginLeft = nullptr; + XMLPropertyState* pParaMarginLeftRel = nullptr; + XMLPropertyState* pParaMarginRight = nullptr; + XMLPropertyState* pParaMarginRightRel = nullptr; + XMLPropertyState* pParaMarginTop = nullptr; + XMLPropertyState* pParaMarginTopRel = nullptr; + XMLPropertyState* pParaMarginBottom = nullptr; + XMLPropertyState* pParaMarginBottomRel = nullptr; + + XMLPropertyState* pParaAdjust = nullptr; + XMLPropertyState* pParaAdjustLast = nullptr; ::std::vector< XMLPropertyState >::iterator aEndIter(rProperties.end()); for( ::std::vector< XMLPropertyState >::iterator aIter = rProperties.begin(); diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx index 6cff5eff454a..ce27051d1115 100644 --- a/sc/source/filter/xml/xmlstyle.hxx +++ b/sc/source/filter/xml/xmlstyle.hxx @@ -118,7 +118,7 @@ public: SvXMLExport& rExport, const XMLPropertyState& rProperty, SvXmlExportFlags nFlags, - const ::std::vector< XMLPropertyState > *pProperties = 0, + const ::std::vector< XMLPropertyState > *pProperties = nullptr, sal_uInt32 nIdx = 0 ) const override; /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_EXPORT flag set */ @@ -127,7 +127,7 @@ public: 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; }; @@ -158,7 +158,7 @@ public: 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; }; @@ -176,7 +176,7 @@ public: 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; }; @@ -217,7 +217,7 @@ public: ScXMLStyleExport( SvXMLExport& rExp, const OUString& rPoolStyleName, - SvXMLAutoStylePoolP *pAutoStyleP=0 ); + SvXMLAutoStylePoolP *pAutoStyleP=nullptr ); virtual ~ScXMLStyleExport(); }; diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index aecabd5aa620..f1aae904e0af 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -91,17 +91,17 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector< XMLPropertyState >& CTF_SC_TOPBORDER, CTF_SC_BOTTOMBORDER }; SvXMLImportPropertyMapper::finished(rProperties, nStartIndex, nEndIndex); - XMLPropertyState* pAllPaddingProperty(NULL); - XMLPropertyState* pPadding[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pNewPadding[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pAllBorderProperty = NULL; - XMLPropertyState* pBorders[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pNewBorders[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pAllBorderWidthProperty = NULL; - XMLPropertyState* pBorderWidths[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pDiagBorders[2] = { 0 }; - XMLPropertyState* pOldDiagBorderWidths[2] = { 0 }; // old attribute names without "s" - XMLPropertyState* pDiagBorderWidths[2] = { 0 }; + XMLPropertyState* pAllPaddingProperty(nullptr); + XMLPropertyState* pPadding[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pNewPadding[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pAllBorderProperty = nullptr; + XMLPropertyState* pBorders[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pNewBorders[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pAllBorderWidthProperty = nullptr; + XMLPropertyState* pBorderWidths[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pDiagBorders[2] = { nullptr }; + XMLPropertyState* pOldDiagBorderWidths[2] = { nullptr }; // old attribute names without "s" + XMLPropertyState* pDiagBorderWidths[2] = { nullptr }; ::std::vector< XMLPropertyState >::iterator endproperty(rProperties.end()); for (::std::vector< XMLPropertyState >::iterator aIter = rProperties.begin(); @@ -229,9 +229,9 @@ ScXMLRowImportPropertyMapper::~ScXMLRowImportPropertyMapper() void ScXMLRowImportPropertyMapper::finished(::std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const { SvXMLImportPropertyMapper::finished(rProperties, nStartIndex, nEndIndex); - XMLPropertyState* pHeight(NULL); - XMLPropertyState* pOptimalHeight(NULL); - XMLPropertyState* pPageBreak(NULL); + XMLPropertyState* pHeight(nullptr); + XMLPropertyState* pOptimalHeight(nullptr); + XMLPropertyState* pPageBreak(nullptr); ::std::vector< XMLPropertyState >::iterator endproperty(rProperties.end()); for (::std::vector< XMLPropertyState >::iterator aIter = rProperties.begin(); aIter != endproperty; ++aIter) @@ -447,7 +447,7 @@ XMLTableStyleContext::XMLTableStyleContext( ScXMLImport& rImport, nNumberFormat(-1), nLastSheet(-1), bParentSet(false), - mpCondFormat(NULL), + mpCondFormat(nullptr), mbDeleteCondFormat(true) { } @@ -463,7 +463,7 @@ SvXMLImportContext *XMLTableStyleContext::CreateChildContext( const OUString& rLocalName, const uno::Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext(NULL); + SvXMLImportContext *pContext(nullptr); if( (XML_NAMESPACE_STYLE == nPrefix) && IsXMLToken(rLocalName, XML_MAP ) ) @@ -594,7 +594,7 @@ void XMLTableStyleContext::AddProperty(const sal_Int16 nContextID, const uno::An XMLPropertyState* XMLTableStyleContext::FindProperty(const sal_Int16 nContextID) { - XMLPropertyState* pRet = NULL; + XMLPropertyState* pRet = nullptr; rtl::Reference < XMLPropertySetMapper > xPrMap; rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = pStyles->GetImportPropertyMapper( GetFamily() ); @@ -948,7 +948,7 @@ SvXMLStyleContext *ScXMLMasterStylesContext::CreateStyleChildContext( const OUString& rLocalName, const uno::Reference< XAttributeList > & xAttrList ) { - SvXMLStyleContext *pContext(0); + SvXMLStyleContext *pContext(nullptr); if( (XML_NAMESPACE_STYLE == nPrefix) && IsXMLToken(rLocalName, XML_MASTER_PAGE) && @@ -968,7 +968,7 @@ SvXMLStyleContext *ScXMLMasterStylesContext::CreateStyleStyleChildContext( const OUString& /* rLocalName */, const uno::Reference< XAttributeList > & /* xAttrList */ ) { - return 0; + return nullptr; } void ScXMLMasterStylesContext::EndElement() diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index fa7d491335d8..e0a18c846a52 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -249,7 +249,7 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, return new SvXMLImportContext(GetImport(), nPrefix, rLName); } - SvXMLImportContext *pContext(0); + SvXMLImportContext *pContext(nullptr); switch (nToken) { @@ -472,7 +472,7 @@ ScXMLTableProtectionContext::~ScXMLTableProtectionContext() SvXMLImportContext* ScXMLTableProtectionContext::CreateChildContext( sal_uInt16 /*nPrefix*/, const OUString& /*rLocalName*/, const Reference<XAttributeList>& /*xAttrList*/ ) { - return NULL; + return nullptr; } void ScXMLTableProtectionContext::EndElement() diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index feeea1b72372..a365584f05d8 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -303,7 +303,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCo nReturn = rDoc.GetRangeOverflowType(); // free the component - xParser->setDocumentHandler( NULL ); + xParser->setDocumentHandler( nullptr ); // success! return nReturn; @@ -460,11 +460,11 @@ bool ScXMLImportWrapper::Import( sal_uInt8 nMode, ErrCode& rError ) SAL_INFO( "sc.filter", "meta import end" ); } - SvXMLGraphicHelper* pGraphicHelper = NULL; + SvXMLGraphicHelper* pGraphicHelper = nullptr; uno::Reference< document::XGraphicObjectResolver > xGrfContainer; uno::Reference< document::XEmbeddedObjectResolver > xObjectResolver; - SvXMLEmbeddedObjectHelper *pObjectHelper = NULL; + SvXMLEmbeddedObjectHelper *pObjectHelper = nullptr; if( xStorage.is() ) { @@ -828,7 +828,7 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly) bool bStylesRet (false); bool bDocRet(false); bool bSettingsRet(false); - ScMySharedData* pSharedData = NULL; + ScMySharedData* pSharedData = nullptr; bool bOasis = ( SotStorage::GetVersion( xStorage ) > SOFFICE_FILEFORMAT_60 ); @@ -878,10 +878,10 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly) } uno::Reference< document::XEmbeddedObjectResolver > xObjectResolver; - SvXMLEmbeddedObjectHelper *pObjectHelper = 0; + SvXMLEmbeddedObjectHelper *pObjectHelper = nullptr; uno::Reference< document::XGraphicObjectResolver > xGrfContainer; - SvXMLGraphicHelper* pGraphicHelper = 0; + SvXMLGraphicHelper* pGraphicHelper = nullptr; if( xStorage.is() ) { |