diff options
Diffstat (limited to 'sc/source/filter/oox')
39 files changed, 240 insertions, 240 deletions
diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx index 982daa1a7466..cd03e08b0c3a 100644 --- a/sc/source/filter/oox/autofilterbuffer.cxx +++ b/sc/source/filter/oox/autofilterbuffer.cxx @@ -724,7 +724,7 @@ AutoFilter* AutoFilterBuffer::getActiveAutoFilter() // Excel expects not more than one auto filter per sheet or table OSL_ENSURE( maAutoFilters.size() <= 1, "AutoFilterBuffer::getActiveAutoFilter - too many auto filters" ); // stick to the last imported auto filter - return maAutoFilters.empty() ? 0 : maAutoFilters.back().get(); + return maAutoFilters.empty() ? nullptr : maAutoFilters.back().get(); } } // namespace xls diff --git a/sc/source/filter/oox/autofiltercontext.cxx b/sc/source/filter/oox/autofiltercontext.cxx index d7ea3d95f762..11f0da8a3668 100644 --- a/sc/source/filter/oox/autofiltercontext.cxx +++ b/sc/source/filter/oox/autofiltercontext.cxx @@ -44,7 +44,7 @@ ContextHandlerRef FilterSettingsContext::onCreateContext( sal_Int32 nElement, co if( nElement == XLS_TOKEN( customFilter ) ) return this; break; } - return 0; + return nullptr; } void FilterSettingsContext::onStartElement( const AttributeList& rAttribs ) @@ -63,7 +63,7 @@ ContextHandlerRef FilterSettingsContext::onCreateRecordContext( sal_Int32 nRecId if( nRecId == BIFF12_ID_CUSTOMFILTER ) return this; break; } - return 0; + return nullptr; } void FilterSettingsContext::onStartRecord( SequenceInputStream& rStrm ) @@ -88,7 +88,7 @@ ContextHandlerRef FilterColumnContext::onCreateContext( sal_Int32 nElement, cons case XLS_TOKEN( customFilters ): return new FilterSettingsContext( *this, mrFilterColumn.createFilterSettings< CustomFilter >() ); } - return 0; + return nullptr; } void FilterColumnContext::onStartElement( const AttributeList& rAttribs ) @@ -107,7 +107,7 @@ ContextHandlerRef FilterColumnContext::onCreateRecordContext( sal_Int32 nRecId, case BIFF12_ID_CUSTOMFILTERS: return new FilterSettingsContext( *this, mrFilterColumn.createFilterSettings< CustomFilter >() ); } - return 0; + return nullptr; } void FilterColumnContext::onStartRecord( SequenceInputStream& rStrm ) @@ -125,7 +125,7 @@ ContextHandlerRef AutoFilterContext::onCreateContext( sal_Int32 nElement, const { if( (getCurrentElement() == XLS_TOKEN( autoFilter )) && (nElement == XLS_TOKEN( filterColumn )) ) return new FilterColumnContext( *this, mrAutoFilter.createFilterColumn() ); - return 0; + return nullptr; } void AutoFilterContext::onStartElement( const AttributeList& rAttribs ) @@ -137,7 +137,7 @@ ContextHandlerRef AutoFilterContext::onCreateRecordContext( sal_Int32 nRecId, Se { if( (getCurrentElement() == BIFF12_ID_AUTOFILTER) && (nRecId == BIFF12_ID_FILTERCOLUMN) ) return new FilterColumnContext( *this, mrAutoFilter.createFilterColumn() ); - return 0; + return nullptr; } void AutoFilterContext::onStartRecord( SequenceInputStream& rStrm ) diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx index ab49d5fe0c41..f03204482230 100644 --- a/sc/source/filter/oox/biffinputstream.cxx +++ b/sc/source/filter/oox/biffinputstream.cxx @@ -30,7 +30,7 @@ namespace prv { BiffInputRecordBuffer::BiffInputRecordBuffer( BinaryInputStream& rInStrm ) : mrInStrm( rInStrm ), - mpCurrentData( 0 ), + mpCurrentData( nullptr ), mnHeaderPos( -1 ), mnBodyPos( 0 ), mnBufferBodyPos( 0 ), diff --git a/sc/source/filter/oox/chartsheetfragment.cxx b/sc/source/filter/oox/chartsheetfragment.cxx index 57e1685083c5..55c3267c1031 100644 --- a/sc/source/filter/oox/chartsheetfragment.cxx +++ b/sc/source/filter/oox/chartsheetfragment.cxx @@ -75,7 +75,7 @@ ContextHandlerRef ChartsheetFragment::onCreateContext( sal_Int32 nElement, const } break; } - return 0; + return nullptr; } void ChartsheetFragment::onCharacters( const OUString& rChars ) @@ -120,7 +120,7 @@ ContextHandlerRef ChartsheetFragment::onCreateRecordContext( sal_Int32 nRecId, S if( nRecId == BIFF12_ID_CHARTSHEETVIEW ) getSheetViewSettings().importChartSheetView( rStrm ); break; } - return 0; + return nullptr; } const RecordInfo* ChartsheetFragment::getRecordInfos() const diff --git a/sc/source/filter/oox/commentsfragment.cxx b/sc/source/filter/oox/commentsfragment.cxx index 17ce2df5c13d..1c6a031936e2 100644 --- a/sc/source/filter/oox/commentsfragment.cxx +++ b/sc/source/filter/oox/commentsfragment.cxx @@ -65,7 +65,7 @@ ContextHandlerRef CommentsFragment::onCreateContext( sal_Int32 nElement, const A if( nElement == XLS_TOKEN( commentPr ) ) { mxComment->importCommentPr( rAttribs ); return this; } break; } - return 0; + return nullptr; } void CommentsFragment::onCharacters( const OUString& rChars ) @@ -102,7 +102,7 @@ ContextHandlerRef CommentsFragment::onCreateRecordContext( sal_Int32 nRecId, Seq mxComment->createText()->importString( rStrm, true ); break; } - return 0; + return nullptr; } void CommentsFragment::onEndRecord() diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index c8cdc4a51266..df133a4a4182 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -860,7 +860,7 @@ void CondFormatRule::finalizeImport() { ScDocument& rDoc = getScDocument(); OUString aStyleName = getStyles().createDxfStyle( maModel.mnDxfId ); - ScCondFormatEntry* pNewEntry = new ScCondFormatEntry( eOperator, NULL, NULL, &rDoc, aPos, aStyleName ); + ScCondFormatEntry* pNewEntry = new ScCondFormatEntry( eOperator, nullptr, nullptr, &rDoc, aPos, aStyleName ); mpFormat->AddEntry(pNewEntry); } else if( eOperator == SC_COND_BEGINS_WITH || eOperator == SC_COND_ENDS_WITH || @@ -871,7 +871,7 @@ void CondFormatRule::finalizeImport() svl::SharedStringPool& rSPool = rDoc.GetSharedStringPool(); aTokenArray.AddString(rSPool.intern(maModel.maText)); OUString aStyleName = getStyles().createDxfStyle( maModel.mnDxfId ); - ScCondFormatEntry* pNewEntry = new ScCondFormatEntry( eOperator, &aTokenArray, NULL, &rDoc, aPos, aStyleName ); + ScCondFormatEntry* pNewEntry = new ScCondFormatEntry( eOperator, &aTokenArray, nullptr, &rDoc, aPos, aStyleName ); mpFormat->AddEntry(pNewEntry); } else if( (eOperator != SC_COND_NONE) && !maModel.maFormulas.empty() ) @@ -898,7 +898,7 @@ void CondFormatRule::finalizeImport() ScTokenArray aTokenArray; aTokenArray.AddDouble( maModel.mnRank ); OUString aStyleName = getStyles().createDxfStyle( maModel.mnDxfId ); - ScCondFormatEntry* pNewEntry = new ScCondFormatEntry( eOperator, &aTokenArray, NULL, &rDoc, aPos, aStyleName ); + ScCondFormatEntry* pNewEntry = new ScCondFormatEntry( eOperator, &aTokenArray, nullptr, &rDoc, aPos, aStyleName ); mpFormat->AddEntry(pNewEntry); } else if( eOperator == SC_COND_ABOVE_AVERAGE || eOperator == SC_COND_BELOW_AVERAGE || @@ -909,14 +909,14 @@ void CondFormatRule::finalizeImport() ScTokenArray aTokenArrayDev; aTokenArrayDev.AddDouble( maModel.mnStdDev ); OUString aStyleName = getStyles().createDxfStyle( maModel.mnDxfId ); - ScCondFormatEntry* pNewEntry = new ScCondFormatEntry( eOperator, &aTokenArrayDev, NULL, &rDoc, aPos, aStyleName ); + ScCondFormatEntry* pNewEntry = new ScCondFormatEntry( eOperator, &aTokenArrayDev, nullptr, &rDoc, aPos, aStyleName ); mpFormat->AddEntry(pNewEntry); } else if( eOperator == SC_COND_DUPLICATE || eOperator == SC_COND_NOTDUPLICATE ) { ScDocument& rDoc = getScDocument(); OUString aStyleName = getStyles().createDxfStyle( maModel.mnDxfId ); - ScCondFormatEntry* pNewEntry = new ScCondFormatEntry( eOperator, NULL, NULL, &rDoc, aPos, aStyleName ); + ScCondFormatEntry* pNewEntry = new ScCondFormatEntry( eOperator, nullptr, nullptr, &rDoc, aPos, aStyleName ); mpFormat->AddEntry(pNewEntry); } else if( maModel.mnType == XML_timePeriod ) @@ -1025,7 +1025,7 @@ CondFormatModel::CondFormatModel() : CondFormat::CondFormat( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), - mpFormat(NULL), + mpFormat(nullptr), mbReadyForFinalize(false) { } @@ -1121,7 +1121,7 @@ ScConditionalFormat* findFormatByRange(const ScRangeList& rRange, ScDocument* pD } } - return NULL; + return nullptr; } } @@ -1269,7 +1269,7 @@ void ExtCfDataBarRule::finalizeImport() case CFVO: { ScDataBarFormatData* pDataBar = mpTarget; - ScColorScaleEntry* pEntry = NULL; + ScColorScaleEntry* pEntry = nullptr; if(maModel.mbIsLower) pEntry = pDataBar->mpLowerLimit.get(); else diff --git a/sc/source/filter/oox/condformatcontext.cxx b/sc/source/filter/oox/condformatcontext.cxx index 5ba13c8bd833..fed21b7f93b7 100644 --- a/sc/source/filter/oox/condformatcontext.cxx +++ b/sc/source/filter/oox/condformatcontext.cxx @@ -38,16 +38,16 @@ ContextHandlerRef ColorScaleContext::onCreateContext( sal_Int32 nElement, const switch( getCurrentElement() ) { case XLS_TOKEN( cfRule ): - return (nElement == XLS_TOKEN( colorScale )) ? this : 0; + return (nElement == XLS_TOKEN( colorScale )) ? this : nullptr; case XLS_TOKEN( colorScale ): if (nElement == XLS_TOKEN( cfvo )) return this; else if (nElement == XLS_TOKEN( color )) return this; else - return 0; + return nullptr; } - return 0; + return nullptr; } void ColorScaleContext::onStartElement( const AttributeList& rAttribs ) @@ -74,16 +74,16 @@ ContextHandlerRef DataBarContext::onCreateContext( sal_Int32 nElement, const Att switch( getCurrentElement() ) { case XLS_TOKEN( cfRule ): - return (nElement == XLS_TOKEN( dataBar )) ? this : 0; + return (nElement == XLS_TOKEN( dataBar )) ? this : nullptr; case XLS_TOKEN( dataBar ): if (nElement == XLS_TOKEN( cfvo )) return this; else if (nElement == XLS_TOKEN( color )) return this; else - return 0; + return nullptr; } - return 0; + return nullptr; } void DataBarContext::onStartElement( const AttributeList& rAttribs ) @@ -114,7 +114,7 @@ ContextHandlerRef IconSetContext::onCreateContext( sal_Int32 nElement, const Att { case XLS_TOKEN( cfRule ): case XLS14_TOKEN( cfRule ): - return (nElement == XLS_TOKEN( iconSet ) || nElement == XLS14_TOKEN(iconSet)) ? this : 0; + return (nElement == XLS_TOKEN( iconSet ) || nElement == XLS14_TOKEN(iconSet)) ? this : nullptr; case XLS_TOKEN( iconSet ): case XLS14_TOKEN(iconSet): if (nElement == XLS_TOKEN( cfvo ) || @@ -122,12 +122,12 @@ ContextHandlerRef IconSetContext::onCreateContext( sal_Int32 nElement, const Att nElement == XLS14_TOKEN(cfIcon)) return this; else - return 0; + return nullptr; case XLS14_TOKEN(cfvo): if (nElement == XM_TOKEN(f)) return this; } - return 0; + return nullptr; } void IconSetContext::onStartElement( const AttributeList& rAttribs ) @@ -174,7 +174,7 @@ ContextHandlerRef CondFormatContext::onCreateContext( sal_Int32 nElement, const switch( getCurrentElement() ) { case XLS_TOKEN( conditionalFormatting ): - return (nElement == XLS_TOKEN( cfRule )) ? this : 0; + return (nElement == XLS_TOKEN( cfRule )) ? this : nullptr; case XLS_TOKEN( cfRule ): if (nElement == XLS_TOKEN( formula )) return this; @@ -187,9 +187,9 @@ ContextHandlerRef CondFormatContext::onCreateContext( sal_Int32 nElement, const else if (nElement == XLS_TOKEN( extLst ) ) return new ExtLstLocalContext( *this, mxRule->getDataBar()->getDataBarFormatData() ); else - return 0; + return nullptr; } - return 0; + return nullptr; } void CondFormatContext::onEndElement() @@ -227,9 +227,9 @@ ContextHandlerRef CondFormatContext::onCreateRecordContext( sal_Int32 nRecId, Se switch( getCurrentElement() ) { case BIFF12_ID_CONDFORMATTING: - return (nRecId == BIFF12_ID_CFRULE) ? this : 0; + return (nRecId == BIFF12_ID_CFRULE) ? this : nullptr; } - return 0; + return nullptr; } void CondFormatContext::onStartRecord( SequenceInputStream& rStrm ) diff --git a/sc/source/filter/oox/connectionsfragment.cxx b/sc/source/filter/oox/connectionsfragment.cxx index 7391e4057597..61de65374a9e 100644 --- a/sc/source/filter/oox/connectionsfragment.cxx +++ b/sc/source/filter/oox/connectionsfragment.cxx @@ -58,7 +58,7 @@ ContextHandlerRef ConnectionContext::onCreateContext( sal_Int32 nElement, const mrConnection.importTable( rAttribs, nElement ); break; } - return 0; + return nullptr; } void ConnectionContext::onStartElement( const AttributeList& rAttribs ) @@ -91,7 +91,7 @@ ContextHandlerRef ConnectionContext::onCreateRecordContext( sal_Int32 nRecId, Se mrConnection.importWebPrTable( rStrm, nRecId ); break; } - return 0; + return nullptr; } void ConnectionContext::onStartRecord( SequenceInputStream& rStrm ) @@ -119,7 +119,7 @@ ContextHandlerRef ConnectionsFragment::onCreateContext( sal_Int32 nElement, cons return new ConnectionContext( *this, getConnections().createConnection() ); break; } - return 0; + return nullptr; } ContextHandlerRef ConnectionsFragment::onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& /*rStrm*/ ) @@ -136,7 +136,7 @@ ContextHandlerRef ConnectionsFragment::onCreateRecordContext( sal_Int32 nRecId, return new ConnectionContext( *this, getConnections().createConnection() ); break; } - return 0; + return nullptr; } const RecordInfo* ConnectionsFragment::getRecordInfos() const diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index a1811d70c580..99ed9b71bdd6 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -229,7 +229,7 @@ Any DefinedNameBase::getReference( const CellAddress& rBaseAddr ) const DefinedName::DefinedName( const WorkbookHelper& rHelper ) : DefinedNameBase( rHelper ), - mpScRangeData(NULL), + mpScRangeData(nullptr), mnTokenIndex( -1 ), mnCalcSheet( 0 ), mcBuiltinId( BIFF_DEFNAME_UNKNOWN ) diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx index 6f6a06cb68fb..eb9b46649d98 100644 --- a/sc/source/filter/oox/drawingbase.cxx +++ b/sc/source/filter/oox/drawingbase.cxx @@ -122,7 +122,7 @@ void ShapeAnchor::importClientData( const AttributeList& rAttribs ) void ShapeAnchor::setCellPos( sal_Int32 nElement, sal_Int32 nParentContext, const OUString& rValue ) { - CellAnchorModel* pCellAnchor = 0; + CellAnchorModel* pCellAnchor = nullptr; switch( nParentContext ) { case XDR_TOKEN( from ): diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index c97da72b5f02..c3f41c839eb4 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -160,7 +160,7 @@ GroupShapeContext::GroupShapeContext( ContextHandler2Helper& rParent, return new GroupShapeContext( rParent, rHelper, rxParentShape, xShape ); } } - return 0; + return nullptr; } ContextHandlerRef GroupShapeContext::onCreateContext( @@ -226,7 +226,7 @@ ContextHandlerRef DrawingFragment::onCreateContext( sal_Int32 nElement, const At } break; } - return 0; + return nullptr; } void DrawingFragment::onCharacters( const OUString& rChars ) @@ -504,7 +504,7 @@ Reference< XShape > VmlDrawing::createAndInsertClientXShape( const ::oox::vml::S /* Move top border of groupbox up by half font height, because Excel specifies Y position of the groupbox border line instead the top border of the caption text. */ - if( const ::oox::vml::TextFontModel* pFontModel = pTextBox ? pTextBox->getFirstFont() : 0 ) + if( const ::oox::vml::TextFontModel* pFontModel = pTextBox ? pTextBox->getFirstFont() : nullptr ) { sal_Int32 nFontHeightHmm = getUnitConverter().scaleToMm100( pFontModel->monSize.get( 160 ), UNIT_TWIP ); sal_Int32 nYDiff = ::std::min< sal_Int32 >( nFontHeightHmm / 2, aShapeRect.Y ); diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index edb19721ce6a..5edaadf2fc15 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -44,7 +44,7 @@ using ::oox::drawingml::table::TableStyleListPtr; ExcelFilter::ExcelFilter( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) : XmlFilterBase( rxContext ), - mpBookGlob( 0 ) + mpBookGlob( nullptr ) { } @@ -66,7 +66,7 @@ WorkbookGlobals& ExcelFilter::getWorkbookGlobals() const void ExcelFilter::unregisterWorkbookGlobals() { - mpBookGlob = 0; + mpBookGlob = nullptr; } bool ExcelFilter::importDocument() @@ -123,7 +123,7 @@ const ::oox::drawingml::Theme* ExcelFilter::getCurrentTheme() const ::oox::vml::Drawing* ExcelFilter::getVmlDrawing() { - return 0; + return nullptr; } const TableStyleListPtr ExcelFilter::getTableStyles() diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index 25864b6a1182..e57cf73844f7 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -490,7 +490,7 @@ Reference< XExternalSheetCache > ExternalLink::getSheetCache( sal_Int32 nTabId ) catch( Exception& ) { } - return 0; + return nullptr; } void ExternalLink::getSheetRange( LinkSheetRange& orSheetRange, sal_Int32 nTabId1, sal_Int32 nTabId2 ) const @@ -782,7 +782,7 @@ ExternalLinkRef ExternalLinkBuffer::createExternalLink() const RefSheetsModel* ExternalLinkBuffer::getRefSheets( sal_Int32 nRefId ) const { return ((0 <= nRefId) && (static_cast< size_t >( nRefId ) < maRefSheets.size())) ? - &maRefSheets[ static_cast< size_t >( nRefId ) ] : 0; + &maRefSheets[ static_cast< size_t >( nRefId ) ] : nullptr; } } // namespace xls diff --git a/sc/source/filter/oox/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx index 31854efa4ab9..0ed09f50f816 100644 --- a/sc/source/filter/oox/externallinkfragment.cxx +++ b/sc/source/filter/oox/externallinkfragment.cxx @@ -57,7 +57,7 @@ ContextHandlerRef ExternalSheetDataContext::onCreateContext( sal_Int32 nElement, if( nElement == XLS_TOKEN( v ) ) return this; // collect characters in onCharacters() break; } - return 0; + return nullptr; } void ExternalSheetDataContext::onCharacters( const OUString& rChars ) @@ -99,7 +99,7 @@ ContextHandlerRef ExternalSheetDataContext::onCreateRecordContext( sal_Int32 nRe } break; } - return 0; + return nullptr; } // private -------------------------------------------------------------------- @@ -234,7 +234,7 @@ ContextHandlerRef ExternalLinkFragment::onCreateContext( sal_Int32 nElement, con if( nElement == XLS_TOKEN( oleItem ) ) mxExtName = mrExtLink.importOleItem( rAttribs ); break; } - return 0; + return nullptr; } void ExternalLinkFragment::onCharacters( const OUString& rChars ) @@ -307,7 +307,7 @@ ContextHandlerRef ExternalLinkFragment::onCreateRecordContext( sal_Int32 nRecId, } break; } - return 0; + return nullptr; } ContextHandlerRef ExternalLinkFragment::createSheetDataContext( sal_Int32 nSheetId ) diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx index f0980d54ffb5..b7ff5de9b5a6 100644 --- a/sc/source/filter/oox/extlstcontext.cxx +++ b/sc/source/filter/oox/extlstcontext.cxx @@ -71,7 +71,7 @@ void ExtCfRuleContext::onStartElement( const AttributeList& rAttribs ) ExtConditionalFormattingContext::ExtConditionalFormattingContext(WorksheetContextBase& rFragment): WorksheetContextBase(rFragment), - mpCurrentRule(NULL) + mpCurrentRule(nullptr) { } @@ -87,7 +87,7 @@ ContextHandlerRef ExtConditionalFormattingContext::onCreateContext(sal_Int32 nEl ScAddress aPos(0, 0, nTab); mpCurrentRule->SetData(&rIconSet, pDoc, aPos); delete mpCurrentRule; - mpCurrentRule = NULL; + mpCurrentRule = nullptr; } if (nElement == XLS14_TOKEN(cfRule)) { @@ -98,12 +98,12 @@ ContextHandlerRef ExtConditionalFormattingContext::onCreateContext(sal_Int32 nEl // an ext entry does not need to have an existing corresponding entry ExtLst::const_iterator aExt = getExtLst().find( aId ); if(aExt == getExtLst().end()) - return NULL; + return nullptr; ScDataBarFormatData* pInfo = aExt->second; if (!pInfo) { - return NULL; + return nullptr; } return new ExtCfRuleContext( *this, pInfo ); } @@ -125,7 +125,7 @@ ContextHandlerRef ExtConditionalFormattingContext::onCreateContext(sal_Int32 nEl return this; } - return NULL; + return nullptr; } void ExtConditionalFormattingContext::onStartElement(const AttributeList& /*rAttribs*/) @@ -191,15 +191,15 @@ ContextHandlerRef ExtLstLocalContext::onCreateContext( sal_Int32 nElement, const if(nElement == XLS_TOKEN( ext )) return this; else - return 0; + return nullptr; break; case XLS_TOKEN( ext ): if (nElement == XLS14_TOKEN( id )) return this; else - return 0; + return nullptr; } - return 0; + return nullptr; } void ExtLstLocalContext::onStartElement( const AttributeList& ) diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index d830ccdb2b29..f216b77c7b95 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -417,21 +417,21 @@ static const FunctionData saFuncTableBiff2[] = { "TRUNC", "TRUNC", 197, 197, 1, 1, V, { VR, C }, 0 }, { "ISLOGICAL", "ISLOGICAL", 198, 198, 1, 1, V, { VR }, 0 }, { "DCOUNTA", "DCOUNTA", 199, 199, 3, 3, V, { RO, RR }, 0 }, - { 0, "EXTERN.CALL", 255, 255, 1, MX, R, { RO_E, RO }, FUNCFLAG_IMPORTONLY }, + { nullptr, "EXTERN.CALL", 255, 255, 1, MX, R, { RO_E, RO }, FUNCFLAG_IMPORTONLY }, // *** macro sheet commands *** - { 0, "A1.R1C1", 30, 30, 0, 1, V, { VR }, FUNCFLAG_MACROCMD }, - { 0, "RETURN", 55, 55, 0, 1, R, { RO }, FUNCFLAG_MACROFUNC }, - { 0, "ABSREF", 79, 79, 2, 2, R, { VR, RO }, FUNCFLAG_MACROFUNC }, - { 0, "ADD.ARROW", 81, 81, 0, 0, V, {}, FUNCFLAG_MACROCMD }, - { 0, "ACTIVE.CELL", 94, 94, 0, 0, R, {}, FUNCFLAG_MACROFUNC }, - { 0, "ACTIVATE", 103, 103, 0, 2, V, { VR }, FUNCFLAG_MACROCMD }, - { 0, "ACTIVATE.NEXT", 104, 104, 0, 0, V, {}, FUNCFLAG_MACROCMD }, - { 0, "ACTIVATE.PREV", 105, 105, 0, 0, V, {}, FUNCFLAG_MACROCMD }, - { 0, "ADD.BAR", 151, 151, 0, 0, V, {}, FUNCFLAG_MACROFUNC | FUNCFLAG_ALWAYSVAR }, - { 0, "ADD.MENU", 152, 152, 2, 2, V, { VR, RO }, FUNCFLAG_MACROFUNC | FUNCFLAG_ALWAYSVAR }, - { 0, "ADD.COMMAND", 153, 153, 3, 3, V, { VR, RO }, FUNCFLAG_MACROFUNC | FUNCFLAG_ALWAYSVAR } + { nullptr, "A1.R1C1", 30, 30, 0, 1, V, { VR }, FUNCFLAG_MACROCMD }, + { nullptr, "RETURN", 55, 55, 0, 1, R, { RO }, FUNCFLAG_MACROFUNC }, + { nullptr, "ABSREF", 79, 79, 2, 2, R, { VR, RO }, FUNCFLAG_MACROFUNC }, + { nullptr, "ADD.ARROW", 81, 81, 0, 0, V, {}, FUNCFLAG_MACROCMD }, + { nullptr, "ACTIVE.CELL", 94, 94, 0, 0, R, {}, FUNCFLAG_MACROFUNC }, + { nullptr, "ACTIVATE", 103, 103, 0, 2, V, { VR }, FUNCFLAG_MACROCMD }, + { nullptr, "ACTIVATE.NEXT", 104, 104, 0, 0, V, {}, FUNCFLAG_MACROCMD }, + { nullptr, "ACTIVATE.PREV", 105, 105, 0, 0, V, {}, FUNCFLAG_MACROCMD }, + { nullptr, "ADD.BAR", 151, 151, 0, 0, V, {}, FUNCFLAG_MACROFUNC | FUNCFLAG_ALWAYSVAR }, + { nullptr, "ADD.MENU", 152, 152, 2, 2, V, { VR, RO }, FUNCFLAG_MACROFUNC | FUNCFLAG_ALWAYSVAR }, + { nullptr, "ADD.COMMAND", 153, 153, 3, 3, V, { VR, RO }, FUNCFLAG_MACROFUNC | FUNCFLAG_ALWAYSVAR } }; /** Functions new in BIFF3. */ @@ -443,9 +443,9 @@ static const FunctionData saFuncTableBiff3[] = { "GROWTH", "GROWTH", 52, 52, 1, 4, A, { RA, RA, RA, VV }, 0 }, // BIFF2: 1-3, BIFF3: 1-4 { "TRUNC", "TRUNC", 197, 197, 1, 2, V, { VR }, 0 }, // BIFF2: 1, BIFF3: 1-2 { "DOLLAR", "USDOLLAR", 204, 204, 1, 2, V, { VR }, FUNCFLAG_IMPORTONLY }, - { 0/*"FIND"*/, "FINDB", 205, 205, 2, 3, V, { VR }, 0 }, - { 0/*"SEARCH"*/, "SEARCHB", 206, 206, 2, 3, V, { VR }, 0 }, - { 0/*"REPLACE"*/, "REPLACEB", 207, 207, 4, 4, V, { VR }, 0 }, + { nullptr/*"FIND"*/, "FINDB", 205, 205, 2, 3, V, { VR }, 0 }, + { nullptr/*"SEARCH"*/, "SEARCHB", 206, 206, 2, 3, V, { VR }, 0 }, + { nullptr/*"REPLACE"*/, "REPLACEB", 207, 207, 4, 4, V, { VR }, 0 }, { "LEFTB", "LEFTB", 208, 208, 1, 2, V, { VR }, 0 }, { "RIGHTB", "RIGHTB", 209, 209, 1, 2, V, { VR }, 0 }, { "MIDB", "MIDB", 210, 210, 3, 3, V, { VR }, 0 }, @@ -475,9 +475,9 @@ static const FunctionData saFuncTableBiff3[] = // *** macro sheet commands *** - { 0, "ADD.BAR", 151, 151, 0, 1, V, { VR }, FUNCFLAG_MACROFUNC }, // BIFF2: 0, BIFF3: 0-1 - { 0, "ADD.MENU", 152, 152, 2, 3, V, { VR, RO }, FUNCFLAG_MACROFUNC }, // BIFF2: 2, BIFF3: 2-3 - { 0, "ADD.COMMAND", 153, 153, 3, 4, V, { VR, RO }, FUNCFLAG_MACROFUNC } // BIFF2: 3, BIFF3: 3-4 + { nullptr, "ADD.BAR", 151, 151, 0, 1, V, { VR }, FUNCFLAG_MACROFUNC }, // BIFF2: 0, BIFF3: 0-1 + { nullptr, "ADD.MENU", 152, 152, 2, 3, V, { VR, RO }, FUNCFLAG_MACROFUNC }, // BIFF2: 2, BIFF3: 2-3 + { nullptr, "ADD.COMMAND", 153, 153, 3, 4, V, { VR, RO }, FUNCFLAG_MACROFUNC } // BIFF2: 3, BIFF3: 3-4 }; /** Functions new in BIFF4. */ @@ -651,8 +651,8 @@ static const FunctionData saFuncTableBiff4[] = // *** macro sheet commands *** - { 0, "ACTIVATE.NEXT", 104, 104, 0, 1, V, { VR }, FUNCFLAG_MACROCMD }, // BIFF2-3: 0, BIFF4: 0-1 - { 0, "ACTIVATE.PREV", 105, 105, 0, 1, V, { VR }, FUNCFLAG_MACROCMD } // BIFF2-3: 0, BIFF4: 0-1 + { nullptr, "ACTIVATE.NEXT", 104, 104, 0, 1, V, { VR }, FUNCFLAG_MACROCMD }, // BIFF2-3: 0, BIFF4: 0-1 + { nullptr, "ACTIVATE.PREV", 105, 105, 0, 1, V, { VR }, FUNCFLAG_MACROCMD } // BIFF2-3: 0, BIFF4: 0-1 }; /** Functions new in BIFF5/BIFF7. */ @@ -662,7 +662,7 @@ static const FunctionData saFuncTableBiff5[] = { "HLOOKUP", "HLOOKUP", 101, 101, 3, 4, V, { VV, RO, RO, VV }, 0 }, // BIFF2-4: 3, BIFF5: 3-4 { "VLOOKUP", "VLOOKUP", 102, 102, 3, 4, V, { VV, RO, RO, VV }, 0 }, // BIFF2-4: 3, BIFF5: 3-4 { "DAYS360", "DAYS360", 220, 220, 2, 3, V, { VR }, 0 }, // BIFF3-4: 2, BIFF5: 2-3 - { 0, "EXTERN.CALL", 255, 255, 1, MX, R, { RO_E, RO }, FUNCFLAG_EXPORTONLY }, // MACRO or EXTERNAL + { nullptr, "EXTERN.CALL", 255, 255, 1, MX, R, { RO_E, RO }, FUNCFLAG_EXPORTONLY }, // MACRO or EXTERNAL { "CONCATENATE", "CONCATENATE", 336, 336, 0, MX, V, { VR }, 0 }, { "POWER", "POWER", 337, 337, 2, 2, V, { VR }, 0 }, { "RADIANS", "RADIANS", 342, 342, 1, 1, V, { VR }, 0 }, @@ -673,8 +673,8 @@ static const FunctionData saFuncTableBiff5[] = { "COUNTBLANK", "COUNTBLANK", 347, 347, 1, 1, V, { RO }, 0 }, { "ISPMT", "ISPMT", 350, 350, 4, 4, V, { VR }, 0 }, { "DATEDIF", "DATEDIF", 351, 351, 3, 3, V, { VR }, 0 }, - { 0, "DATESTRING", 352, 352, 1, 1, V, { VR }, FUNCFLAG_IMPORTONLY }, // not supported in Calc, missing in OOXML spec - { 0, "NUMBERSTRING", 353, 353, 2, 2, V, { VR }, FUNCFLAG_IMPORTONLY }, // not supported in Calc, missing in OOXML spec + { nullptr, "DATESTRING", 352, 352, 1, 1, V, { VR }, FUNCFLAG_IMPORTONLY }, // not supported in Calc, missing in OOXML spec + { nullptr, "NUMBERSTRING", 353, 353, 2, 2, V, { VR }, FUNCFLAG_IMPORTONLY }, // not supported in Calc, missing in OOXML spec { "ROMAN", "ROMAN", 354, 354, 1, 2, V, { VR }, 0 }, // *** EuroTool add-in *** @@ -683,11 +683,11 @@ static const FunctionData saFuncTableBiff5[] = // *** macro sheet commands *** - { 0, "ADD.MENU", 152, 152, 2, 4, V, { VR, RO, RO, VR }, FUNCFLAG_MACROFUNC }, // BIFF3-4: 2-3, BIFF5: 2-4 - { 0, "ADD.COMMAND", 153, 153, 3, 5, V, { VR, RO, RO, RO, VR }, FUNCFLAG_MACROFUNC }, // BIFF3-4: 3-4, BIFF5: 3-5 - { 0, "ADD.CHART.AUTOFORMAT", 390, 390, 0, 2, V, { VR }, FUNCFLAG_MACROCMD }, - { 0, "ADD.LIST.ITEM", 451, 451, 0, 2, V, { VR }, FUNCFLAG_MACROCMD }, - { 0, "ACTIVE.CELL.FONT", 476, 476, 0, 14, V, { VR }, FUNCFLAG_MACROCMD } + { nullptr, "ADD.MENU", 152, 152, 2, 4, V, { VR, RO, RO, VR }, FUNCFLAG_MACROFUNC }, // BIFF3-4: 2-3, BIFF5: 2-4 + { nullptr, "ADD.COMMAND", 153, 153, 3, 5, V, { VR, RO, RO, RO, VR }, FUNCFLAG_MACROFUNC }, // BIFF3-4: 3-4, BIFF5: 3-5 + { nullptr, "ADD.CHART.AUTOFORMAT", 390, 390, 0, 2, V, { VR }, FUNCFLAG_MACROCMD }, + { nullptr, "ADD.LIST.ITEM", 451, 451, 0, 2, V, { VR }, FUNCFLAG_MACROCMD }, + { nullptr, "ACTIVE.CELL.FONT", 476, 476, 0, 14, V, { VR }, FUNCFLAG_MACROCMD } }; /** Functions new in BIFF8. */ @@ -695,7 +695,7 @@ static const FunctionData saFuncTableBiff8[] = { { "GETPIVOTDATA", "GETPIVOTDATA", 358, 358, 2, MX, V, { RR, RR, VR, VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_PARAMPAIRS }, { "HYPERLINK", "HYPERLINK", 359, 359, 1, 2, V, { VV, VO }, 0 }, - { 0, "PHONETIC", 360, 360, 1, 1, V, { RO }, FUNCFLAG_IMPORTONLY }, + { nullptr, "PHONETIC", 360, 360, 1, 1, V, { RO }, FUNCFLAG_IMPORTONLY }, { "AVERAGEA", "AVERAGEA", 361, 361, 1, MX, V, { RX }, 0 }, { "MAXA", "MAXA", 362, 362, 1, MX, V, { RX }, 0 }, { "MINA", "MINA", 363, 363, 1, MX, V, { RX }, 0 }, @@ -704,29 +704,29 @@ static const FunctionData saFuncTableBiff8[] = { "STDEVA", "STDEVA", 366, 366, 1, MX, V, { RX }, 0 }, { "VARA", "VARA", 367, 367, 1, MX, V, { RX }, 0 }, { "COM.MICROSOFT.BAHTTEXT", "BAHTTEXT", 368, 368, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, - { 0, "THAIDAYOFWEEK", 369, 369, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, - { 0, "THAIDIGIT", 370, 370, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, - { 0, "THAIMONTHOFYEAR", 371, 371, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, - { 0, "THAINUMSOUND", 372, 372, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, - { 0, "THAINUMSTRING", 373, 373, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, - { 0, "THAISTRINGLENGTH", 374, 374, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, - { 0, "ISTHAIDIGIT", 375, 375, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, - { 0, "ROUNDBAHTDOWN", 376, 376, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, - { 0, "ROUNDBAHTUP", 377, 377, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, - { 0, "THAIYEAR", 378, 378, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, - { 0, "RTD", 379, 379, 3, 3, A, { VR, VR, RO }, 0 } + { nullptr, "THAIDAYOFWEEK", 369, 369, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, + { nullptr, "THAIDIGIT", 370, 370, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, + { nullptr, "THAIMONTHOFYEAR", 371, 371, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, + { nullptr, "THAINUMSOUND", 372, 372, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, + { nullptr, "THAINUMSTRING", 373, 373, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, + { nullptr, "THAISTRINGLENGTH", 374, 374, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, + { nullptr, "ISTHAIDIGIT", 375, 375, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, + { nullptr, "ROUNDBAHTDOWN", 376, 376, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, + { nullptr, "ROUNDBAHTUP", 377, 377, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, + { nullptr, "THAIYEAR", 378, 378, 1, 1, V, { VR }, FUNCFLAG_MACROCALL }, + { nullptr, "RTD", 379, 379, 3, 3, A, { VR, VR, RO }, 0 } }; /** Functions new in OOXML. */ static const FunctionData saFuncTableOox[] = { - { 0, "CUBEVALUE", 380, NOID, 1, MX, V, { VR, RX }, 0 }, - { 0, "CUBEMEMBER", 381, NOID, 2, 3, V, { VR, RX, VR }, 0 }, - { 0, "CUBEMEMBERPROPERTY", 382, NOID, 3, 3, V, { VR }, 0 }, - { 0, "CUBERANKEDMEMBER", 383, NOID, 3, 4, V, { VR }, 0 }, - { 0, "CUBEKPIMEMBER", 477, NOID, 3, 4, V, { VR }, 0 }, - { 0, "CUBESET", 478, NOID, 2, 5, V, { VR, RX, VR }, 0 }, - { 0, "CUBESETCOUNT", 479, NOID, 1, 1, V, { VR }, 0 }, + { nullptr, "CUBEVALUE", 380, NOID, 1, MX, V, { VR, RX }, 0 }, + { nullptr, "CUBEMEMBER", 381, NOID, 2, 3, V, { VR, RX, VR }, 0 }, + { nullptr, "CUBEMEMBERPROPERTY", 382, NOID, 3, 3, V, { VR }, 0 }, + { nullptr, "CUBERANKEDMEMBER", 383, NOID, 3, 4, V, { VR }, 0 }, + { nullptr, "CUBEKPIMEMBER", 477, NOID, 3, 4, V, { VR }, 0 }, + { nullptr, "CUBESET", 478, NOID, 2, 5, V, { VR, RX, VR }, 0 }, + { nullptr, "CUBESETCOUNT", 479, NOID, 1, 1, V, { VR }, 0 }, { "IFERROR", "IFERROR", 480, NOID, 2, 2, V, { VO, RO }, FUNCFLAG_MACROCALL }, { "COUNTIFS", "COUNTIFS", 481, NOID, 2, MX, V, { RO, VR }, FUNCFLAG_MACROCALL | FUNCFLAG_PARAMPAIRS }, { "SUMIFS", "SUMIFS", 482, NOID, 3, MX, V, { RO, RO, VR }, FUNCFLAG_MACROCALL | FUNCFLAG_PARAMPAIRS }, @@ -860,9 +860,9 @@ static const FunctionData saFuncTable2013[] = { "COM.MICROSOFT.FLOOR.MATH", "FLOOR.MATH", NOID, NOID, 1, 3, V, { VR }, FUNCFLAG_MACROCALL_NEW }, { "FLOOR", "FLOOR.MATH", NOID, NOID, 1, 3, V, { VR }, FUNCFLAG_EXPORTONLY }, // NOTE: this FDIST is not our LEGACY.FDIST - { 0/*"FDIST"*/, "FDIST", NOID, NOID, 3, 4, V, { VR }, FUNCFLAG_MACROCALL_NEW }, + { nullptr/*"FDIST"*/, "FDIST", NOID, NOID, 3, 4, V, { VR }, FUNCFLAG_MACROCALL_NEW }, // NOTE: this FINV is not our LEGACY.FINV - { 0/*"FINV"*/, "FINV", NOID, NOID, 3, 3, V, { VR }, FUNCFLAG_MACROCALL_NEW }, + { nullptr/*"FINV"*/, "FINV", NOID, NOID, 3, 3, V, { VR }, FUNCFLAG_MACROCALL_NEW }, { "FORMULA", "FORMULATEXT", NOID, NOID, 1, 1, V, { RO }, FUNCFLAG_MACROCALL_NEW }, { "GAMMA", "GAMMA", NOID, NOID, 1, 1, V, { VR }, FUNCFLAG_MACROCALL_NEW }, { "GAUSS", "GAUSS", NOID, NOID, 1, 1, V, { VR }, FUNCFLAG_MACROCALL_NEW }, @@ -898,8 +898,8 @@ static const FunctionData saFuncTable2013[] = /** Functions defined by OpenFormula, but not supported by Calc or by Excel. */ static const FunctionData saFuncTableOdf[] = { - { "CHISQDIST", 0, NOID, NOID, 2, 3, V, { VR }, FUNCFLAG_MACROCALLODF }, - { "CHISQINV", 0, NOID, NOID, 2, 2, V, { VR }, FUNCFLAG_MACROCALLODF } + { "CHISQDIST", nullptr, NOID, NOID, 2, 3, V, { VR }, FUNCFLAG_MACROCALLODF }, + { "CHISQINV", nullptr, NOID, NOID, 2, 2, V, { VR }, FUNCFLAG_MACROCALLODF } }; /** Functions defined by Calc, but not in OpenFormula nor supported by Excel. */ @@ -967,7 +967,7 @@ FunctionParamInfoIterator& FunctionParamInfoIterator::operator++() ++mpParamInfo; // if last parameter type is 'Excel-only' or 'Calc-only', do not repeat it else if( isExcelOnlyParam() || isCalcOnlyParam() ) - mpParamInfo = 0; + mpParamInfo = nullptr; // points to last info, but parameter pairs expected, move to previous info else if( mbParamPairs ) --mpParamInfo; @@ -1260,7 +1260,7 @@ OpCodeProviderImpl::OpCodeProviderImpl( const FunctionInfoVector& rFuncInfos, // functions fillFuncTokenMaps( aTokenMap, aExtFuncTokenMap, aEntrySeq, xMapper ) && initFuncOpCodes( aTokenMap, aExtFuncTokenMap, rFuncInfos ) && - initOpCode( OPCODE_DDE, aTokenMap, "DDE", 0 ); + initOpCode( OPCODE_DDE, aTokenMap, "DDE", nullptr ); OSL_ENSURE( bIsValid, "OpCodeProviderImpl::OpCodeProviderImpl - opcodes not initialized" ); (void)bIsValid; @@ -1466,7 +1466,7 @@ const ApiOpCodes& OpCodeProvider::getOpCodes() const const FunctionInfo* OpCodeProvider::getFuncInfoFromApiToken( const ApiToken& rToken ) const { - const FunctionInfo* pFuncInfo = 0; + const FunctionInfo* pFuncInfo = nullptr; if( (rToken.OpCode == mxOpCodeImpl->OPCODE_EXTERNAL) && rToken.Data.has< OUString >() ) pFuncInfo = mxOpCodeImpl->maExtProgFuncs.get( rToken.Data.get< OUString >() ).get(); else if( (rToken.OpCode == mxOpCodeImpl->OPCODE_MACRO) && rToken.Data.has< OUString >() ) diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index 58507f8fd2d8..ef6172f46a9e 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -56,7 +56,7 @@ public: SCROW mnRow; ScFormulaCell* mpCell; - Item() : mnRow(-1), mpCell(NULL) {} + Item() : mnRow(-1), mpCell(nullptr) {} }; explicit CachedTokenArray( ScDocument& rDoc ) : @@ -74,7 +74,7 @@ public: // Check if a token array is cached for this column. ColCacheType::iterator it = maCache.find(rPos.Col()); if (it == maCache.end()) - return NULL; + return nullptr; Item& rCached = *it->second; const ScTokenArray& rCode = *rCached.mpCell->GetCode(); @@ -82,7 +82,7 @@ public: if (rFormula == aPredicted) return &rCached; - return NULL; + return nullptr; } void store( const ScAddress& rPos, ScFormulaCell* pCell ) @@ -193,7 +193,7 @@ void applyCellFormulas( { // Use the cached version to avoid re-compilation. - ScFormulaCell* pCell = NULL; + ScFormulaCell* pCell = nullptr; if (p->mnRow + 1 == aPos.Row()) { // Put them in the same formula group. @@ -350,11 +350,11 @@ FormulaBuffer::SharedFormulaDesc::SharedFormulaDesc( maAddress(rAddr), mnSharedId(nSharedId), maCellValue(rCellValue), mnValueType(nValueType) {} FormulaBuffer::SheetItem::SheetItem() : - mpCellFormulas(NULL), - mpArrayFormulas(NULL), - mpCellFormulaValues(NULL), - mpSharedFormulaEntries(NULL), - mpSharedFormulaIDs(NULL) {} + mpCellFormulas(nullptr), + mpArrayFormulas(nullptr), + mpCellFormulaValues(nullptr), + mpSharedFormulaEntries(nullptr), + mpSharedFormulaIDs(nullptr) {} FormulaBuffer::FormulaBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -425,7 +425,7 @@ void FormulaBuffer::finalizeImport() } } - rDoc.getDoc().SetAutoNameCache(NULL); + rDoc.getDoc().SetAutoNameCache(nullptr); xFormulaBar->setPosition( 1.0 ); } diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index 888edd6e3af9..3e8dd034fdc5 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -66,7 +66,7 @@ ApiTokenSequence FormulaFinalizer::finalizeTokenArray( const ApiTokenSequence& r const FunctionInfo* FormulaFinalizer::resolveBadFuncName( const OUString& ) const { - return 0; + return nullptr; } OUString FormulaFinalizer::resolveDefinedName( sal_Int32 ) const @@ -98,7 +98,7 @@ const FunctionInfo* FormulaFinalizer::getFunctionInfo( ApiToken& orFuncToken ) } // no success - return null - return 0; + return nullptr; } const FunctionInfo* FormulaFinalizer::getExternCallInfo( ApiToken& orFuncToken, const ApiToken& rECToken ) @@ -131,7 +131,7 @@ const FunctionInfo* FormulaFinalizer::getExternCallInfo( ApiToken& orFuncToken, } } - return 0; + return nullptr; } void FormulaFinalizer::processTokens( const ApiToken* pToken, const ApiToken* pTokenEnd ) @@ -141,7 +141,7 @@ void FormulaFinalizer::processTokens( const ApiToken* pToken, const ApiToken* pT // push the current token into the vector bool bValid = appendFinalToken( *pToken ); // try to process a function - if( const FunctionInfo* pFuncInfo = bValid ? getFunctionInfo( maTokens.back() ) : 0 ) + if( const FunctionInfo* pFuncInfo = bValid ? getFunctionInfo( maTokens.back() ) : nullptr ) pToken = processParameters( *pFuncInfo, pToken + 1, pTokenEnd ); // otherwise, go to next token else @@ -297,7 +297,7 @@ bool FormulaFinalizer::isEmptyParameter( const ApiToken* pToken, const ApiToken* const ApiToken* FormulaFinalizer::getSingleToken( const ApiToken* pToken, const ApiToken* pTokenEnd ) const { - const ApiToken* pSingleToken = 0; + const ApiToken* pSingleToken = nullptr; // skip leading whitespace tokens while( (pToken < pTokenEnd) && (pToken->OpCode == OPCODE_SPACES) ) ++pToken; // remember first non-whitespace token @@ -305,7 +305,7 @@ const ApiToken* FormulaFinalizer::getSingleToken( const ApiToken* pToken, const // skip trailing whitespace tokens while( (pToken < pTokenEnd) && (pToken->OpCode == OPCODE_SPACES) ) ++pToken; // return null, if other non-whitespace tokens follow - return (pToken == pTokenEnd) ? pSingleToken : 0; + return (pToken == pTokenEnd) ? pSingleToken : nullptr; } const ApiToken* FormulaFinalizer::skipParentheses( const ApiToken* pToken, const ApiToken* pTokenEnd ) const @@ -464,20 +464,20 @@ protected: ApiToken& getOperandToken( size_t nOpCountFromEnd, size_t nOpIndex, size_t nTokenIndex ); - bool pushOperandToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = 0 ); - bool pushAnyOperandToken( const Any& rAny, sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = 0 ); + bool pushOperandToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr ); + bool pushAnyOperandToken( const Any& rAny, sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr ); template< typename Type > - bool pushValueOperandToken( const Type& rValue, sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = 0 ); + bool pushValueOperandToken( const Type& rValue, sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr ); template< typename Type > - inline bool pushValueOperandToken( const Type& rValue, const WhiteSpaceVec* pSpaces = 0 ) + inline bool pushValueOperandToken( const Type& rValue, const WhiteSpaceVec* pSpaces = nullptr ) { return pushValueOperandToken( rValue, OPCODE_PUSH, pSpaces ); } - bool pushParenthesesOperandToken( const WhiteSpaceVec* pOpeningSpaces = 0, const WhiteSpaceVec* pClosingSpaces = 0 ); - bool pushUnaryPreOperatorToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = 0 ); - bool pushUnaryPostOperatorToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = 0 ); - bool pushBinaryOperatorToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = 0 ); - bool pushParenthesesOperatorToken( const WhiteSpaceVec* pOpeningSpaces = 0, const WhiteSpaceVec* pClosingSpaces = 0 ); - bool pushFunctionOperatorToken( sal_Int32 nOpCode, size_t nParamCount, const WhiteSpaceVec* pLeadingSpaces = 0, const WhiteSpaceVec* pClosingSpaces = 0 ); - bool pushFunctionOperatorToken( const FunctionInfo& rFuncInfo, size_t nParamCount, const WhiteSpaceVec* pLeadingSpaces = 0, const WhiteSpaceVec* pClosingSpaces = 0 ); + bool pushParenthesesOperandToken( const WhiteSpaceVec* pOpeningSpaces = nullptr, const WhiteSpaceVec* pClosingSpaces = nullptr ); + bool pushUnaryPreOperatorToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr ); + bool pushUnaryPostOperatorToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr ); + bool pushBinaryOperatorToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr ); + bool pushParenthesesOperatorToken( const WhiteSpaceVec* pOpeningSpaces = nullptr, const WhiteSpaceVec* pClosingSpaces = nullptr ); + bool pushFunctionOperatorToken( sal_Int32 nOpCode, size_t nParamCount, const WhiteSpaceVec* pLeadingSpaces = nullptr, const WhiteSpaceVec* pClosingSpaces = nullptr ); + bool pushFunctionOperatorToken( const FunctionInfo& rFuncInfo, size_t nParamCount, const WhiteSpaceVec* pLeadingSpaces = nullptr, const WhiteSpaceVec* pClosingSpaces = nullptr ); bool pushOperand( sal_Int32 nOpCode ); bool pushAnyOperand( const Any& rAny, sal_Int32 nOpCode ); @@ -839,7 +839,7 @@ bool FormulaParserImpl::pushFunctionOperatorToken( sal_Int32 nOpCode, size_t nPa // add function parentheses and function name return bOk && - ((nParamCount > 0) ? pushParenthesesOperatorToken( 0, pClosingSpaces ) : pushParenthesesOperandToken( 0, pClosingSpaces )) && + ((nParamCount > 0) ? pushParenthesesOperatorToken( nullptr, pClosingSpaces ) : pushParenthesesOperandToken( nullptr, pClosingSpaces )) && pushUnaryPreOperatorToken( nOpCode, pLeadingSpaces ); } @@ -1199,7 +1199,7 @@ const FunctionInfo* FormulaParserImpl::resolveBadFuncName( const OUString& rToke return pFuncInfo; } } - return 0; + return nullptr; } OUString FormulaParserImpl::resolveDefinedName( sal_Int32 nTokenIndex ) const @@ -2018,19 +2018,19 @@ BiffFormulaParserImpl::BiffFormulaParserImpl( const FormulaParser& rParent ) : mnRefIdSize = 0; break; case BIFF_UNKNOWN: - mpImportStrToken = NULL; - mpImportSpaceToken = NULL; - mpImportSheetToken = NULL; - mpImportEndSheetToken = NULL; - mpImportNlrToken = NULL; - mpImportRefToken = NULL; - mpImportAreaToken = NULL; - mpImportRef3dToken = NULL; - mpImportArea3dToken = NULL; - mpImportNameXToken = NULL; - mpImportFuncToken = NULL; - mpImportFuncVarToken = NULL; - mpImportFuncCEToken = NULL; + mpImportStrToken = nullptr; + mpImportSpaceToken = nullptr; + mpImportSheetToken = nullptr; + mpImportEndSheetToken = nullptr; + mpImportNlrToken = nullptr; + mpImportRefToken = nullptr; + mpImportAreaToken = nullptr; + mpImportRef3dToken = nullptr; + mpImportArea3dToken = nullptr; + mpImportNameXToken = nullptr; + mpImportFuncToken = nullptr; + mpImportFuncVarToken = nullptr; + mpImportFuncCEToken = nullptr; mnAttrDataSize = 0; mnArraySize = 0; mnNameSize = 0; diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index 5a8d1286ae20..167e3117adfe 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -66,15 +66,15 @@ struct BuiltinFormat /** Defines a built-in number format that maps to an own predefined format. */ #define NUMFMT_PREDEF( INDEX, PREDEFINED ) \ - { INDEX, 0, css::i18n::NumberFormatIndex::PREDEFINED, -1 } + { INDEX, nullptr, css::i18n::NumberFormatIndex::PREDEFINED, -1 } /** Defines a built-in number format that is the same as the specified in nReuseId. */ #define NUMFMT_REUSE( INDEX, REUSED_INDEX ) \ - { INDEX, 0, -1, REUSED_INDEX } + { INDEX, nullptr, -1, REUSED_INDEX } /** Terminates a built-in number format table. */ #define NUMFMT_ENDTABLE() \ - { -1, 0, -1, -1 } + { -1, nullptr, -1, -1 } /** Defines builtin date and time formats 14...22. @param SYSTEMDATE Complete short system date (for formats 14 and 22). diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx index edf4ad94d824..c4c68522ffcb 100644 --- a/sc/source/filter/oox/ooxformulaparser.cxx +++ b/sc/source/filter/oox/ooxformulaparser.cxx @@ -96,7 +96,7 @@ const FunctionInfo* OOXMLFormulaParserImpl::resolveBadFuncName( const OUString& } } } - return 0; + return nullptr; } OOXMLFormulaParser::OOXMLFormulaParser() diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index 704b098de939..df9196d3d133 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -740,7 +740,7 @@ const PivotCacheItem* PivotCacheField::getCacheItem( sal_Int32 nItemIdx ) const return maGroupItems.getCacheItem( nItemIdx ); if( hasSharedItems() ) return maSharedItems.getCacheItem( nItemIdx ); - return 0; + return nullptr; } void PivotCacheField::applyItemCaptions( const IdCaptionPairList& vCaptions ) @@ -1416,7 +1416,7 @@ PivotCache* PivotCacheBuffer::importPivotCacheFragment( sal_Int32 nCacheId ) // check if a fragment path exists for the passed cache identifier FragmentPathMap::iterator aIt = maFragmentPaths.find( nCacheId ); if( aIt == maFragmentPaths.end() ) - return 0; + return nullptr; /* Import the cache fragment. This may create a dummy data sheet for external sheet sources. */ @@ -1441,7 +1441,7 @@ PivotCache* PivotCacheBuffer::importPivotCacheFragment( sal_Int32 nCacheId ) nCacheId = ContainerHelper::getVectorElement( maCacheIds, nCacheId, -1 ); PivotCache* pCache = maCaches.get( nCacheId ).get(); if( !pCache ) - return 0; + return nullptr; /* Try to find fragment path entry (stream name). If missing, the stream has been read already, and the cache can be returned. */ @@ -1460,7 +1460,7 @@ PivotCache* PivotCacheBuffer::importPivotCacheFragment( sal_Int32 nCacheId ) case FILTER_UNKNOWN: OSL_FAIL( "PivotCacheBuffer::importPivotCacheFragment - unknown filter type" ); } - return 0; + return nullptr; } PivotCache& PivotCacheBuffer::createPivotCache( sal_Int32 nCacheId ) diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx index e90656ccb9ab..0ca92404a102 100644 --- a/sc/source/filter/oox/pivotcachefragment.cxx +++ b/sc/source/filter/oox/pivotcachefragment.cxx @@ -61,7 +61,7 @@ ContextHandlerRef PivotCacheFieldContext::onCreateContext( sal_Int32 nElement, c case XLS_TOKEN( discretePr ): mrCacheField.importDiscretePrItem( nElement, rAttribs ); break; case XLS_TOKEN( groupItems ): mrCacheField.importGroupItem( nElement, rAttribs ); break; } - return 0; + return nullptr; } void PivotCacheFieldContext::onStartElement( const AttributeList& rAttribs ) @@ -95,7 +95,7 @@ ContextHandlerRef PivotCacheFieldContext::onCreateRecordContext( sal_Int32 nRecI case BIFF12_ID_PCDFDISCRETEPR: mrCacheField.importPCDFDiscretePrItem( nRecId, rStrm ); break; case BIFF12_ID_PCDFGROUPITEMS: mrCacheField.importPCDFGroupItem( nRecId, rStrm ); break; } - return 0; + return nullptr; } void PivotCacheFieldContext::onStartRecord( SequenceInputStream& rStrm ) @@ -135,7 +135,7 @@ ContextHandlerRef PivotCacheDefinitionFragment::onCreateContext( sal_Int32 nElem if( nElement == XLS_TOKEN( cacheField ) ) return new PivotCacheFieldContext( *this, mrPivotCache.createCacheField() ); break; } - return 0; + return nullptr; } ContextHandlerRef PivotCacheDefinitionFragment::onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) @@ -162,7 +162,7 @@ ContextHandlerRef PivotCacheDefinitionFragment::onCreateRecordContext( sal_Int32 if( nRecId == BIFF12_ID_PCDFIELD ) return new PivotCacheFieldContext( *this, mrPivotCache.createCacheField() ); break; } - return 0; + return nullptr; } const RecordInfo* PivotCacheDefinitionFragment::getRecordInfos() const @@ -251,7 +251,7 @@ ContextHandlerRef PivotCacheRecordsFragment::onCreateContext( sal_Int32 nElement } break; } - return 0; + return nullptr; } ContextHandlerRef PivotCacheRecordsFragment::onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) @@ -271,7 +271,7 @@ ContextHandlerRef PivotCacheRecordsFragment::onCreateRecordContext( sal_Int32 nR } break; } - return 0; + return nullptr; } const RecordInfo* PivotCacheRecordsFragment::getRecordInfos() const diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index 04b02687de07..4bed45cf4342 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -687,7 +687,7 @@ Reference< XDataPilotField > PivotTableField::convertRowColPageField( sal_Int32 else { const PivotCacheField* pCacheField = (maModel.mnSortRefField == OOX_PT_DATALAYOUTFIELD) ? - mrPivotTable.getCacheFieldOfDataField( maModel.mnSortRefItem ) : 0; + mrPivotTable.getCacheFieldOfDataField( maModel.mnSortRefItem ) : nullptr; if( pCacheField ) { aSortInfo.Mode = DataPilotFieldSortMode::DATA; @@ -902,9 +902,9 @@ PTLocationModel::PTLocationModel() : PivotTable::PivotTable( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), - mpDPObject(NULL), + mpDPObject(nullptr), maDataField( *this, OOX_PT_DATALAYOUTFIELD ), - mpPivotCache( 0 ) + mpPivotCache( nullptr ) { } @@ -1303,13 +1303,13 @@ Reference< XDataPilotField > PivotTable::getDataLayoutField() const const PivotCacheField* PivotTable::getCacheField( sal_Int32 nFieldIdx ) const { - return mpPivotCache ? mpPivotCache->getCacheField( nFieldIdx ) : 0; + return mpPivotCache ? mpPivotCache->getCacheField( nFieldIdx ) : nullptr; } const PivotCacheField* PivotTable::getCacheFieldOfDataField( sal_Int32 nDataItemIdx ) const { const PTDataFieldModel* pDataField = ContainerHelper::getVectorElement( maDataFields, nDataItemIdx ); - return pDataField ? getCacheField( pDataField->mnField ) : 0; + return pDataField ? getCacheField( pDataField->mnField ) : nullptr; } sal_Int32 PivotTable::getCacheDatabaseIndex( sal_Int32 nFieldIdx ) const diff --git a/sc/source/filter/oox/pivottablefragment.cxx b/sc/source/filter/oox/pivottablefragment.cxx index 9c2fa02dd06b..ca26708b13e4 100644 --- a/sc/source/filter/oox/pivottablefragment.cxx +++ b/sc/source/filter/oox/pivottablefragment.cxx @@ -60,7 +60,7 @@ ContextHandlerRef PivotTableFieldContext::onCreateContext( sal_Int32 nElement, c if( nElement == XLS_TOKEN( x ) ) mrTableField.importReferenceItem( rAttribs ); break; } - return 0; + return nullptr; } void PivotTableFieldContext::onStartElement( const AttributeList& rAttribs ) @@ -96,7 +96,7 @@ ContextHandlerRef PivotTableFieldContext::onCreateRecordContext( sal_Int32 nRecI if( nRecId == BIFF12_ID_PTREFERENCEITEM ) mrTableField.importPTReferenceItem( rStrm ); break; } - return 0; + return nullptr; } void PivotTableFieldContext::onStartRecord( SequenceInputStream& rStrm ) @@ -125,7 +125,7 @@ ContextHandlerRef PivotTableFilterContext::onCreateContext( sal_Int32 nElement, if( nElement == XLS_TOKEN( top10 ) ) mrTableFilter.importTop10( rAttribs ); break; } - return 0; + return nullptr; } void PivotTableFilterContext::onStartElement( const AttributeList& rAttribs ) @@ -148,7 +148,7 @@ ContextHandlerRef PivotTableFilterContext::onCreateRecordContext( sal_Int32 nRec if( nRecId == BIFF12_ID_TOP10FILTER ) mrTableFilter.importTop10Filter( rStrm ); break; } - return 0; + return nullptr; } void PivotTableFilterContext::onStartRecord( SequenceInputStream& rStrm ) @@ -203,7 +203,7 @@ ContextHandlerRef PivotTableFragment::onCreateContext( sal_Int32 nElement, const if( nElement == XLS_TOKEN( filter ) ) return new PivotTableFilterContext( *this, mrPivotTable.createTableFilter() ); break; } - return 0; + return nullptr; } ContextHandlerRef PivotTableFragment::onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) @@ -240,7 +240,7 @@ ContextHandlerRef PivotTableFragment::onCreateRecordContext( sal_Int32 nRecId, S if( nRecId == BIFF12_ID_PTFILTER ) return new PivotTableFilterContext( *this, mrPivotTable.createTableFilter() ); break; } - return 0; + return nullptr; } const RecordInfo* PivotTableFragment::getRecordInfos() const diff --git a/sc/source/filter/oox/querytablefragment.cxx b/sc/source/filter/oox/querytablefragment.cxx index 32ae66291766..c085daea18d7 100644 --- a/sc/source/filter/oox/querytablefragment.cxx +++ b/sc/source/filter/oox/querytablefragment.cxx @@ -42,7 +42,7 @@ ContextHandlerRef QueryTableFragment::onCreateContext( sal_Int32 nElement, const mrQueryTable.importQueryTable( rAttribs ); break; } - return 0; + return nullptr; } ContextHandlerRef QueryTableFragment::onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) @@ -54,7 +54,7 @@ ContextHandlerRef QueryTableFragment::onCreateRecordContext( sal_Int32 nRecId, S mrQueryTable.importQueryTable( rStrm ); break; } - return 0; + return nullptr; } const RecordInfo* QueryTableFragment::getRecordInfos() const diff --git a/sc/source/filter/oox/revisionfragment.cxx b/sc/source/filter/oox/revisionfragment.cxx index 08d257907bb9..7b7861d235f1 100644 --- a/sc/source/filter/oox/revisionfragment.cxx +++ b/sc/source/filter/oox/revisionfragment.cxx @@ -144,7 +144,7 @@ protected: { // The value is a rich text string. ScDocument& rDoc = getScDocument(); - EditTextObject* pTextObj = mxRichString->convert(rDoc.GetEditEngine(), NULL); + EditTextObject* pTextObj = mxRichString->convert(rDoc.GetEditEngine(), nullptr); if (pTextObj) { svl::SharedStringPool& rPool = rDoc.GetSharedStringPool(); @@ -166,7 +166,7 @@ private: OUString aRefStr = rAttribs.getString(XML_r, OUString()); if (!aRefStr.isEmpty()) { - mrPos.Parse(aRefStr, NULL, formula::FormulaGrammar::CONV_XL_OOX); + mrPos.Parse(aRefStr, nullptr, formula::FormulaGrammar::CONV_XL_OOX); if (mnSheetIndex != -1) mrPos.SetTab(mnSheetIndex-1); } @@ -293,7 +293,7 @@ void RevisionHeadersFragment::importHeader( const AttributeList& rAttribs ) if (!aDateTimeStr.isEmpty()) { util::DateTime aDateTime; - sax::Converter::parseDateTime(aDateTime, 0, aDateTimeStr); + sax::Converter::parseDateTime(aDateTime, nullptr, aDateTimeStr); Date aDate(aDateTime); tools::Time aTime(aDateTime); aMetadata.maDateTime.SetDate(aDate.GetDate()); diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx index 6023a71e5d60..b4158764cfb1 100644 --- a/sc/source/filter/oox/richstring.cxx +++ b/sc/source/filter/oox/richstring.cxx @@ -118,7 +118,7 @@ void RichStringPortion::convert( ScEditEngineDefaulter& rEE, ESelection& rSelect rSelection.nStartPara = rSelection.nEndPara; SfxItemSet aItemSet( rEE.GetEmptyItemSet() ); - const Font* pFontToUse = mxFont.get() ? mxFont.get() : lclNeedsRichTextFormat( pFont ) ? pFont : NULL; + const Font* pFontToUse = mxFont.get() ? mxFont.get() : lclNeedsRichTextFormat( pFont ) ? pFont : nullptr; if ( pFontToUse ) pFontToUse->fillToItemSet( aItemSet, true ); @@ -395,7 +395,7 @@ void RichString::convert( const Reference< XText >& rxText, bool bReplaceOld, co for( PortionVector::const_iterator aIt = maTextPortions.begin(), aEnd = maTextPortions.end(); aIt != aEnd; ++aIt ) { (*aIt)->convert( rxText, pFirstPortionFont, bReplaceOld ); - pFirstPortionFont = 0; // use passed font for first portion only + pFirstPortionFont = nullptr; // use passed font for first portion only bReplaceOld = false; // do not replace first portion text with following portions } } @@ -416,7 +416,7 @@ void RichString::convert( const Reference< XText >& rxText, bool bReplaceOld, co for( PortionVector::const_iterator aIt = maTextPortions.begin(), aEnd = maTextPortions.end(); aIt != aEnd; ++aIt ) { (*aIt)->convert( rEE, aSelection, pFirstPortionFont ); - pFirstPortionFont = 0; + pFirstPortionFont = nullptr; } return rEE.CreateTextObject(); diff --git a/sc/source/filter/oox/richstringcontext.cxx b/sc/source/filter/oox/richstringcontext.cxx index 1bb6c96491d9..a9ab0722d052 100644 --- a/sc/source/filter/oox/richstringcontext.cxx +++ b/sc/source/filter/oox/richstringcontext.cxx @@ -69,7 +69,7 @@ ContextHandlerRef RichStringContext::onCreateContext( sal_Int32 nElement, const } break; } - return 0; + return nullptr; } void RichStringContext::onCharacters( const OUString& rChars ) diff --git a/sc/source/filter/oox/scenariocontext.cxx b/sc/source/filter/oox/scenariocontext.cxx index 8535b89a67b0..b58663c1f867 100644 --- a/sc/source/filter/oox/scenariocontext.cxx +++ b/sc/source/filter/oox/scenariocontext.cxx @@ -40,7 +40,7 @@ ContextHandlerRef ScenarioContext::onCreateContext( sal_Int32 nElement, const At if( nElement == XLS_TOKEN( inputCells ) ) mrScenario.importInputCells( rAttribs ); break; } - return 0; + return nullptr; } void ScenarioContext::onStartElement( const AttributeList& rAttribs ) @@ -57,7 +57,7 @@ ContextHandlerRef ScenarioContext::onCreateRecordContext( sal_Int32 nRecId, Sequ if( nRecId == BIFF12_ID_INPUTCELLS ) mrScenario.importInputCells( rStrm ); break; } - return 0; + return nullptr; } void ScenarioContext::onStartRecord( SequenceInputStream& rStrm ) @@ -80,7 +80,7 @@ ContextHandlerRef ScenariosContext::onCreateContext( sal_Int32 nElement, const A if( nElement == XLS_TOKEN( scenario ) ) return new ScenarioContext( *this, mrSheetScenarios ); break; } - return 0; + return nullptr; } void ScenariosContext::onStartElement( const AttributeList& rAttribs ) @@ -97,7 +97,7 @@ ContextHandlerRef ScenariosContext::onCreateRecordContext( sal_Int32 nRecId, Seq if( nRecId == BIFF12_ID_SCENARIO ) return new ScenarioContext( *this, mrSheetScenarios ); break; } - return 0; + return nullptr; } void ScenariosContext::onStartRecord( SequenceInputStream& rStrm ) diff --git a/sc/source/filter/oox/sharedstringsfragment.cxx b/sc/source/filter/oox/sharedstringsfragment.cxx index be2061e5ba9d..3438ae2b9252 100644 --- a/sc/source/filter/oox/sharedstringsfragment.cxx +++ b/sc/source/filter/oox/sharedstringsfragment.cxx @@ -47,7 +47,7 @@ ContextHandlerRef SharedStringsFragment::onCreateContext( sal_Int32 nElement, co return new RichStringContext( *this, getSharedStrings().createRichString() ); break; } - return 0; + return nullptr; } ContextHandlerRef SharedStringsFragment::onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) @@ -64,7 +64,7 @@ ContextHandlerRef SharedStringsFragment::onCreateRecordContext( sal_Int32 nRecId getSharedStrings().createRichString()->importString( rStrm, true ); break; } - return 0; + return nullptr; } const RecordInfo* SharedStringsFragment::getRecordInfos() const diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx index e98abff0399a..0cf6280ca0d1 100644 --- a/sc/source/filter/oox/sheetdatacontext.cxx +++ b/sc/source/filter/oox/sheetdatacontext.cxx @@ -118,7 +118,7 @@ ContextHandlerRef SheetDataContext::onCreateContext( sal_Int32 nElement, const A } break; } - return 0; + return nullptr; } void SheetDataContext::onCharacters( const OUString& rChars ) @@ -263,7 +263,7 @@ ContextHandlerRef SheetDataContext::onCreateRecordContext( sal_Int32 nRecId, Seq } break; } - return 0; + return nullptr; } // private -------------------------------------------------------------------- diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 5fa5a5a93adf..ce909ad4367e 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -1680,7 +1680,7 @@ BorderLineModel* Border::getBorderLine( sal_Int32 nElement ) case XLS_TOKEN( bottom ): return &maModel.maBottom; case XLS_TOKEN( diagonal ): return &maModel.maDiagonal; } - return 0; + return nullptr; } bool Border::convertBorderLine( BorderLine2& rBorderLine, const BorderLineModel& rModel ) @@ -2082,7 +2082,7 @@ Xf::Xf( const WorkbookHelper& rHelper ) : maAlignment( rHelper ), maProtection( rHelper ), meRotationRef( css::table::CellVertJustify2::STANDARD ), - mpStyleSheet( NULL ) + mpStyleSheet( nullptr ) { } @@ -2305,7 +2305,7 @@ Xf::createPattern( bool bSkipPoolDefs ) */ StylesBuffer& rStyles = getStyles(); - const Xf* pStyleXf = isCellXf() ? rStyles.getStyleXf( maModel.mnStyleXfId ).get() : 0; + const Xf* pStyleXf = isCellXf() ? rStyles.getStyleXf( maModel.mnStyleXfId ).get() : nullptr; if( pStyleXf && !mpStyleSheet ) { rStyles.createCellStyle( maModel.mnStyleXfId ); @@ -2365,7 +2365,7 @@ Xf::createPattern( bool bSkipPoolDefs ) border line of the cell is set (either explicitly or via cell style), and the cell contents are rotated, set rotation reference to bottom of cell. This causes the borders to be painted rotated with the text. */ - if( const Alignment* pAlignment = maModel.mbAlignUsed ? &maAlignment : (pStyleXf ? &pStyleXf->maAlignment : 0) ) + if( const Alignment* pAlignment = maModel.mbAlignUsed ? &maAlignment : (pStyleXf ? &pStyleXf->maAlignment : nullptr) ) { SvxRotateMode eRotateMode = SVX_ROTATE_MODE_STANDARD; sal_Int32 nBorderId = maModel.mbBorderUsed ? maModel.mnBorderId : (pStyleXf ? pStyleXf->maModel.mnBorderId : -1); @@ -2523,9 +2523,9 @@ const sal_Char* const sppcStyleNames[] = "Followed Hyperlink", "Note", // new in OOX "Warning Text", - 0, - 0, - 0, + nullptr, + nullptr, + nullptr, "Title", "Heading 1", "Heading 2", @@ -2573,7 +2573,7 @@ OUString lclGetBuiltinStyleName( sal_Int32 nBuiltinId, const OUString& rName, sa OSL_ENSURE( (0 <= nBuiltinId) && (nBuiltinId < snStyleNamesCount), "lclGetBuiltinStyleName - unknown built-in style" ); OUStringBuffer aStyleName; aStyleName.appendAscii( spcStyleNamePrefix ); - if( (0 <= nBuiltinId) && (nBuiltinId < snStyleNamesCount) && (sppcStyleNames[ nBuiltinId ] != 0) ) + if( (0 <= nBuiltinId) && (nBuiltinId < snStyleNamesCount) && (sppcStyleNames[ nBuiltinId ] != nullptr) ) aStyleName.appendAscii( sppcStyleNames[ nBuiltinId ] ); else if( !rName.isEmpty() ) aStyleName.append( rName ); @@ -2614,7 +2614,7 @@ bool CellStyleModel::isDefaultStyle() const CellStyle::CellStyle( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mbCreated( false ), - mpStyleSheet( NULL ) + mpStyleSheet( nullptr ) { } @@ -2842,7 +2842,7 @@ void CellStyleBuffer::insertCellStyle( CellStyleRef xCellStyle ) ::ScStyleSheet* CellStyleBuffer::getCellStyleSheet( const CellStyleRef& rxCellStyle ) { - ::ScStyleSheet* pStyleSheet = NULL; + ::ScStyleSheet* pStyleSheet = nullptr; if ( rxCellStyle.get() ) pStyleSheet = rxCellStyle->getStyleSheet(); return pStyleSheet; diff --git a/sc/source/filter/oox/stylesfragment.cxx b/sc/source/filter/oox/stylesfragment.cxx index 10876fc98ab4..608e2fd8b8d5 100644 --- a/sc/source/filter/oox/stylesfragment.cxx +++ b/sc/source/filter/oox/stylesfragment.cxx @@ -39,7 +39,7 @@ ContextHandlerRef IndexedColorsContext::onCreateContext( sal_Int32 nElement, con if( nElement == XLS_TOKEN( rgbColor ) ) getStyles().importPaletteColor( rAttribs ); break; } - return 0; + return nullptr; } ContextHandlerRef IndexedColorsContext::onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) @@ -50,14 +50,14 @@ ContextHandlerRef IndexedColorsContext::onCreateRecordContext( sal_Int32 nRecId, if( nRecId == BIFF12_ID_RGBCOLOR ) getStyles().importPaletteColor( rStrm ); break; } - return 0; + return nullptr; } ContextHandlerRef FontContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) { if( mxFont.get() ) mxFont->importAttribs( nElement, rAttribs ); - return 0; + return nullptr; } void BorderContext::onStartElement( const AttributeList& rAttribs ) @@ -78,7 +78,7 @@ ContextHandlerRef BorderContext::onCreateContext( sal_Int32 nElement, const Attr if( nElement == XLS_TOKEN( color ) ) mxBorder->importColor( getCurrentElement(), rAttribs ); } - return 0; + return nullptr; } ContextHandlerRef FillContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) @@ -111,7 +111,7 @@ ContextHandlerRef FillContext::onCreateContext( sal_Int32 nElement, const Attrib mxFill->importColor( rAttribs, mfGradPos ); break; } - return 0; + return nullptr; } void XfContext::onStartElement( const AttributeList& rAttribs ) @@ -132,7 +132,7 @@ ContextHandlerRef XfContext::onCreateContext( sal_Int32 nElement, const Attribut } break; } - return 0; + return nullptr; } ContextHandlerRef DxfContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) @@ -154,7 +154,7 @@ ContextHandlerRef DxfContext::onCreateContext( sal_Int32 nElement, const Attribu } break; } - return 0; + return nullptr; } StylesFragment::StylesFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : @@ -213,7 +213,7 @@ ContextHandlerRef StylesFragment::onCreateContext( sal_Int32 nElement, const Att if( nElement == XLS_TOKEN( cellStyle ) ) getStyles().importCellStyle( rAttribs ); break; } - return 0; + return nullptr; } ContextHandlerRef StylesFragment::onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) @@ -267,7 +267,7 @@ ContextHandlerRef StylesFragment::onCreateRecordContext( sal_Int32 nRecId, Seque if( nRecId == BIFF12_ID_CELLSTYLE ) getStyles().importCellStyle( rStrm ); break; } - return 0; + return nullptr; } const RecordInfo* StylesFragment::getRecordInfos() const diff --git a/sc/source/filter/oox/tablecolumnsbuffer.cxx b/sc/source/filter/oox/tablecolumnsbuffer.cxx index 4bc71ddbcd3f..63395d25c1ec 100644 --- a/sc/source/filter/oox/tablecolumnsbuffer.cxx +++ b/sc/source/filter/oox/tablecolumnsbuffer.cxx @@ -133,7 +133,7 @@ TableColumns* TableColumnsBuffer::getActiveTableColumns() SAL_WARN_IF( maTableColumnsVector.size() > 1, "sc.filter", "TableColumnsBuffer::getActiveTableColumns - too many table columns" ); // stick to the last imported table columns - return maTableColumnsVector.empty() ? 0 : maTableColumnsVector.back().get(); + return maTableColumnsVector.empty() ? nullptr : maTableColumnsVector.back().get(); } } // namespace xls diff --git a/sc/source/filter/oox/tablecolumnscontext.cxx b/sc/source/filter/oox/tablecolumnscontext.cxx index 8ad4ea21caad..f3e64d9cbc63 100644 --- a/sc/source/filter/oox/tablecolumnscontext.cxx +++ b/sc/source/filter/oox/tablecolumnscontext.cxx @@ -36,7 +36,7 @@ TableColumnContext::TableColumnContext( WorksheetContextBase& rParent, TableColu ContextHandlerRef TableColumnContext::onCreateContext( sal_Int32 /*nElement*/, const AttributeList& /*rAttribs*/ ) { /* no known child elements */ - return 0; + return nullptr; } void TableColumnContext::onStartElement( const AttributeList& rAttribs ) @@ -47,7 +47,7 @@ void TableColumnContext::onStartElement( const AttributeList& rAttribs ) ContextHandlerRef TableColumnContext::onCreateRecordContext( sal_Int32 /*nRecId*/, SequenceInputStream& /*rStrm*/ ) { /* no known child elements */ - return 0; + return nullptr; } void TableColumnContext::onStartRecord( SequenceInputStream& rStrm ) @@ -65,7 +65,7 @@ ContextHandlerRef TableColumnsContext::onCreateContext( sal_Int32 nElement, cons { if( (getCurrentElement() == XLS_TOKEN( tableColumns )) && (nElement == XLS_TOKEN( tableColumn )) ) return new TableColumnContext( *this, mrTableColumns.createTableColumn() ); - return 0; + return nullptr; } void TableColumnsContext::onStartElement( const AttributeList& rAttribs ) @@ -80,7 +80,7 @@ ContextHandlerRef TableColumnsContext::onCreateRecordContext( sal_Int32 /*nRecId if( (getCurrentElement() == BIFF12_ID_TABLECOLUMNS) && (nRecId == BIFF12_ID_TABLECOLUMN) ) return new TableColumnContext( *this, mrTableColumns.createTableColumn() ); #endif - return 0; + return nullptr; } void TableColumnsContext::onStartRecord( SequenceInputStream& rStrm ) diff --git a/sc/source/filter/oox/tablefragment.cxx b/sc/source/filter/oox/tablefragment.cxx index b8f5d7d8d746..a9972494d1c7 100644 --- a/sc/source/filter/oox/tablefragment.cxx +++ b/sc/source/filter/oox/tablefragment.cxx @@ -57,7 +57,7 @@ ContextHandlerRef TableFragment::onCreateContext( sal_Int32 nElement, const Attr } break; } - return 0; + return nullptr; } ContextHandlerRef TableFragment::onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) @@ -76,7 +76,7 @@ ContextHandlerRef TableFragment::onCreateRecordContext( sal_Int32 nRecId, Sequen return new AutoFilterContext( *this, mrTable.createAutoFilter() ); break; } - return 0; + return nullptr; } const RecordInfo* TableFragment::getRecordInfos() const diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index fbddd7433346..4bb9522dd21c 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -137,7 +137,7 @@ ContextHandlerRef WorkbookFragment::onCreateContext( sal_Int32 nElement, const A if( nElement == XLS_TOKEN( pivotCache ) ) importPivotCache( rAttribs ); break; } - return 0; + return nullptr; } void WorkbookFragment::onCharacters( const OUString& rChars ) @@ -191,7 +191,7 @@ ContextHandlerRef WorkbookFragment::onCreateRecordContext( sal_Int32 nRecId, Seq case BIFF12_ID_PIVOTCACHES: if( nRecId == BIFF12_ID_PIVOTCACHE ) importPivotCache( rStrm ); } - return 0; + return nullptr; } const RecordInfo* WorkbookFragment::getRecordInfos() const diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 4ccbd136c40e..27bee11b41c2 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -317,8 +317,8 @@ WorkbookGlobals::WorkbookGlobals( ExcelFilter& rFilter ) : meFilterType( FILTER_OOXML ), mpOoxFilter( &rFilter ), meBiff( BIFF_UNKNOWN ), - mpDoc(NULL), - mpDocShell(NULL) + mpDoc(nullptr), + mpDocShell(nullptr) { // register at the filter, needed for virtual callbacks (even during construction) mrExcelFilter.registerWorkbookGlobals( *this ); @@ -406,7 +406,7 @@ ScRangeData* WorkbookGlobals::createNamedRangeObject( OUString& orName, const Sequence< FormulaToken>& rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags ) { // create the name and insert it into the Calc document - ScRangeData* pScRangeData = NULL; + ScRangeData* pScRangeData = nullptr; if( !orName.isEmpty() ) { ScDocument& rDoc = getScDocument(); @@ -423,7 +423,7 @@ ScRangeData* WorkbookGlobals::createLocalNamedRangeObject( OUString& orName, const Sequence< FormulaToken >& rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags, sal_Int32 nTab ) { // create the name and insert it into the Calc document - ScRangeData* pScRangeData = NULL; + ScRangeData* pScRangeData = nullptr; if( !orName.isEmpty() ) { ScDocument& rDoc = getScDocument(); diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index 97539e686044..cf783211b4d1 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -100,7 +100,7 @@ ContextHandlerRef DataValidationsContext::onCreateContext( sal_Int32 nElement, c } break; } - return 0; + return nullptr; } void DataValidationsContext::onCharacters( const OUString& rChars ) @@ -132,7 +132,7 @@ ContextHandlerRef DataValidationsContext::onCreateRecordContext( sal_Int32 nRecI { if( nRecId == BIFF12_ID_DATAVALIDATION ) importDataValidation( rStrm ); - return 0; + return nullptr; } void DataValidationsContext::importDataValidation( const AttributeList& rAttribs ) @@ -210,12 +210,12 @@ ContextHandlerRef WorksheetFragment::onCreateContext( sal_Int32 nElement, const { case XML_ROOT_CONTEXT: switch( getSheetType() ) { - case SHEETTYPE_WORKSHEET: return (nElement == XLS_TOKEN( worksheet )) ? this : 0; - case SHEETTYPE_CHARTSHEET: return 0; - case SHEETTYPE_MACROSHEET: return (nElement == XM_TOKEN( macrosheet )) ? this : 0; - case SHEETTYPE_DIALOGSHEET: return (nElement == XLS_TOKEN( dialogsheet )) ? this : 0; - case SHEETTYPE_MODULESHEET: return 0; - case SHEETTYPE_EMPTYSHEET: return 0; + case SHEETTYPE_WORKSHEET: return (nElement == XLS_TOKEN( worksheet )) ? this : nullptr; + case SHEETTYPE_CHARTSHEET: return nullptr; + case SHEETTYPE_MACROSHEET: return (nElement == XM_TOKEN( macrosheet )) ? this : nullptr; + case SHEETTYPE_DIALOGSHEET: return (nElement == XLS_TOKEN( dialogsheet )) ? this : nullptr; + case SHEETTYPE_MODULESHEET: return nullptr; + case SHEETTYPE_EMPTYSHEET: return nullptr; } break; @@ -335,7 +335,7 @@ ContextHandlerRef WorksheetFragment::onCreateContext( sal_Int32 nElement, const } break; } - return 0; + return nullptr; } void WorksheetFragment::onCharacters( const OUString& rChars ) @@ -427,7 +427,7 @@ ContextHandlerRef WorksheetFragment::onCreateRecordContext( sal_Int32 nRecId, Se if( nRecId == BIFF12_ID_CONTROL ) importControl( rStrm ); break; } - return 0; + return nullptr; } const RecordInfo* WorksheetFragment::getRecordInfos() const |