diff options
Diffstat (limited to 'sc/source/filter')
179 files changed, 1750 insertions, 1750 deletions
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index 4bf44983add4..e9775a8e7a40 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -248,7 +248,7 @@ DifParser::DifParser( SvStream& rNewIn, const sal_uInt32 nOption, ScDocument& rD bPlain = ( nOption == SC_DIFOPT_PLAIN ); if( bPlain ) - pNumFormatter = NULL; + pNumFormatter = nullptr; else pNumFormatter = rDoc.GetFormatTable(); } @@ -612,7 +612,7 @@ const sal_Unicode* DifParser::ScanIntVal( const sal_Unicode* pStart, sal_uInt32& if( IsNumber( cAkt ) ) rRet = ( sal_uInt32 ) ( cAkt - '0' ); else - return NULL; + return nullptr; pStart++; cAkt = *pStart; @@ -807,7 +807,7 @@ bool DifParser::ScanFloatVal( const sal_Unicode* pStart ) } DifColumn::DifColumn () - : pAkt(NULL) + : pAkt(nullptr) { } @@ -824,7 +824,7 @@ void DifColumn::SetLogical( SCROW nRow ) if( pAkt->nEnd == nRow ) pAkt->nEnd++; else - pAkt = NULL; + pAkt = nullptr; } else { @@ -857,7 +857,7 @@ void DifColumn::SetNumFormat( SCROW nRow, const sal_uInt32 nNumFormat ) NewEntry(nRow,nNumFormat ); } else - pAkt = NULL; + pAkt = nullptr; } void DifColumn::NewEntry( const SCROW nPos, const sal_uInt32 nNumFormat ) @@ -898,7 +898,7 @@ DifAttrCache::DifAttrCache( const bool bNewPlain ) bPlain = bNewPlain; ppCols = new DifColumn *[ MAXCOL + 1 ]; for( SCCOL nCnt = 0 ; nCnt <= MAXCOL ; nCnt++ ) - ppCols[ nCnt ] = NULL; + ppCols[ nCnt ] = nullptr; } DifAttrCache::~DifAttrCache() diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx index 9f334c0c7d28..59694f5f43aa 100644 --- a/sc/source/filter/excel/colrowst.cxx +++ b/sc/source/filter/excel/colrowst.cxx @@ -249,7 +249,7 @@ void XclImpColRowSettings::Convert( SCTAB nScTab ) for (SCROW i = nPrevRow; i <= nRow - 1; ++i) { SCROW nLast; - if (!maRowHeights.search_tree(i, nHeight, NULL, &nLast).second) + if (!maRowHeights.search_tree(i, nHeight, nullptr, &nLast).second) { // search failed for some reason return; diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index ee4c4cce8846..f5d539307767 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -136,7 +136,7 @@ ExcTable::ExcTable( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), mnScTab( SCTAB_GLOBAL ), nExcTab( EXC_NOTAB ), - pTabNames( new NameBuffer( 0, 16 ) ), + pTabNames( new NameBuffer( nullptr, 16 ) ), mxNoteList( new XclExpNoteList ) { } @@ -145,7 +145,7 @@ ExcTable::ExcTable( const XclExpRoot& rRoot, SCTAB nScTab ) : XclExpRoot( rRoot ), mnScTab( nScTab ), nExcTab( rRoot.GetTabInfo().GetXclTab( nScTab ) ), - pTabNames( new NameBuffer( 0, 16 ) ), + pTabNames( new NameBuffer( nullptr, 16 ) ), mxNoteList( new XclExpNoteList ) { } @@ -641,7 +641,7 @@ void ExcTable::FillAsTableXml() // list of NOTE records, generated by the cell table // not in the worksheet file - if( mxNoteList != 0 && !mxNoteList->IsEmpty() ) + if( mxNoteList != nullptr && !mxNoteList->IsEmpty() ) aRecList.AppendNewRecord( new XclExpComments( mnScTab, *mxNoteList ) ); const ScTableProtection* pTabProtect = rDoc.GetTabProtection(mnScTab); @@ -662,7 +662,7 @@ void ExcTable::FillAsTableXml() // list of HLINK records, generated by the cell table XclExpRecordRef xHyperlinks = mxCellTable->CreateRecord( EXC_ID_HLINK ); XclExpHyperlinkList* xHyperlinkList = dynamic_cast<XclExpHyperlinkList*>(xHyperlinks.get()); - if( xHyperlinkList != NULL && !xHyperlinkList->IsEmpty() ) + if( xHyperlinkList != nullptr && !xHyperlinkList->IsEmpty() ) { aRecList.AppendNewRecord( new XclExpXmlStartElementRecord( XML_hyperlinks ) ); aRecList.AppendRecord( xHyperlinks ); @@ -755,7 +755,7 @@ void ExcTable::WriteXml( XclExpXmlStream& rStrm ) ExcDocument::ExcDocument( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), aHeader( rRoot ), - pExpChangeTrack( NULL ) + pExpChangeTrack( nullptr ) { } diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index d52069ec1e4b..59e0daf446f3 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -63,7 +63,7 @@ FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument OSL_ENSURE( pMedStrm, "::ScImportExcel - medium without input stream" ); if( !pMedStrm ) return eERR_OPEN; // should not happen - SvStream* pBookStrm = 0; // The "Book"/"Workbook" stream containing main data. + SvStream* pBookStrm = nullptr; // The "Book"/"Workbook" stream containing main data. XclBiff eBiff = EXC_BIFF_UNKNOWN; // The BIFF version of the main stream. // try to open an OLE storage @@ -73,7 +73,7 @@ FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument { xRootStrg = new SotStorage( pMedStrm, false ); if( xRootStrg->GetError() ) - xRootStrg = 0; + xRootStrg = nullptr; } // try to open "Book" or "Workbook" stream in OLE storage diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index 268dcfcacee2..47d7a85204a4 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -105,7 +105,7 @@ void ImportExcel::Formula( return; // Formula will be read next, length in nFormLen - const ScTokenArray* pResult = NULL; + const ScTokenArray* pResult = nullptr; pFormConv->Reset( aScPos ); ScDocumentImport& rDoc = GetDocImport(); @@ -143,7 +143,7 @@ void ImportExcel::Formula( // Shared formula not found even though it's clearly a shared formula. // The cell will be created in the following shared formula // record. - SetLastFormula(aScPos.Col(), aScPos.Row(), fCurVal, nXF, NULL); + SetLastFormula(aScPos.Col(), aScPos.Row(), fCurVal, nXF, nullptr); } return; } @@ -151,7 +151,7 @@ void ImportExcel::Formula( ConvErr eErr = pFormConv->Convert( pResult, maStrm, nFormLen, true ); - ScFormulaCell* pCell = NULL; + ScFormulaCell* pCell = nullptr; if (pResult) { @@ -905,7 +905,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s } else if( bArrayFormula ) { - pErgebnis = NULL; + pErgebnis = nullptr; eRet = ConvOK; } else @@ -1833,14 +1833,14 @@ void ExcelToSc::ReadExtensionArray( unsigned int n, XclImpStream& aIn ) pMatrix = aPool.GetMatrix( n ); - if( NULL != pMatrix ) + if( nullptr != pMatrix ) { pMatrix->Resize(nCols, nRows); pMatrix->GetDimensions( nC, nR); if( nC != nCols || nR != nRows ) { OSL_FAIL( "ExcelToSc::ReadExtensionArray - matrix size mismatch" ); - pMatrix = NULL; + pMatrix = nullptr; } } else @@ -1868,7 +1868,7 @@ void ExcelToSc::ReadExtensionArray( unsigned int n, XclImpStream& aIn ) { case EXC_CACHEDVAL_EMPTY: aIn.Ignore( 8 ); - if( NULL != pMatrix ) + if( nullptr != pMatrix ) { pMatrix->PutEmpty( nC, nR ); } @@ -1877,7 +1877,7 @@ void ExcelToSc::ReadExtensionArray( unsigned int n, XclImpStream& aIn ) case EXC_CACHEDVAL_DOUBLE: { double fDouble = aIn.ReadDouble(); - if( NULL != pMatrix ) + if( nullptr != pMatrix ) { pMatrix->PutDouble( fDouble, nC, nR ); } @@ -1896,7 +1896,7 @@ void ExcelToSc::ReadExtensionArray( unsigned int n, XclImpStream& aIn ) nByte = aIn.ReaduInt8(); aString = aIn.ReadRawByteString( nByte ); } - if( NULL != pMatrix ) + if( nullptr != pMatrix ) { pMatrix->PutString(rPool.intern(aString), nC, nR); } @@ -1905,7 +1905,7 @@ void ExcelToSc::ReadExtensionArray( unsigned int n, XclImpStream& aIn ) case EXC_CACHEDVAL_BOOL: nByte = aIn.ReaduInt8(); aIn.Ignore( 7 ); - if( NULL != pMatrix ) + if( nullptr != pMatrix ) { pMatrix->PutBoolean( nByte != 0, nC, nR ); } @@ -1914,7 +1914,7 @@ void ExcelToSc::ReadExtensionArray( unsigned int n, XclImpStream& aIn ) case EXC_CACHEDVAL_ERROR: nByte = aIn.ReaduInt8(); aIn.Ignore( 7 ); - if( NULL != pMatrix ) + if( nullptr != pMatrix ) { pMatrix->PutError( XclTools::GetScErrorCode( nByte ), nC, nR ); } diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index ebe3b6445e57..32e1932c6c22 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -934,7 +934,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, } else if( bArrayFormula ) { - rpTokArray = NULL; + rpTokArray = nullptr; eRet = ConvOK; } else diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index de6359692573..171e07625114 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -500,7 +500,7 @@ void ImportExcel8::AutoFilterInfo() XclImpAutoFilterData* pData = pExcRoot->pAutoFilterBuffer->GetByTab( GetCurrScTab() ); if( pData ) { - pData->SetAdvancedRange( NULL ); + pData->SetAdvancedRange( nullptr ); pData->Activate(); } } @@ -516,7 +516,7 @@ void ImportExcel8::AutoFilter() XclImpAutoFilterData::XclImpAutoFilterData( RootData* pRoot, const ScRange& rRange ) : ExcRoot( pRoot ), - pCurrDBData(NULL), + pCurrDBData(nullptr), bActive( false ), bCriteria( false ), bAutoOrAdvanced(false) @@ -822,7 +822,7 @@ void XclImpAutoFilterData::CreateScDBData() pCurrDBData->SetAdvancedQuerySource(&aCriteriaRange); } else - pCurrDBData->SetAdvancedQuerySource(NULL); + pCurrDBData->SetAdvancedQuerySource(nullptr); rDoc.SetAnonymousDBData(Tab(), pCurrDBData); } @@ -875,7 +875,7 @@ XclImpAutoFilterData* XclImpAutoFilterBuffer::GetByTab( SCTAB nTab ) if( rFilterPtr->Tab() == nTab ) return rFilterPtr.get(); } - return NULL; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index aa6c06208266..fc296752aac3 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -416,7 +416,7 @@ void XclExpXmlSheetPr::SaveXml( XclExpXmlStream& rStrm ) // OOXTODO: XML_transitionEntry, // OOXTODO: XML_published, // OOXTODO: XML_codeName, - XML_filterMode, mpManager ? XclXmlUtils::ToPsz( mpManager->HasFilterMode( mnScTab ) ) : NULL, + XML_filterMode, mpManager ? XclXmlUtils::ToPsz( mpManager->HasFilterMode( mnScTab ) ) : nullptr, // OOXTODO: XML_enableFormatConditionsCalculation, FSEND ); @@ -480,22 +480,22 @@ void XclExpSheetProtection::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); rWorksheet->singleElement( XML_sheetProtection, XML_sheet, XclXmlUtils::ToPsz( true ), - XML_password, sHash.isEmpty()? NULL : sHash.getStr(), - XML_objects, pTabProtect->isOptionEnabled( ScTableProtection::OBJECTS ) ? NULL : XclXmlUtils::ToPsz( true ), - XML_scenarios, pTabProtect->isOptionEnabled( ScTableProtection::SCENARIOS ) ? NULL : XclXmlUtils::ToPsz( true ), - XML_formatCells, pTabProtect->isOptionEnabled( ScTableProtection::FORMAT_CELLS ) ? XclXmlUtils::ToPsz( false ) : NULL, - XML_formatColumns, pTabProtect->isOptionEnabled( ScTableProtection::FORMAT_COLUMNS ) ? XclXmlUtils::ToPsz( false ) : NULL, - XML_formatRows, pTabProtect->isOptionEnabled( ScTableProtection::FORMAT_ROWS ) ? XclXmlUtils::ToPsz( false ) : NULL, - XML_insertColumns, pTabProtect->isOptionEnabled( ScTableProtection::INSERT_COLUMNS ) ? XclXmlUtils::ToPsz( false ) : NULL, - XML_insertRows, pTabProtect->isOptionEnabled( ScTableProtection::INSERT_ROWS ) ? XclXmlUtils::ToPsz( false ) : NULL, - XML_insertHyperlinks, pTabProtect->isOptionEnabled( ScTableProtection::INSERT_HYPERLINKS ) ? XclXmlUtils::ToPsz( false ) : NULL, - XML_deleteColumns, pTabProtect->isOptionEnabled( ScTableProtection::DELETE_COLUMNS ) ? XclXmlUtils::ToPsz( false ) : NULL, - XML_deleteRows, pTabProtect->isOptionEnabled( ScTableProtection::DELETE_ROWS ) ? XclXmlUtils::ToPsz( false ) : NULL, - XML_selectLockedCells, pTabProtect->isOptionEnabled( ScTableProtection::SELECT_LOCKED_CELLS ) ? NULL : XclXmlUtils::ToPsz( true ), - XML_sort, pTabProtect->isOptionEnabled( ScTableProtection::SORT ) ? XclXmlUtils::ToPsz( false ) : NULL, - XML_autoFilter, pTabProtect->isOptionEnabled( ScTableProtection::AUTOFILTER ) ? XclXmlUtils::ToPsz( false ) : NULL, - XML_pivotTables, pTabProtect->isOptionEnabled( ScTableProtection::PIVOT_TABLES ) ? XclXmlUtils::ToPsz( false ) : NULL, - XML_selectUnlockedCells, pTabProtect->isOptionEnabled( ScTableProtection::SELECT_UNLOCKED_CELLS ) ? NULL : XclXmlUtils::ToPsz( true ), + XML_password, sHash.isEmpty()? nullptr : sHash.getStr(), + XML_objects, pTabProtect->isOptionEnabled( ScTableProtection::OBJECTS ) ? nullptr : XclXmlUtils::ToPsz( true ), + XML_scenarios, pTabProtect->isOptionEnabled( ScTableProtection::SCENARIOS ) ? nullptr : XclXmlUtils::ToPsz( true ), + XML_formatCells, pTabProtect->isOptionEnabled( ScTableProtection::FORMAT_CELLS ) ? XclXmlUtils::ToPsz( false ) : nullptr, + XML_formatColumns, pTabProtect->isOptionEnabled( ScTableProtection::FORMAT_COLUMNS ) ? XclXmlUtils::ToPsz( false ) : nullptr, + XML_formatRows, pTabProtect->isOptionEnabled( ScTableProtection::FORMAT_ROWS ) ? XclXmlUtils::ToPsz( false ) : nullptr, + XML_insertColumns, pTabProtect->isOptionEnabled( ScTableProtection::INSERT_COLUMNS ) ? XclXmlUtils::ToPsz( false ) : nullptr, + XML_insertRows, pTabProtect->isOptionEnabled( ScTableProtection::INSERT_ROWS ) ? XclXmlUtils::ToPsz( false ) : nullptr, + XML_insertHyperlinks, pTabProtect->isOptionEnabled( ScTableProtection::INSERT_HYPERLINKS ) ? XclXmlUtils::ToPsz( false ) : nullptr, + XML_deleteColumns, pTabProtect->isOptionEnabled( ScTableProtection::DELETE_COLUMNS ) ? XclXmlUtils::ToPsz( false ) : nullptr, + XML_deleteRows, pTabProtect->isOptionEnabled( ScTableProtection::DELETE_ROWS ) ? XclXmlUtils::ToPsz( false ) : nullptr, + XML_selectLockedCells, pTabProtect->isOptionEnabled( ScTableProtection::SELECT_LOCKED_CELLS ) ? nullptr : XclXmlUtils::ToPsz( true ), + XML_sort, pTabProtect->isOptionEnabled( ScTableProtection::SORT ) ? XclXmlUtils::ToPsz( false ) : nullptr, + XML_autoFilter, pTabProtect->isOptionEnabled( ScTableProtection::AUTOFILTER ) ? XclXmlUtils::ToPsz( false ) : nullptr, + XML_pivotTables, pTabProtect->isOptionEnabled( ScTableProtection::PIVOT_TABLES ) ? XclXmlUtils::ToPsz( false ) : nullptr, + XML_selectUnlockedCells, pTabProtect->isOptionEnabled( ScTableProtection::SELECT_UNLOCKED_CELLS ) ? nullptr : XclXmlUtils::ToPsz( true ), FSEND ); const ::std::vector<ScEnhancedProtection>& rProts( pTabProtect->getEnhancedProtection()); @@ -508,18 +508,18 @@ void XclExpSheetProtection::SaveXml( XclExpXmlStream& rStrm ) SAL_WARN_IF( (*it).maSecurityDescriptorXML.isEmpty() && !(*it).maSecurityDescriptor.empty(), "sc.filter", "XclExpSheetProtection::SaveXml: losing BIFF security descriptor"); rWorksheet->singleElement( XML_protectedRange, - XML_name, (*it).maTitle.isEmpty() ? NULL : XclXmlUtils::ToOString( (*it).maTitle).getStr(), - XML_securityDescriptor, (*it).maSecurityDescriptorXML.isEmpty() ? NULL : XclXmlUtils::ToOString( (*it).maSecurityDescriptorXML).getStr(), + XML_name, (*it).maTitle.isEmpty() ? nullptr : XclXmlUtils::ToOString( (*it).maTitle).getStr(), + XML_securityDescriptor, (*it).maSecurityDescriptorXML.isEmpty() ? nullptr : XclXmlUtils::ToOString( (*it).maSecurityDescriptorXML).getStr(), /* XXX 'password' is not part of OOXML, but Excel2013 * writes it if loaded from BIFF, in which case * 'algorithmName', 'hashValue', 'saltValue' and * 'spinCount' are absent; so do we if it was present. */ - XML_password, (*it).mnPasswordVerifier ? OString::number( (*it).mnPasswordVerifier, 16).getStr() : NULL, - XML_algorithmName, (*it).maAlgorithmName.isEmpty() ? NULL : XclXmlUtils::ToOString( (*it).maAlgorithmName).getStr(), - XML_hashValue, (*it).maHashValue.isEmpty() ? NULL : XclXmlUtils::ToOString( (*it).maHashValue).getStr(), - XML_saltValue, (*it).maSaltValue.isEmpty() ? NULL : XclXmlUtils::ToOString( (*it).maSaltValue).getStr(), - XML_spinCount, (*it).mnSpinCount ? OString::number( (*it).mnSpinCount).getStr() : NULL, - XML_sqref, (*it).maRangeList.Is() ? XclXmlUtils::ToOString( *(*it).maRangeList).getStr() : NULL, + XML_password, (*it).mnPasswordVerifier ? OString::number( (*it).mnPasswordVerifier, 16).getStr() : nullptr, + XML_algorithmName, (*it).maAlgorithmName.isEmpty() ? nullptr : XclXmlUtils::ToOString( (*it).maAlgorithmName).getStr(), + XML_hashValue, (*it).maHashValue.isEmpty() ? nullptr : XclXmlUtils::ToOString( (*it).maHashValue).getStr(), + XML_saltValue, (*it).maSaltValue.isEmpty() ? nullptr : XclXmlUtils::ToOString( (*it).maSaltValue).getStr(), + XML_spinCount, (*it).mnSpinCount ? OString::number( (*it).mnSpinCount).getStr() : nullptr, + XML_sqref, (*it).maRangeList.Is() ? XclXmlUtils::ToOString( *(*it).maRangeList).getStr() : nullptr, FSEND); } rWorksheet->endElement( XML_protectedRanges); @@ -562,7 +562,7 @@ ExcFilterCondition::ExcFilterCondition() : nType( EXC_AFTYPE_NOTUSED ), nOper( EXC_AFOPER_EQUAL ), fVal( 0.0 ), - pText( NULL ) + pText( nullptr ) { } @@ -583,7 +583,7 @@ void ExcFilterCondition::SetCondition( sal_uInt8 nTp, sal_uInt8 nOp, double fV, fVal = fV; delete pText; - (pT) ? pText = new XclExpString( *pT, EXC_STR_8BITLENGTH ) : pText = NULL; + (pT) ? pText = new XclExpString( *pT, EXC_STR_8BITLENGTH ) : pText = nullptr; } void ExcFilterCondition::Save( XclExpStream& rStrm ) @@ -729,9 +729,9 @@ bool XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry ) // empty/nonempty fields if (rEntry.IsQueryByEmpty()) - bConflict = !AddCondition( rEntry.eConnect, EXC_AFTYPE_EMPTY, EXC_AFOPER_NONE, 0.0, NULL, true ); + bConflict = !AddCondition( rEntry.eConnect, EXC_AFTYPE_EMPTY, EXC_AFOPER_NONE, 0.0, nullptr, true ); else if(rEntry.IsQueryByNonEmpty()) - bConflict = !AddCondition( rEntry.eConnect, EXC_AFTYPE_NOTEMPTY, EXC_AFOPER_NONE, 0.0, NULL, true ); + bConflict = !AddCondition( rEntry.eConnect, EXC_AFTYPE_NOTEMPTY, EXC_AFOPER_NONE, 0.0, nullptr, true ); // other conditions else { @@ -739,7 +739,7 @@ bool XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry ) sal_uInt32 nIndex = 0; bool bIsNum = !bLen || GetFormatter().IsNumberFormat( sText, nIndex, fVal ); OUString* pText; - (bIsNum) ? pText = NULL : pText = &sText; + (bIsNum) ? pText = nullptr : pText = &sText; // top10 flags sal_uInt16 nNewFlags = 0x0000; @@ -877,8 +877,8 @@ void XclExpAutofilter::SaveXml( XclExpXmlStream& rStrm ) ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) : XclExpRoot( rRoot ), - pFilterMode( NULL ), - pFilterInfo( NULL ) + pFilterMode( nullptr ), + pFilterInfo( nullptr ) , mbAutoFilter (false) { XclExpNameManager& rNameMgr = GetNameManager(); @@ -1042,7 +1042,7 @@ void ExcAutoFilterRecs::SaveXml( XclExpXmlStream& rStrm ) bool ExcAutoFilterRecs::HasFilterMode() const { - return pFilterMode != NULL; + return pFilterMode != nullptr; } XclExpFilterManager::XclExpFilterManager( const XclExpRoot& rRoot ) : diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx index 6f85f28c3044..bc9d62b7a169 100644 --- a/sc/source/filter/excel/exctools.cxx +++ b/sc/source/filter/excel/exctools.cxx @@ -49,21 +49,21 @@ RootData::RootData() { eDateiTyp = BiffX; - pExtSheetBuff = NULL; - pShrfmlaBuff = NULL; - pExtNameBuff = NULL; - pFmlaConverter = NULL; + pExtSheetBuff = nullptr; + pShrfmlaBuff = nullptr; + pExtNameBuff = nullptr; + pFmlaConverter = nullptr; - pAutoFilterBuffer = NULL; + pAutoFilterBuffer = nullptr; pPrintRanges = new _ScRangeListTabs; pPrintTitles = new _ScRangeListTabs; - pTabId = NULL; - pUserBViewList = NULL; + pTabId = nullptr; + pUserBViewList = nullptr; - pIR = NULL; - pER = NULL; - pColRowBuff = NULL; + pIR = nullptr; + pER = nullptr; + pColRowBuff = nullptr; } RootData::~RootData() @@ -78,7 +78,7 @@ RootData::~RootData() XclImpOutlineBuffer::XclImpOutlineBuffer( SCSIZE nNewSize ) : maLevels(0, nNewSize, 0), - mpOutlineArray(NULL), + mpOutlineArray(nullptr), mnEndPos(nNewSize), mnMaxLevel(0), mbButtonAfter(true) diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx index 580a5132c987..7e2d0477314b 100644 --- a/sc/source/filter/excel/fontbuff.cxx +++ b/sc/source/filter/excel/fontbuff.cxx @@ -139,7 +139,7 @@ void LotusFontBuffer::MakeFont( ENTRY* pEntry ) pEntry->pFont = new SvxFontItem( eFamily, *pEntry->pTmpName, EMPTY_OUSTRING, ePitch, eCharSet, ATTR_FONT ); delete pEntry->pTmpName; - pEntry->pTmpName = NULL; + pEntry->pTmpName = nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx index 08b0b4e16847..2284502dbe87 100644 --- a/sc/source/filter/excel/frmbase.cxx +++ b/sc/source/filter/excel/frmbase.cxx @@ -148,19 +148,19 @@ const ScRange* _ScRangeListTabs::First( SCTAB n ) TabRangeType::iterator itr = maTabRanges.find(n); if (itr == maTabRanges.end()) // No range list exists for this table. - return NULL; + return nullptr; const RangeListType& rList = *itr->second; maItrCur = rList.begin(); maItrCurEnd = rList.end(); - return rList.empty() ? NULL : &(*maItrCur); + return rList.empty() ? nullptr : &(*maItrCur); } const ScRange* _ScRangeListTabs::Next () { ++maItrCur; if (maItrCur == maItrCurEnd) - return NULL; + return nullptr; return &(*maItrCur); } diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 17bf74111ae7..8e34342cf017 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -109,10 +109,10 @@ ImportExcel::ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ): maStrm( rStrm, GetRoot() ), aIn( maStrm ), maScOleSize( ScAddress::INITIALIZE_INVALID ), - pColOutlineBuff(NULL), - pRowOutlineBuff(NULL), - pColRowBuff(NULL), - mpLastFormula(NULL), + pColOutlineBuff(nullptr), + pRowOutlineBuff(nullptr), + pColRowBuff(nullptr), + mpLastFormula(nullptr), mnLastRefIdx( 0 ), mnIxfeIndex( 0 ), mnLastRecId(0), @@ -216,7 +216,7 @@ sal_uInt16 ImportExcel::ReadXFIndex( const ScAddress& rScPos, bool bBiff2 ) if( !mbBiff2HasXfsValid ) { mbBiff2HasXfsValid = true; - mbBiff2HasXfs = GetXFBuffer().GetXF( 0 ) != 0; + mbBiff2HasXfs = GetXFBuffer().GetXF( 0 ) != nullptr; } // read formatting information (includes the XF identifier) sal_uInt8 nFlags1, nFlags2, nFlags3; @@ -1223,7 +1223,7 @@ void ImportExcel::NewTable() pExcRoot->pShrfmlaBuff->Clear(); maLastFormulaCells.clear(); - mpLastFormula = NULL; + mpLastFormula = nullptr; InitializeTable( nTab ); diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx index 098c32eef658..821a8fcf0158 100644 --- a/sc/source/filter/excel/namebuff.cxx +++ b/sc/source/filter/excel/namebuff.cxx @@ -90,7 +90,7 @@ const ScTokenArray* SharedFormulaBuffer::Find( const ScAddress& rRefPos ) const { TokenArraysType::const_iterator it = maTokenArrays.find(rRefPos); if (it == maTokenArrays.end()) - return NULL; + return nullptr; return it->second; } @@ -225,7 +225,7 @@ const ExtName* ExtNameBuff::GetNameByIndex( sal_Int16 nRefIdx, sal_uInt16 nNameI { OSL_ENSURE( nNameIdx > 0, "ExtNameBuff::GetNameByIndex() - invalid name index" ); ExtNameMap::const_iterator aIt = maExtNames.find( nRefIdx ); - return ((aIt != maExtNames.end()) && (0 < nNameIdx) && (nNameIdx <= aIt->second.size())) ? &aIt->second[ nNameIdx - 1 ] : 0; + return ((aIt != maExtNames.end()) && (0 < nNameIdx) && (nNameIdx <= aIt->second.size())) ? &aIt->second[ nNameIdx - 1 ] : nullptr; } void ExtNameBuff::Reset() diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index 933b2d42d535..9a6f13ff3a5b 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -65,7 +65,7 @@ TokenPool::TokenPool( svl::SharedStringPool& rSPool ) : nP_Str = 4; ppP_Str = new OUString *[ nP_Str ]; for( nLauf = 0 ; nLauf < nP_Str ; nLauf++ ) - ppP_Str[ nLauf ] = NULL; + ppP_Str[ nLauf ] = nullptr; // pool for double nP_Dbl = 8; @@ -79,7 +79,7 @@ TokenPool::TokenPool( svl::SharedStringPool& rSPool ) : nP_RefTr = 32; ppP_RefTr = new ScSingleRefData *[ nP_RefTr ]; for( nLauf = 0 ; nLauf < nP_RefTr ; nLauf++ ) - ppP_RefTr[ nLauf ] = NULL; + ppP_RefTr[ nLauf ] = nullptr; nP_Ext = 32; ppP_Ext = new EXTCONT*[ nP_Ext ]; @@ -166,7 +166,7 @@ bool TokenPool::GrowString() for( nL = 0 ; nL < nP_Str ; nL++ ) ppP_StrNew[ nL ] = ppP_Str[ nL ]; for( nL = nP_Str ; nL < nP_StrNew ; nL++ ) - ppP_StrNew[ nL ] = NULL; + ppP_StrNew[ nL ] = nullptr; nP_Str = nP_StrNew; @@ -233,7 +233,7 @@ bool TokenPool::GrowTripel( sal_uInt16 nByMin ) for( nL = 0 ; nL < nP_RefTr ; nL++ ) ppP_RefTrNew[ nL ] = ppP_RefTr[ nL ]; for( nL = nP_RefTr ; nL < nP_RefTrNew ; nL++ ) - ppP_RefTrNew[ nL ] = NULL; + ppP_RefTrNew[ nL ] = nullptr; nP_RefTr = nP_RefTrNew; @@ -370,7 +370,7 @@ bool TokenPool::GetElement( const sal_uInt16 nId ) case T_Str: { sal_uInt16 n = pElement[ nId ]; - OUString* p = ( n < nP_Str )? ppP_Str[ n ] : NULL; + OUString* p = ( n < nP_Str )? ppP_Str[ n ] : nullptr; if (p) pScToken->AddString(mrStringPool.intern(*p)); else @@ -401,7 +401,7 @@ bool TokenPool::GetElement( const sal_uInt16 nId ) case T_RefC: { sal_uInt16 n = pElement[ nId ]; - ScSingleRefData* p = ( n < nP_RefTr )? ppP_RefTr[ n ] : NULL; + ScSingleRefData* p = ( n < nP_RefTr )? ppP_RefTr[ n ] : nullptr; if (p) pScToken->AddSingleReference( *p ); else @@ -435,7 +435,7 @@ bool TokenPool::GetElement( const sal_uInt16 nId ) case T_Ext: { sal_uInt16 n = pElement[ nId ]; - EXTCONT* p = ( n < nP_Ext )? ppP_Ext[ n ] : NULL; + EXTCONT* p = ( n < nP_Ext )? ppP_Ext[ n ] : nullptr; if( p ) { @@ -451,7 +451,7 @@ bool TokenPool::GetElement( const sal_uInt16 nId ) case T_Nlf: { sal_uInt16 n = pElement[ nId ]; - NLFCONT* p = ( n < nP_Nlf )? ppP_Nlf[ n ] : NULL; + NLFCONT* p = ( n < nP_Nlf )? ppP_Nlf[ n ] : nullptr; if( p ) pScToken->AddColRowName( p->aRef ); @@ -462,7 +462,7 @@ bool TokenPool::GetElement( const sal_uInt16 nId ) case T_Matrix: { sal_uInt16 n = pElement[ nId ]; - ScMatrix* p = ( n < nP_Matrix )? ppP_Matrix[ n ] : NULL; + ScMatrix* p = ( n < nP_Matrix )? ppP_Matrix[ n ] : nullptr; if( p ) pScToken->AddMatrix( p ); @@ -550,7 +550,7 @@ bool TokenPool::GetElementRek( const sal_uInt16 nId ) nAnz = 0; bRet = false; } - sal_uInt16* pAkt = nAnz ? &pP_Id[ nFirstId ] : NULL; + sal_uInt16* pAkt = nAnz ? &pP_Id[ nFirstId ] : nullptr; if (nAnz > nP_Id - nFirstId) { SAL_WARN("sc.filter", "TokenPool::GetElementRek: nAnz > nP_Id - nFirstId"); @@ -910,7 +910,7 @@ bool TokenPool::IsSingleOp( const TokenId& rId, const DefTokenId eId ) const const OUString* TokenPool::GetExternal( const TokenId& rId ) const { - const OUString* p = NULL; + const OUString* p = nullptr; sal_uInt16 n = (sal_uInt16) rId; if( n && n <= nElementAkt ) { @@ -932,7 +932,7 @@ ScMatrix* TokenPool::GetMatrix( unsigned int n ) const return ppP_Matrix[ n ]; else SAL_WARN("sc.filter", "GetMatrix: " << n << " >= " << nP_MatrixAkt << "\n"); - return NULL; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 1792c046cf68..83f2aa3e41d4 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -1412,7 +1412,7 @@ namespace { /** Creates and returns an Excel text object from the passed title. */ XclExpChTextRef lclCreateTitle( const XclExpChRoot& rRoot, Reference< XTitled > xTitled, sal_uInt16 nTarget, - const OUString* pSubTitle = NULL ) + const OUString* pSubTitle = nullptr ) { Reference< XTitle > xTitle; if( xTitled.is() ) @@ -3344,7 +3344,7 @@ XclExpChChart::XclExpChChart( const XclExpRoot& rRoot, OUString aSubTitle; lcl_getChartSubTitle(xChartDoc, aSubTitle); mxTitle = lclCreateTitle( GetChRoot(), xTitled, EXC_CHOBJLINK_TITLE, - !aSubTitle.isEmpty() ? &aSubTitle : NULL ); + !aSubTitle.isEmpty() ? &aSubTitle : nullptr ); // diagrams (axes sets) sal_uInt16 nFreeGroupIdx = mxPrimAxesSet->Convert( xDiagram, 0 ); diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index d94bf88db4e3..1f5418d4552c 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -66,7 +66,7 @@ struct XclExpHashEntry { const XclExpString* mpString; /// Pointer to the string (no ownership). sal_uInt32 mnSstIndex; /// The SST index of this string. - inline explicit XclExpHashEntry( const XclExpString* pString = 0, sal_uInt32 nSstIndex = 0 ) : + inline explicit XclExpHashEntry( const XclExpString* pString = nullptr, sal_uInt32 nSstIndex = 0 ) : mpString( pString ), mnSstIndex( nSstIndex ) {} }; @@ -514,14 +514,14 @@ void XclExpHyperlink::SaveXml( XclExpXmlStream& rStrm ) XML_ref, XclXmlUtils::ToOString( maScPos ).getStr(), FSNS( XML_r, XML_id ), !sId.isEmpty() ? XclXmlUtils::ToOString( sId ).getStr() - : NULL, - XML_location, mxTextMark.get() != NULL + : nullptr, + XML_location, mxTextMark.get() != nullptr ? XclXmlUtils::ToOString( *mxTextMark ).getStr() - : NULL, + : nullptr, // OOXTODO: XML_tooltip, from record HLinkTooltip 800h wzTooltip XML_display, mbSetDisplay ? XclXmlUtils::ToOString(m_Repr).getStr() - : NULL, + : nullptr, FSEND ); } @@ -784,7 +784,7 @@ namespace { const char* GetOperatorString(ScConditionMode eMode, bool& bFrmla2) { - const char *pRet = NULL; + const char *pRet = nullptr; switch(eMode) { case SC_COND_EQUAL: @@ -814,10 +814,10 @@ const char* GetOperatorString(ScConditionMode eMode, bool& bFrmla2) pRet = "notBetween"; break; case SC_COND_DUPLICATE: - pRet = NULL; + pRet = nullptr; break; case SC_COND_NOTDUPLICATE: - pRet = NULL; + pRet = nullptr; break; case SC_COND_DIRECT: break; @@ -1022,7 +1022,7 @@ const char* getTimePeriodString( condformat::ScCondFormatDateType eType ) default: break; } - return NULL; + return nullptr; } } @@ -1157,7 +1157,7 @@ OString createGuidStringFromInt(sal_uInt8 nGuid[16]) OString generateGUIDString() { sal_uInt8 nGuid[16]; - rtl_createUuid(nGuid, NULL, true); + rtl_createUuid(nGuid, nullptr, true); return createGuidStringFromInt(nGuid); } @@ -1226,7 +1226,7 @@ XclExpCondfmt::XclExpCondfmt( const XclExpRoot& rRoot, const ScConditionalFormat else if(pFormatEntry->GetType() == condformat::DATE) maCFList.AppendNewRecord( new XclExpDateFormat( GetRoot(), static_cast<const ScCondDateFormatEntry&>(*pFormatEntry), ++rIndex ) ); } - aScRanges.Format( msSeqRef, SCA_VALID, NULL, formula::FormulaGrammar::CONV_XL_A1 ); + aScRanges.Format( msSeqRef, SCA_VALID, nullptr, formula::FormulaGrammar::CONV_XL_A1 ); if(!aExtEntries.empty() && xExtLst.get()) { @@ -1424,8 +1424,8 @@ void XclExpIconSet::SaveXml( XclExpXmlStream& rStrm ) const char* pIconSetName = getIconSetName(mrFormat.GetIconSetData()->eIconSetType); rWorksheet->startElement( XML_iconSet, XML_iconSet, pIconSetName, - XML_showValue, mrFormat.GetIconSetData()->mbShowValue ? NULL : "0", - XML_reverse, mrFormat.GetIconSetData()->mbReverse ? "1" : NULL, + XML_showValue, mrFormat.GetIconSetData()->mbShowValue ? nullptr : "0", + XML_reverse, mrFormat.GetIconSetData()->mbReverse ? "1" : nullptr, FSEND ); maCfvoList.SaveXml( rStrm ); @@ -1496,7 +1496,7 @@ const char* lcl_GetValidationType( sal_uInt32 nFlags ) case EXC_DV_MODE_TEXTLEN: return "textLength"; case EXC_DV_MODE_CUSTOM: return "custom"; } - return NULL; + return nullptr; } const char* lcl_GetOperatorType( sal_uInt32 nFlags ) @@ -1512,7 +1512,7 @@ const char* lcl_GetOperatorType( sal_uInt32 nFlags ) case EXC_DV_COND_EQGREATER: return "greaterThanOrEqual"; case EXC_DV_COND_EQLESS: return "lessThanOrEqual"; } - return NULL; + return nullptr; } } // namespace diff --git a/sc/source/filter/excel/xedbdata.cxx b/sc/source/filter/excel/xedbdata.cxx index ff487e6963b9..640e306d347a 100644 --- a/sc/source/filter/excel/xedbdata.cxx +++ b/sc/source/filter/excel/xedbdata.cxx @@ -155,7 +155,7 @@ void XclExpTablesManager::Initialize() XclExpTables* XclExpTablesManager::GetTablesBySheet( SCTAB nTab ) { TablesMapType::iterator it = maTablesMap.find(nTab); - return it == maTablesMap.end() ? NULL : it->second; + return it == maTablesMap.end() ? nullptr : it->second; } XclExpTables::Entry::Entry( const ScDBData* pData, sal_Int32 nTableId ) : diff --git a/sc/source/filter/excel/xeextlst.cxx b/sc/source/filter/excel/xeextlst.cxx index ec6e8dfe8182..16f0cc4148d4 100644 --- a/sc/source/filter/excel/xeextlst.cxx +++ b/sc/source/filter/excel/xeextlst.cxx @@ -241,7 +241,7 @@ void XclExpExtIconSet::SaveXml(XclExpXmlStream& rStrm) rWorksheet->startElementNS(XML_x14, XML_iconSet, XML_iconSet, mpIconSetName, - XML_custom, mbCustom ? XclXmlUtils::ToPsz10(mbCustom) : NULL, + XML_custom, mbCustom ? XclXmlUtils::ToPsz10(mbCustom) : nullptr, XML_reverse, XclXmlUtils::ToPsz10(mbReverse), XML_showValue, XclXmlUtils::ToPsz10(mbShowValue), FSEND); @@ -259,7 +259,7 @@ void XclExpExtIconSet::SaveXml(XclExpXmlStream& rStrm) XclExpExtCfRule::XclExpExtCfRule( const XclExpRoot& rRoot, const ScFormatEntry& rFormat, const ScAddress& rPos, const OString& rId, sal_Int32 nPriority ): XclExpRoot(rRoot), maId(rId), - pType(NULL), + pType(nullptr), mnPriority(nPriority) { switch (rFormat.GetType()) @@ -290,7 +290,7 @@ void XclExpExtCfRule::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); rWorksheet->startElementNS( XML_x14, XML_cfRule, XML_type, pType, - XML_priority, mnPriority == -1 ? NULL : OString::number(mnPriority).getStr(), + XML_priority, mnPriority == -1 ? nullptr : OString::number(mnPriority).getStr(), XML_id, maId.getStr(), FSEND ); diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index 90c1a1452bfd..7ef64cc074bf 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -38,9 +38,9 @@ using namespace ::formula; // External reference log ===================================================== XclExpRefLogEntry::XclExpRefLogEntry() : - mpUrl( 0 ), - mpFirstTab( 0 ), - mpLastTab( 0 ), + mpUrl( nullptr ), + mpFirstTab( nullptr ), + mpLastTab( nullptr ), mnFirstXclTab( EXC_TAB_DELETED ), mnLastXclTab( EXC_TAB_DELETED ) { @@ -57,8 +57,8 @@ struct XclExpScToken const FormulaToken* mpScToken; /// Currently processed Calc token. sal_uInt8 mnSpaces; /// Number of spaces before the Calc token. - inline explicit XclExpScToken() : mpScToken( 0 ), mnSpaces( 0 ) {} - inline bool Is() const { return mpScToken != 0; } + inline explicit XclExpScToken() : mpScToken( nullptr ), mnSpaces( 0 ) {} + inline bool Is() const { return mpScToken != nullptr; } inline StackVar GetType() const { return mpScToken ? mpScToken->GetType() : static_cast< StackVar >( svUnknown ); } inline OpCode GetOpCode() const { return mpScToken ? mpScToken->GetOpCode() : static_cast< OpCode >( ocNone ); } }; @@ -199,7 +199,7 @@ void XclExpFuncData::IncParamInfoIdx() ++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( mrFuncInfo.IsParamPairs() ) --mpParamInfo; @@ -278,12 +278,12 @@ struct XclExpCompData XclExpCompData::XclExpCompData( const XclExpCompConfig* pCfg ) : mrCfg( pCfg ? *pCfg : spConfigTable[ 0 ] ), - mpLinkMgr( 0 ), - mpRefLog( 0 ), - mpScBasePos( 0 ), + mpLinkMgr( nullptr ), + mpRefLog( nullptr ), + mpScBasePos( nullptr ), mbStopAtSep( false ), mbVolatile( false ), - mbOk( pCfg != 0 ) + mbOk( pCfg != nullptr ) { OSL_ENSURE( pCfg, "XclExpFmlaCompImpl::Init - unknown formula type" ); } @@ -299,7 +299,7 @@ public: /** Creates an Excel token array from the passed Calc token array. */ XclTokenArrayRef CreateFormula( XclFormulaType eType, const ScTokenArray& rScTokArr, - const ScAddress* pScBasePos = 0, XclExpRefLog* pRefLog = 0 ); + const ScAddress* pScBasePos = nullptr, XclExpRefLog* pRefLog = nullptr ); /** Creates a single error token containing the passed error code. */ XclTokenArrayRef CreateErrorFormula( sal_uInt8 nErrCode ); /** Creates a single token for a special cell reference. */ @@ -559,7 +559,7 @@ const XclExpCompConfig* XclExpFmlaCompImpl::GetConfigForType( XclFormulaType eTy { XclExpCompConfigMap::const_iterator aIt = maCfgMap.find( eType ); OSL_ENSURE( aIt != maCfgMap.end(), "XclExpFmlaCompImpl::GetConfigForType - unknown formula type" ); - return (aIt == maCfgMap.end()) ? 0 : &aIt->second; + return (aIt == maCfgMap.end()) ? nullptr : &aIt->second; } void XclExpFmlaCompImpl::Init( XclFormulaType eType ) @@ -583,12 +583,12 @@ void XclExpFmlaCompImpl::Init( XclFormulaType eType, const ScTokenArray& rScTokA case EXC_FMLATYPE_CELL: case EXC_FMLATYPE_MATRIX: case EXC_FMLATYPE_CHART: - mxData->mbOk = pScBasePos != 0; + mxData->mbOk = pScBasePos != nullptr; OSL_ENSURE( mxData->mbOk, "XclExpFmlaCompImpl::Init - missing cell address" ); mxData->mpScBasePos = pScBasePos; break; case EXC_FMLATYPE_SHARED: - mxData->mbOk = pScBasePos != 0; + mxData->mbOk = pScBasePos != nullptr; assert(mxData->mbOk && "XclExpFmlaCompImpl::Init - missing cell address"); if (mxData->mbOk) { @@ -1346,7 +1346,7 @@ void XclExpFmlaCompImpl::ProcessFunction( const XclExpScToken& rTokData ) } } - mxData->mbOk = pFuncInfo != 0; + mxData->mbOk = pFuncInfo != nullptr; if( !mxData->mbOk ) return; // internal functions equivalent to an existing add-in @@ -1897,7 +1897,7 @@ XclExpRefLogEntry* XclExpFmlaCompImpl::GetNewRefLogEntry() mxData->mpRefLog->resize( mxData->mpRefLog->size() + 1 ); return &mxData->mpRefLog->back(); } - return 0; + return nullptr; } void XclExpFmlaCompImpl::ProcessCellRef( const XclExpScToken& rTokData ) @@ -1925,7 +1925,7 @@ void XclExpFmlaCompImpl::ProcessCellRef( const XclExpScToken& rTokData ) mxData->mpLinkMgr->StoreCell(aRefData, *mxData->mpScBasePos); // create the tRef, tRefErr, tRefN, tRef3d, or tRefErr3d token - if (!mxData->mrCfg.mb3DRefOnly && IsRef2D(aRefData, mxData->mpLinkMgr != 0)) + if (!mxData->mrCfg.mb3DRefOnly && IsRef2D(aRefData, mxData->mpLinkMgr != nullptr)) { // 2D reference (not in defined names, but allowed in range lists) sal_uInt8 nBaseId = (!mxData->mpScBasePos && lclIsRefRel2D( aRefData )) ? EXC_TOKID_REFN : @@ -1970,7 +1970,7 @@ void XclExpFmlaCompImpl::ProcessRangeRef( const XclExpScToken& rTokData ) mxData->mpLinkMgr->StoreCellRange(aRefData, *mxData->mpScBasePos); // create the tArea, tAreaErr, tAreaN, tArea3d, or tAreaErr3d token - if (!mxData->mrCfg.mb3DRefOnly && IsRef2D(aRefData, mxData->mpLinkMgr != 0)) + if (!mxData->mrCfg.mb3DRefOnly && IsRef2D(aRefData, mxData->mpLinkMgr != nullptr)) { // 2D reference (not in name formulas, but allowed in range lists) sal_uInt8 nBaseId = (!mxData->mpScBasePos && lclIsRefRel2D( aRefData )) ? EXC_TOKID_AREAN : diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index e67cba02f623..dba973ba0602 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -56,9 +56,9 @@ using ::com::sun::star::i18n::XBreakIterator; XclExpProgressBar::XclExpProgressBar( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), mxProgress( new ScfProgressBar( rRoot.GetDocShell(), STR_SAVE_DOC ) ), - mpSubProgress( 0 ), - mpSubRowCreate( 0 ), - mpSubRowFinal( 0 ), + mpSubProgress( nullptr ), + mpSubRowCreate( nullptr ), + mpSubRowFinal( nullptr ), mnSegRowFinal( SCF_INV_SEGMENT ), mnRowCount( 0 ) { @@ -115,7 +115,7 @@ void XclExpProgressBar::ActivateCreateRowsSegment() mpSubProgress->ActivateSegment( nSeg ); } else - mpSubProgress = 0; + mpSubProgress = nullptr; } void XclExpProgressBar::ActivateFinalRowsSegment() @@ -599,7 +599,7 @@ XclExpStringRef XclExpStringHelper::CreateString( rEE.SetUpdateMode( true ); // create the string rEE.SetText( pParaObj->GetTextObject() ); - xString = lclCreateFormattedString( rRoot, rEE, 0, nFlags, nMaxLen ); + xString = lclCreateFormattedString( rRoot, rEE, nullptr, nFlags, nMaxLen ); rEE.SetUpdateMode( bOldUpdateMode ); // limit formats - TODO: BIFF dependent if( !xString->IsEmpty() ) @@ -626,7 +626,7 @@ XclExpStringRef XclExpStringHelper::CreateString( bool bOldUpdateMode = rEE.GetUpdateMode(); rEE.SetUpdateMode( true ); rEE.SetText( rEditObj ); - xString = lclCreateFormattedString( rRoot, rEE, 0, nFlags, nMaxLen ); + xString = lclCreateFormattedString( rRoot, rEE, nullptr, nFlags, nMaxLen ); rEE.SetUpdateMode( bOldUpdateMode ); // limit formats - TODO: BIFF dependent if( !xString->IsEmpty() ) @@ -697,7 +697,7 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico else aFontData.mnHeight = 10; - const FontList* pFontList = 0; + const FontList* pFontList = nullptr; if( SfxObjectShell* pDocShell = GetDocShell() ) { if( const SvxFontListItem* pInfoItem = static_cast< const SvxFontListItem* >( diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 023afdbef584..254484de73e6 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -84,7 +84,7 @@ class XclExpExtNameDde : public XclExpExtNameBase { public: explicit XclExpExtNameDde( const XclExpRoot& rRoot, const OUString& rName, - sal_uInt16 nFlags, const ScMatrix* pResults = 0 ); + sal_uInt16 nFlags, const ScMatrix* pResults = nullptr ); private: /** Writes additional record contents. */ @@ -398,7 +398,7 @@ public: /** Finds SUPBOOK index and SUPBOOK sheet range from given Excel sheet range. @return An XTI structure containing SUPBOOK and sheet indexes. */ XclExpXti GetXti( sal_uInt16 nFirstXclTab, sal_uInt16 nLastXclTab, - XclExpRefLogEntry* pRefLogEntry = 0 ) const; + XclExpRefLogEntry* pRefLogEntry = nullptr ) const; /** Stores all cells in the given range in a CRN record list. */ void StoreCellRange( const ScRange& rRange ); @@ -428,7 +428,7 @@ public: const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray ); XclExpXti GetXti( sal_uInt16 nFileId, const OUString& rTabName, sal_uInt16 nXclTabSpan, - XclExpRefLogEntry* pRefLogEntry = NULL ); + XclExpRefLogEntry* pRefLogEntry = nullptr ); /** Writes all SUPBOOK records with their sub records. */ virtual void Save( XclExpStream& rStrm ) override; @@ -1054,8 +1054,8 @@ void XclExpExtName::SaveXml(XclExpXmlStream& rStrm) pExternalLink->startElement(XML_definedName, XML_name, XclXmlUtils::ToOString(maName).getStr(), - XML_refersTo, NULL, - XML_sheetId, NULL, + XML_refersTo, nullptr, + XML_sheetId, nullptr, FSEND); pExternalLink->endElement(XML_definedName); @@ -1572,7 +1572,7 @@ bool XclExpSupbook::IsDdeLink( const OUString& rApplic, const OUString& rTopic ) void XclExpSupbook::FillRefLogEntry( XclExpRefLogEntry& rRefLogEntry, sal_uInt16 nFirstSBTab, sal_uInt16 nLastSBTab ) const { - rRefLogEntry.mpUrl = maUrlEncoded.IsEmpty() ? 0 : &maUrlEncoded; + rRefLogEntry.mpUrl = maUrlEncoded.IsEmpty() ? nullptr : &maUrlEncoded; rRefLogEntry.mpFirstTab = GetTabName( nFirstSBTab ); rRefLogEntry.mpLastTab = GetTabName( nLastSBTab ); } @@ -1729,7 +1729,7 @@ void XclExpSupbook::SaveXml( XclExpXmlStream& rStrm ) const XclExpString* XclExpSupbook::GetTabName( sal_uInt16 nSBTab ) const { XclExpXctRef xXct = maXctList.GetRecord( nSBTab ); - return xXct ? &xXct->GetTabName() : 0; + return xXct ? &xXct->GetTabName() : nullptr; } void XclExpSupbook::WriteBody( XclExpStream& rStrm ) @@ -1873,7 +1873,7 @@ void XclExpSupbookBuffer::StoreCell( sal_uInt16 nFileId, const OUString& rTabNam nSupbookId = Append(xSupbook); } - ScExternalRefCache::TokenRef pToken = pRefMgr->getSingleRefToken(nFileId, rTabName, rCell, NULL, NULL); + ScExternalRefCache::TokenRef pToken = pRefMgr->getSingleRefToken(nFileId, rTabName, rCell, nullptr, nullptr); if (!pToken.get()) return; @@ -1917,7 +1917,7 @@ void XclExpSupbookBuffer::StoreCellRange( sal_uInt16 nFileId, const OUString& rT aMatrixList.reserve(nTabCount); // This is a new'ed instance, so we must manage its life cycle here. - ScExternalRefCache::TokenArrayRef pArray = pRefMgr->getDoubleRefTokens(nFileId, rTabName, rRange, NULL); + ScExternalRefCache::TokenArrayRef pArray = pRefMgr->getDoubleRefTokens(nFileId, rTabName, rRange, nullptr); if (!pArray.get()) return; @@ -2103,7 +2103,7 @@ void XclExpSupbookBuffer::SaveXml( XclExpXmlStream& rStrm ) OUString sId; sax_fastparser::FSHelperPtr pExternalLink = rStrm.CreateOutputStream( XclXmlUtils::GetStreamName( "xl/", "externalLinks/externalLink", nId), - XclXmlUtils::GetStreamName( NULL, "externalLinks/externalLink", nId), + XclXmlUtils::GetStreamName( nullptr, "externalLinks/externalLink", nId), rStrm.GetCurrentStream()->getOutputStream(), "application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml", CREATE_OFFICEDOC_RELATION_TYPE("externalLink"), diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index c4b07996954f..f4ed5eb51dcb 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -304,7 +304,7 @@ void XclExpName::SaveXml( XclExpXmlStream& rStrm ) // OOXTODO: XML_functionGroupId, "", // OOXTODO: XML_help, "", XML_hidden, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_NAME_HIDDEN ) ), - XML_localSheetId, mnScTab == SCTAB_GLOBAL ? NULL : OString::number( mnScTab ).getStr(), + XML_localSheetId, mnScTab == SCTAB_GLOBAL ? nullptr : OString::number( mnScTab ).getStr(), XML_name, XclXmlUtils::ToOString( maOrigName ).getStr(), // OOXTODO: XML_publishToServer, "", // OOXTODO: XML_shortcutKey, "", @@ -353,7 +353,7 @@ sal_uInt16 XclExpNameManagerImpl::InsertName( SCTAB nTab, sal_uInt16 nScNameIdx if (nNameIdx) return nNameIdx; - const ScRangeData* pData = NULL; + const ScRangeData* pData = nullptr; ScRangeName* pRN = (nTab == SCTAB_GLOBAL) ? GetDoc().GetRangeName() : GetDoc().GetRangeName(nTab); if (pRN) pData = pRN->findByIndex(nScNameIdx); diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index 19986afdc109..5fb1951236ba 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -412,7 +412,7 @@ XclExpImgData* XclExpPageSettings::getGraphicExport() if( const Graphic* pGraphic = maData.mxBrushItem->GetGraphic() ) return new XclExpImgData( *pGraphic, EXC_ID8_IMGDATA ); - return NULL; + return nullptr; } XclExpChartPageSettings::XclExpChartPageSettings( const XclExpRoot& rRoot ) : diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index a0ca2ba81c30..5b3fe07bf7b4 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -510,7 +510,7 @@ void XclExpPCField::InsertNumDateGroupItems( const ScDPObject& rDPObj, const ScD { // get the string collection with original source elements const ScDPSaveData* pSaveData = rDPObj.GetSaveData(); - const ScDPDimensionSaveData* pDimData = NULL; + const ScDPDimensionSaveData* pDimData = nullptr; if (pSaveData) pDimData = pSaveData->GetExistingDimensionData(); @@ -900,12 +900,12 @@ XclExpPTItem::XclExpPTItem( const XclExpPCField& rCacheField, sal_uInt16 nCacheI { maItemInfo.mnType = EXC_SXVI_TYPE_DATA; maItemInfo.mnCacheIdx = nCacheIdx; - maItemInfo.maVisName.mbUseCache = mpCacheItem != 0; + maItemInfo.maVisName.mbUseCache = mpCacheItem != nullptr; } XclExpPTItem::XclExpPTItem( sal_uInt16 nItemType, sal_uInt16 nCacheIdx, bool bUseCache ) : XclExpRecord( EXC_ID_SXVI, 8 ), - mpCacheItem( 0 ) + mpCacheItem( nullptr ) { maItemInfo.mnType = nItemType; maItemInfo.mnCacheIdx = nCacheIdx; @@ -1147,7 +1147,7 @@ void XclExpPTField::Save( XclExpStream& rStrm ) XclExpPTItem* XclExpPTField::GetItemAcc( const OUString& rName ) { - XclExpPTItem* pItem = 0; + XclExpPTItem* pItem = nullptr; for( size_t nPos = 0, nSize = maItemList.GetSize(); !pItem && (nPos < nSize); ++nPos ) if( maItemList.GetRecord( nPos )->GetItemName() == rName ) pItem = maItemList.GetRecord( nPos ).get(); @@ -1283,7 +1283,7 @@ void XclExpPivotTable::Save( XclExpStream& rStrm ) XclExpPTField* XclExpPivotTable::GetFieldAcc( const OUString& rName ) { - XclExpPTField* pField = 0; + XclExpPTField* pField = nullptr; for( size_t nPos = 0, nSize = maFieldList.GetSize(); !pField && (nPos < nSize); ++nPos ) if( maFieldList.GetRecord( nPos )->GetFieldName() == rName ) pField = maFieldList.GetRecord( nPos ).get(); @@ -1298,7 +1298,7 @@ XclExpPTField* XclExpPivotTable::GetFieldAcc( const ScDPSaveDimension& rSaveDim // a real dimension OUString aFieldName = ScDPUtil::getSourceDimensionName(rSaveDim.GetName()); - return aFieldName.isEmpty() ? NULL : GetFieldAcc(aFieldName); + return aFieldName.isEmpty() ? nullptr : GetFieldAcc(aFieldName); } // fill data -------------------------------------------------------------- @@ -1386,7 +1386,7 @@ void XclExpPivotTable::Finalize() // find data field orientation field maPTInfo.mnDataPos = EXC_SXVIEW_DATALAST; - const ScfUInt16Vec* pFieldVec = 0; + const ScfUInt16Vec* pFieldVec = nullptr; switch( maPTInfo.mnDataAxis ) { case EXC_SXVD_AXIS_ROW: pFieldVec = &maRowFields; break; @@ -1701,7 +1701,7 @@ const XclExpPivotCache* XclExpPivotTableManager::CreatePivotCache( const ScDPObj return xNewPCache.get(); } - return 0; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xepivotxml.cxx b/sc/source/filter/excel/xepivotxml.cxx index 1fd6f7dcc8bc..b03e89150652 100644 --- a/sc/source/filter/excel/xepivotxml.cxx +++ b/sc/source/filter/excel/xepivotxml.cxx @@ -106,7 +106,7 @@ const char* toOOXMLSubtotalType( sheet::GeneralFunction eFunc ) default: ; } - return NULL; + return nullptr; } } @@ -127,7 +127,7 @@ void XclExpXmlPivotCaches::SaveXml( XclExpXmlStream& rStrm ) OUString aRelId; sax_fastparser::FSHelperPtr pPCStrm = rStrm.CreateOutputStream( XclXmlUtils::GetStreamName("xl/pivotCache/", "pivotCacheDefinition", nCacheId), - XclXmlUtils::GetStreamName(NULL, "pivotCache/pivotCacheDefinition", nCacheId), + XclXmlUtils::GetStreamName(nullptr, "pivotCache/pivotCacheDefinition", nCacheId), rStrm.GetCurrentStream()->getOutputStream(), CREATE_XL_CONTENT_TYPE("pivotCacheDefinition"), CREATE_OFFICEDOC_RELATION_TYPE("pivotCacheDefinition"), @@ -160,11 +160,11 @@ const XclExpXmlPivotCaches::Entry* XclExpXmlPivotCaches::GetCache( sal_Int32 nCa { if (nCacheId <= 0) // cache ID is 1-based. - return NULL; + return nullptr; size_t nPos = nCacheId - 1; if (nPos >= maCaches.size()) - return NULL; + return nullptr; return &maCaches[nPos]; } @@ -179,7 +179,7 @@ void XclExpXmlPivotCaches::SavePivotCacheXml( XclExpXmlStream& rStrm, const Entr OUString aRelId; sax_fastparser::FSHelperPtr pRecStrm = rStrm.CreateOutputStream( XclXmlUtils::GetStreamName("xl/pivotCache/", "pivotCacheRecords", nCounter), - XclXmlUtils::GetStreamName(NULL, "pivotCacheRecords", nCounter), + XclXmlUtils::GetStreamName(nullptr, "pivotCacheRecords", nCounter), pDefStrm->getOutputStream(), CREATE_XL_CONTENT_TYPE("pivotCacheRecords"), CREATE_OFFICEDOC_RELATION_TYPE("pivotCacheRecords"), @@ -367,7 +367,7 @@ XclExpXmlPivotCaches& XclExpXmlPivotTableManager::GetCaches() XclExpXmlPivotTables* XclExpXmlPivotTableManager::GetTablesBySheet( SCTAB nTab ) { TablesType::iterator it = maTables.find(nTab); - return it == maTables.end() ? NULL : it->second; + return it == maTables.end() ? nullptr : it->second; } XclExpXmlPivotTables::Entry::Entry( const ScDPObject* pTable, sal_Int32 nCacheId, sal_Int32 nPivotId ) : @@ -390,7 +390,7 @@ void XclExpXmlPivotTables::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr pPivotStrm = rStrm.CreateOutputStream( XclXmlUtils::GetStreamName("xl/pivotTables/", "pivotTable", nPivotId), - XclXmlUtils::GetStreamName(NULL, "../pivotTables/pivotTable", nPivotId), + XclXmlUtils::GetStreamName(nullptr, "../pivotTables/pivotTable", nPivotId), pWSStrm->getOutputStream(), CREATE_XL_CONTENT_TYPE("pivotTable"), CREATE_OFFICEDOC_RELATION_TYPE("pivotTable")); diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 716b360226f7..26f8bbb1b49c 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -720,7 +720,7 @@ OString XclXmlUtils::ToOString( const OUString& s ) OStringBuffer& XclXmlUtils::ToOString( OStringBuffer& s, const ScAddress& rAddress ) { - rAddress.Format(s, SCA_VALID, NULL, ScAddress::Details( FormulaGrammar::CONV_XL_A1)); + rAddress.Format(s, SCA_VALID, nullptr, ScAddress::Details( FormulaGrammar::CONV_XL_A1)); return s; } @@ -735,14 +735,14 @@ OString XclXmlUtils::ToOString( const ScfUInt16Vec& rBuffer ) OString XclXmlUtils::ToOString( const ScRange& rRange ) { - OUString sRange(rRange.Format(SCA_VALID, NULL, ScAddress::Details( FormulaGrammar::CONV_XL_A1))); + OUString sRange(rRange.Format(SCA_VALID, nullptr, ScAddress::Details( FormulaGrammar::CONV_XL_A1))); return ToOString( sRange ); } OString XclXmlUtils::ToOString( const ScRangeList& rRangeList ) { OUString s; - rRangeList.Format(s, SCA_VALID, NULL, FormulaGrammar::CONV_XL_A1, ' '); + rRangeList.Format(s, SCA_VALID, nullptr, FormulaGrammar::CONV_XL_A1, ' '); return ToOString( s ); } @@ -903,15 +903,15 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData( sax_fastparser::FSHelper const char* pUnderline = lcl_GetUnderlineStyle( rFontData.GetScUnderline(), bHaveUnderline ); const char* pVertAlign = lcl_ToVerticalAlignmentRun( rFontData.GetScEscapement(), bHaveVertAlign ); - lcl_WriteValue( pStream, XML_b, rFontData.mnWeight > 400 ? XclXmlUtils::ToPsz( rFontData.mnWeight > 400 ) : NULL ); - lcl_WriteValue( pStream, XML_i, rFontData.mbItalic ? XclXmlUtils::ToPsz( rFontData.mbItalic ) : NULL ); - lcl_WriteValue( pStream, XML_strike, rFontData.mbStrikeout ? XclXmlUtils::ToPsz( rFontData.mbStrikeout ) : NULL ); + lcl_WriteValue( pStream, XML_b, rFontData.mnWeight > 400 ? XclXmlUtils::ToPsz( rFontData.mnWeight > 400 ) : nullptr ); + lcl_WriteValue( pStream, XML_i, rFontData.mbItalic ? XclXmlUtils::ToPsz( rFontData.mbItalic ) : nullptr ); + lcl_WriteValue( pStream, XML_strike, rFontData.mbStrikeout ? XclXmlUtils::ToPsz( rFontData.mbStrikeout ) : nullptr ); // OOXTODO: lcl_WriteValue( rStream, XML_condense, ); // mac compatibility setting // OOXTODO: lcl_WriteValue( rStream, XML_extend, ); // compatibility setting - lcl_WriteValue( pStream, XML_outline, rFontData.mbOutline ? XclXmlUtils::ToPsz( rFontData.mbOutline ) : NULL ); - lcl_WriteValue( pStream, XML_shadow, rFontData.mbShadow ? XclXmlUtils::ToPsz( rFontData.mbShadow ) : NULL ); - lcl_WriteValue( pStream, XML_u, bHaveUnderline ? pUnderline : NULL ); - lcl_WriteValue( pStream, XML_vertAlign, bHaveVertAlign ? pVertAlign : NULL ); + lcl_WriteValue( pStream, XML_outline, rFontData.mbOutline ? XclXmlUtils::ToPsz( rFontData.mbOutline ) : nullptr ); + lcl_WriteValue( pStream, XML_shadow, rFontData.mbShadow ? XclXmlUtils::ToPsz( rFontData.mbShadow ) : nullptr ); + lcl_WriteValue( pStream, XML_u, bHaveUnderline ? pUnderline : nullptr ); + lcl_WriteValue( pStream, XML_vertAlign, bHaveVertAlign ? pVertAlign : nullptr ); lcl_WriteValue( pStream, XML_sz, OString::number( (double) (rFontData.mnHeight / 20.0) ).getStr() ); // Twips->Pt if( rFontData.maColor != Color( 0xFF, 0xFF, 0xFF, 0xFF ) ) pStream->singleElement( XML_color, @@ -923,14 +923,14 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData( sax_fastparser::FSHelper FSEND ); lcl_WriteValue( pStream, nFontId, XclXmlUtils::ToOString( rFontData.maName ).getStr() ); lcl_WriteValue( pStream, XML_family, OString::number( rFontData.mnFamily ).getStr() ); - lcl_WriteValue( pStream, XML_charset, rFontData.mnCharSet != 0 ? OString::number( rFontData.mnCharSet ).getStr() : NULL ); + lcl_WriteValue( pStream, XML_charset, rFontData.mnCharSet != 0 ? OString::number( rFontData.mnCharSet ).getStr() : nullptr ); return pStream; } XclExpXmlStream::XclExpXmlStream( const Reference< XComponentContext >& rCC, bool bExportVBA ) : XmlFilterBase( rCC ), - mpRoot( NULL ), + mpRoot( nullptr ), mbExportVBA(bExportVBA) { } @@ -1020,12 +1020,12 @@ bool XclExpXmlStream::importDocument() throw() oox::vml::Drawing* XclExpXmlStream::getVmlDrawing() { - return 0; + return nullptr; } const oox::drawingml::Theme* XclExpXmlStream::getCurrentTheme() const { - return 0; + return nullptr; } const oox::drawingml::table::TableStyleListPtr XclExpXmlStream::getTableStyles() @@ -1036,7 +1036,7 @@ const oox::drawingml::table::TableStyleListPtr XclExpXmlStream::getTableStyles() oox::drawingml::chart::ChartConverter* XclExpXmlStream::getChartConverter() { // DO NOT CALL - return NULL; + return nullptr; } ScDocShell* XclExpXmlStream::getDocShell() @@ -1048,7 +1048,7 @@ ScDocShell* XclExpXmlStream::getDocShell() if ( pObj ) return static_cast < ScDocShell* >( pObj->GetEmbeddedObject() ); - return 0; + return nullptr; } bool XclExpXmlStream::exportDocument() @@ -1068,7 +1068,7 @@ bool XclExpXmlStream::exportDocument() // NOTE: Don't use SotStorage or SvStream any more, and never call // SfxMedium::GetOutStream() anywhere in the xlsx export filter code! // Instead, write via XOutputStream instance. - tools::SvRef<SotStorage> rStorage = static_cast<SotStorage*>(NULL); + tools::SvRef<SotStorage> rStorage = static_cast<SotStorage*>(nullptr); XclExpObjList::ResetCounters(); XclExpRootData aData( EXC_BIFF8, *pShell->GetMedium (), rStorage, rDoc, RTL_TEXTENCODING_DONTKNOW ); @@ -1138,7 +1138,7 @@ bool XclExpXmlStream::exportDocument() if (xStatusIndicator.is()) xStatusIndicator->end(); - mpRoot = NULL; + mpRoot = nullptr; return true; } diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index 8c3bbd0895dd..58d1acef6731 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -425,7 +425,7 @@ void XclExpString::WriteXml( XclExpXmlStream& rStrm ) const XclFormatRunVec::const_iterator aIt = maFormats.begin(), aEnd = maFormats.end(); sal_uInt16 nStart = 0; - const XclExpFont* pFont = NULL; + const XclExpFont* pFont = nullptr; for ( ; aIt != aEnd; ++aIt ) { nStart = lcl_WriteRun( rStrm, GetUnicodeBuffer(), diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 8b2dfb61e4ad..68067cfe9ce0 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -513,9 +513,9 @@ XclListColor* XclExpPaletteImpl::SearchListEntry( const Color& rColor, sal_uInt3 rnIndex = 0; if (mxColorList->empty()) - return NULL; + return nullptr; - XclListColor* pEntry = NULL; + XclListColor* pEntry = nullptr; // search optimization for equal-colored objects occurring repeatedly if (mnLastIdx < mxColorList->size()) @@ -897,7 +897,7 @@ vcl::Font XclExpFontHelper::GetFontFromItemSet( const XclExpRoot& rRoot, const S // fill the font object vcl::Font aFont; - ScPatternAttr::GetFont( aFont, rItemSet, SC_AUTOCOL_RAW, 0, 0, 0, nScScript ); + ScPatternAttr::GetFont( aFont, rItemSet, SC_AUTOCOL_RAW, nullptr, nullptr, nullptr, nScScript ); return aFont; } @@ -1454,7 +1454,7 @@ OUString GetNumberFormatCode(XclRoot& rRoot, const sal_uInt16 nScNumFmt, SvNumbe if( pEntry->GetType() == css::util::NumberFormat::LOGICAL ) { // build Boolean number format - Color* pColor = 0; + Color* pColor = nullptr; OUString aTemp; const_cast< SvNumberformat* >( pEntry )->GetOutputString( 1.0, aTemp, &pColor ); aFormatStr += "\"" + aTemp + "\";\"" + aTemp + "\";\""; @@ -2129,7 +2129,7 @@ bool XclExpXF::Equals( const XclExpXF& rCmpXF ) const void XclExpXF::InitDefault() { SetRecHeader( EXC_ID5_XF, (GetBiff() == EXC_BIFF8) ? 20 : 16 ); - mpItemSet = 0; + mpItemSet = nullptr; mnScNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND; mnXclFont = mnXclNumFmt = 0; SetXmlIds(0, 0); @@ -2247,7 +2247,7 @@ void XclExpXF::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream(); sal_Int32 nXfId = 0; - const XclExpXF* pStyleXF = NULL; + const XclExpXF* pStyleXF = nullptr; if( IsCellXF() ) { sal_uInt16 nXFIndex = rStrm.GetRoot().GetXFBuffer().GetXFIndex( mnParentXFId ); @@ -2260,7 +2260,7 @@ void XclExpXF::SaveXml( XclExpXmlStream& rStrm ) XML_fontId, OString::number( mnXclFont ).getStr(), XML_fillId, OString::number( mnFillId ).getStr(), XML_borderId, OString::number( mnBorderId ).getStr(), - XML_xfId, IsStyleXF() ? NULL : OString::number( nXfId ).getStr(), + XML_xfId, IsStyleXF() ? nullptr : OString::number( nXfId ).getStr(), // OOXTODO: XML_quotePrefix, // OOXTODO: XML_pivotButton, // OOXTODO: XML_applyNumberFormat, ; @@ -2971,7 +2971,7 @@ void XclExpXFBuffer::InsertDefaultRecords() /* Insert the real default hard cell format -> 0 is document default pattern. Do it here (and not already above) to really have all built-in styles. */ - Insert( 0, GetDefApiScript() ); + Insert( nullptr, GetDefApiScript() ); } void XclExpXFBuffer::AppendXFIndex( sal_uInt32 nXFId ) @@ -3055,34 +3055,34 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot ) if (!pBorder->FillFromItemSet( rSet, GetPalette(), GetBiff()) ) { delete pBorder; - pBorder = NULL; + pBorder = nullptr; } XclExpCellAlign* pAlign = new XclExpCellAlign; if (!pAlign->FillFromItemSet( rSet, false, GetBiff())) { delete pAlign; - pAlign = NULL; + pAlign = nullptr; } XclExpCellProt* pCellProt = new XclExpCellProt; if (!pCellProt->FillFromItemSet( rSet )) { delete pCellProt; - pCellProt = NULL; + pCellProt = nullptr; } XclExpColor* pColor = new XclExpColor(); if(!pColor->FillFromItemSet( rSet )) { delete pColor; - pColor = NULL; + pColor = nullptr; } XclExpDxfFont* pFont = new XclExpDxfFont(rRoot, rSet); - XclExpNumFmt* pNumFormat = NULL; - const SfxPoolItem *pPoolItem = NULL; + XclExpNumFmt* pNumFormat = nullptr; + const SfxPoolItem *pPoolItem = nullptr; if( rSet.GetItemState( ATTR_VALUE_FORMAT, true, &pPoolItem ) == SfxItemState::SET ) { sal_uLong nScNumFmt = static_cast< const SfxUInt32Item* >(pPoolItem)->GetValue(); diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index e8e4d0000269..3c85323a24d7 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -926,7 +926,7 @@ void XclExpFormulaCell::Save( XclExpStream& rStrm ) void XclExpFormulaCell::SaveXml( XclExpXmlStream& rStrm ) { - const char* sType = NULL; + const char* sType = nullptr; OUString sValue; XclXmlUtils::GetFormulaTypeAndValue( mrScFmlaCell, sType, sValue ); sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); @@ -980,8 +980,8 @@ void XclExpFormulaCell::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->startElement( XML_f, XML_aca, XclXmlUtils::ToPsz( (mxTokArr && mxTokArr->IsVolatile()) || (mxAddRec && mxAddRec->IsVolatile())), - XML_t, mxAddRec ? "array" : NULL, - XML_ref, !sFmlaCellRange.isEmpty()? sFmlaCellRange.getStr() : NULL, + XML_t, mxAddRec ? "array" : nullptr, + XML_ref, !sFmlaCellRange.isEmpty()? sFmlaCellRange.getStr() : nullptr, // OOXTODO: XML_dt2D, bool // OOXTODO: XML_dtr, bool // OOXTODO: XML_del1, bool @@ -1391,7 +1391,7 @@ void XclExpRkCell::WriteContents( XclExpStream& rStrm, sal_uInt16 nRelCol ) // Rows and Columns XclExpOutlineBuffer::XclExpOutlineBuffer( const XclExpRoot& rRoot, bool bRows ) : - mpScOLArray( 0 ), + mpScOLArray( nullptr ), maLevelInfos( SC_OL_MAXDEPTH ), mnCurrLevel( 0 ), mbCurrCollapse( false ) @@ -2066,7 +2066,7 @@ void XclExpRow::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->startElement( XML_row, XML_r, OString::number( (mnCurrentRow++) ).getStr(), // OOXTODO: XML_spans, optional - XML_s, haveFormat ? lcl_GetStyleId( rStrm, mnXFIndex ).getStr() : NULL, + XML_s, haveFormat ? lcl_GetStyleId( rStrm, mnXFIndex ).getStr() : nullptr, XML_customFormat, XclXmlUtils::ToPsz( haveFormat ), XML_ht, OString::number( (double) mnHeight / 20.0 ).getStr(), XML_hidden, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_ROW_HIDDEN ) ), @@ -2144,7 +2144,7 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt else { comphelper::ThreadPool &rPool = comphelper::ThreadPool::getSharedOptimalPool(); - std::vector<RowFinalizeTask*> pTasks(nThreads, NULL); + std::vector<RowFinalizeTask*> pTasks(nThreads, nullptr); for ( size_t i = 0; i < nThreads; i++ ) pTasks[ i ] = new RowFinalizeTask( rColXFIndexes, i == 0 ); @@ -2170,7 +2170,7 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt XclExpDefaultRowData aMaxDefData; size_t nMaxDefCount = 0; // only look for default format in existing rows, if there are more than unused - XclExpRow* pPrev = NULL; + XclExpRow* pPrev = nullptr; typedef std::vector< XclExpRow* > XclRepeatedRows; XclRepeatedRows aRepeated; RowMap::iterator itr, itrBeg = maRowMap.begin(), itrEnd = maRowMap.end(); @@ -2516,7 +2516,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) : maRowBfr.AppendCell( xCell, bIsMergedBase ); if ( !aAddNoteText.isEmpty() ) - mxNoteList->AppendNewRecord( new XclExpNote( GetRoot(), aScPos, NULL, aAddNoteText ) ); + mxNoteList->AppendNewRecord( new XclExpNote( GetRoot(), aScPos, nullptr, aAddNoteText ) ); // other sheet contents if( pPattern ) diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 7d955df20f03..75af048ad80d 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -554,7 +554,7 @@ void XclImpChEscherFormat::Convert( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet, XclChObjectType eObjType, bool bUsePicFmt ) const { const XclChFormatInfo& rFmtInfo = rRoot.GetFormatInfo( eObjType ); - rRoot.ConvertEscherFormat( rPropSet, maData, bUsePicFmt ? &maPicFmt : 0, mnDffFillType, rFmtInfo.mePropMode ); + rRoot.ConvertEscherFormat( rPropSet, maData, bUsePicFmt ? &maPicFmt : nullptr, mnDffFillType, rFmtInfo.mePropMode ); } XclImpChFrameBase::XclImpChFrameBase( const XclChFormatInfo& rFmtInfo ) @@ -703,7 +703,7 @@ namespace { /** Creates a labeled data sequence object, adds link for series title if present. */ Reference< XLabeledDataSequence > lclCreateLabeledDataSequence( const XclImpChSourceLinkRef& xValueLink, const OUString& rValueRole, - const XclImpChSourceLink* pTitleLink = 0 ) + const XclImpChSourceLink* pTitleLink = nullptr ) { // create data sequence for values and title Reference< XDataSequence > xValueSeq; @@ -1512,7 +1512,7 @@ void XclImpChDataFormat::UpdateTrendLineFormat() mx3dDataFmt.reset(); mxAttLabel.reset(); // update data label - UpdateDataLabel( 0 ); + UpdateDataLabel( nullptr ); } void XclImpChDataFormat::Convert( ScfPropertySet& rPropSet, const XclChExtTypeInfo& rTypeInfo ) const @@ -1580,7 +1580,7 @@ void XclImpChDataFormat::UpdateDataLabel( const XclImpChDataFormat* pParentFmt ) group, the contents of the CHATTACHEDLABEL record are used. In this case a new CHTEXT group is created and filled with the settings from the CHATTACHEDLABEL record. */ - const XclImpChText* pDefText = NULL; + const XclImpChText* pDefText = nullptr; if (pParentFmt) pDefText = pParentFmt->GetDataLabel(); if (!pDefText) @@ -1713,8 +1713,8 @@ Reference< XPropertySet > XclImpChSerErrorBar::CreateErrorBar( const XclImpChSer ScfPropertySet aBarProp( xErrorBar ); // plus/minus bars visible? - aBarProp.SetBoolProperty( EXC_CHPROP_SHOWPOSITIVEERROR, pPosBar != 0 ); - aBarProp.SetBoolProperty( EXC_CHPROP_SHOWNEGATIVEERROR, pNegBar != 0 ); + aBarProp.SetBoolProperty( EXC_CHPROP_SHOWPOSITIVEERROR, pPosBar != nullptr ); + aBarProp.SetBoolProperty( EXC_CHPROP_SHOWNEGATIVEERROR, pNegBar != nullptr ); // type of displayed error switch( pPrimaryBar->maData.mnSourceType ) @@ -2576,7 +2576,7 @@ Reference< XLegend > XclImpChLegend::CreateLegend() const // no automatic position/size: try to find the correct position and size if( eApiPos == cssc2::LegendPosition_CUSTOM ) { - const XclChFramePos* pFramePos = mxFramePos ? &mxFramePos->GetFramePosData() : 0; + const XclChFramePos* pFramePos = mxFramePos ? &mxFramePos->GetFramePosData() : nullptr; /* Legend position. Only the settings from the CHFRAMEPOS record are used by Excel, the position in the CHLEGEND record will be @@ -3430,7 +3430,7 @@ void XclImpChAxis::ConvertAxisPosition( ScfPropertySet& rPropSet, const XclImpCh void XclImpChAxis::ReadChAxisLine( XclImpStream& rStrm ) { - XclImpChLineFormatRef* pxLineFmt = 0; + XclImpChLineFormatRef* pxLineFmt = nullptr; bool bWallFrame = false; switch( rStrm.ReaduInt16() ) { @@ -3616,7 +3616,7 @@ void XclImpChAxesSet::Convert( Reference< XDiagram > xDiagram ) const // create the axes with grids and axis titles and insert them into the diagram ConvertAxis( mxXAxis, mxXAxisTitle, xCoordSystem, mxYAxis.get() ); ConvertAxis( mxYAxis, mxYAxisTitle, xCoordSystem, mxXAxis.get() ); - ConvertAxis( mxZAxis, mxZAxisTitle, xCoordSystem, 0 ); + ConvertAxis( mxZAxis, mxZAxisTitle, xCoordSystem, nullptr ); } } } @@ -3909,7 +3909,7 @@ const XclImpChText* XclImpChChart::GetDefaultText( XclChTextType eTextType ) con } XclImpChTextMap::const_iterator itr = maDefTexts.find(nDefTextId); - return itr == maDefTexts.end() ? NULL : itr->second; + return itr == maDefTexts.end() ? nullptr : itr->second; } bool XclImpChChart::IsManualPlotArea() const @@ -4186,8 +4186,8 @@ void XclImpChartDrawing::ConvertObjects( XclImpDffConverter& rDffConv, { maChartRect = rChartRect; // needed in CalcAnchorRect() callback - SdrModel* pSdrModel = 0; - SdrPage* pSdrPage = 0; + SdrModel* pSdrModel = nullptr; + SdrPage* pSdrPage = nullptr; if( mbOwnTab ) { // chart sheet: insert all shapes into the sheet, not into the chart object @@ -4202,7 +4202,7 @@ void XclImpChartDrawing::ConvertObjects( XclImpDffConverter& rDffConv, Reference< XDrawPageSupplier > xDrawPageSupp( rxModel, UNO_QUERY_THROW ); Reference< XDrawPage > xDrawPage( xDrawPageSupp->getDrawPage(), UNO_SET_THROW ); pSdrPage = ::GetSdrPageFromXDrawPage( xDrawPage ); - pSdrModel = pSdrPage ? pSdrPage->GetModel() : 0; + pSdrModel = pSdrPage ? pSdrPage->GetModel() : nullptr; } catch( Exception& ) { diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 1e009ba91271..5b63352c4738 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -95,7 +95,7 @@ void XclImpSst::ReadSst( XclImpStream& rStrm ) const XclImpString* XclImpSst::GetString( sal_uInt32 nSstIndex ) const { - return (nSstIndex < maStrings.size()) ? &maStrings[ nSstIndex ] : 0; + return (nSstIndex < maStrings.size()) ? &maStrings[ nSstIndex ] : nullptr; } // Hyperlinks ================================================================= @@ -441,7 +441,7 @@ void XclImpLabelranges::ReadLabelranges( XclImpStream& rStrm ) SCTAB nScTab = rRoot.GetCurrScTab(); XclImpAddressConverter& rAddrConv = rRoot.GetAddressConverter(); ScRangePairListRef xLabelRangesRef; - const ScRange* pScRange = 0; + const ScRange* pScRange = nullptr; XclRangeList aRowXclRanges, aColXclRanges; rStrm >> aRowXclRanges >> aColXclRanges; @@ -601,7 +601,7 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm ) nAlign = rStrm.ReaduInt16(); nAlignMisc = rStrm.ReaduInt16(); aAlign.FillFromCF( nAlign, nAlignMisc ); - aAlign.FillToItemSet( rStyleItemSet, NULL ); + aAlign.FillToItemSet( rStyleItemSet, nullptr ); rStrm.Ignore(4); } @@ -650,7 +650,7 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm ) ::std::unique_ptr< ScTokenArray > xTokArr1; if( nFmlaSize1 > 0 ) { - const ScTokenArray* pTokArr = 0; + const ScTokenArray* pTokArr = nullptr; rFmlaConv.Reset( rPos ); rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize1, false, FT_CondFormat ); // formula converter owns pTokArr -> create a copy of the token array @@ -661,7 +661,7 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm ) ::std::unique_ptr< ScTokenArray > pTokArr2; if( nFmlaSize2 > 0 ) { - const ScTokenArray* pTokArr = 0; + const ScTokenArray* pTokArr = nullptr; rFmlaConv.Reset( rPos ); rFmlaConv.Convert( pTokArr, rStrm, nFmlaSize2, false, FT_CondFormat ); // formula converter owns pTokArr -> create a copy of the token array @@ -787,7 +787,7 @@ void XclImpValidationManager::ReadDV( XclImpStream& rStrm ) rStrm.Ignore( 2 ); if( nLen > 0 ) { - const ScTokenArray* pTokArr = 0; + const ScTokenArray* pTokArr = nullptr; rFmlaConv.Reset(); rFmlaConv.Convert( pTokArr, rStrm, nLen, false, FT_CondFormat ); // formula converter owns pTokArr -> create a copy of the token array @@ -803,7 +803,7 @@ void XclImpValidationManager::ReadDV( XclImpStream& rStrm ) rStrm.Ignore( 2 ); if( nLen > 0 ) { - const ScTokenArray* pTokArr = 0; + const ScTokenArray* pTokArr = nullptr; rFmlaConv.Reset(); rFmlaConv.Convert( pTokArr, rStrm, nLen, false, FT_CondFormat ); // formula converter owns pTokArr -> create a copy of the token array @@ -1348,7 +1348,7 @@ XclImpSheetProtectBuffer::Sheet* XclImpSheetProtectBuffer::GetSheetItem( SCTAB n { // new sheet if ( !maProtectedSheets.insert( ProtectedSheetMap::value_type(nTab, Sheet()) ).second ) - return NULL; + return nullptr; itr = maProtectedSheets.find(nTab); } diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index b0d265599a07..9a7264378b44 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -386,7 +386,7 @@ OUString XclImpDrawObjBase::GetObjName() const const XclObjAnchor* XclImpDrawObjBase::GetAnchor() const { - return mbHasAnchor ? &maAnchor : 0; + return mbHasAnchor ? &maAnchor : nullptr; } bool XclImpDrawObjBase::IsValidSize( const Rectangle& rAnchorRect ) const @@ -451,7 +451,7 @@ SdrObjectPtr XclImpDrawObjBase::CreateSdrObject( XclImpDffConverter& rDffConv, c ( (mnObjType < 25 && mnObjType > 10) || mnObjType == 7 || mnObjType == 8 ) ) { SdrUnoObj* pSdrUnoObj = dynamic_cast< SdrUnoObj* >( xSdrObj.get() ); - if( pSdrUnoObj != NULL ) + if( pSdrUnoObj != nullptr ) { Reference< XControlModel > xCtrlModel = pSdrUnoObj->GetUnoControlModel(); Reference< XPropertySet > xPropSet(xCtrlModel,UNO_QUERY); @@ -479,7 +479,7 @@ SdrObjectPtr XclImpDrawObjBase::CreateSdrObject( XclImpDffConverter& rDffConv, c //Need summary type for export const static rtl::OUString sObjIdPropertyName("ObjIDinMSO"); const XclImpPictureObj* const pObj = dynamic_cast< const XclImpPictureObj* const >(this); - if( pObj != NULL && pObj->IsOcxControl() ) + if( pObj != nullptr && pObj->IsOcxControl() ) { const sal_Int16 nOCXControlType = eCreateFromMSOCXControl; Any aAny; @@ -805,7 +805,7 @@ sal_Size XclImpDrawObjBase::DoGetProgressSize() const SdrObjectPtr XclImpDrawObjBase::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& ) const { rDffConv.Progress( GetProgressSize() ); - return 0; + return nullptr; } void XclImpDrawObjBase::DoPreProcessSdrObj( XclImpDffConverter&, SdrObject& ) const @@ -2307,7 +2307,7 @@ void XclImpOptionButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const pTbxObj = dynamic_cast< XclImpOptionButtonObj* >( GetObjectManager().GetSheetDrawing( GetTab() ).FindDrawObj( pTbxObj->mnNextInGroup ).get() ); } else - pTbxObj = NULL; + pTbxObj = nullptr; } while ( pTbxObj && !( pTbxObj->mnFirstInGroup == 1 ) ); } else @@ -3216,7 +3216,7 @@ void XclImpSolverContainer::UpdateConnection( sal_uInt32 nDffShapeId, SdrObject* } XclImpSimpleDffConverter::XclImpSimpleDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ) : - SvxMSDffManager( rDffStrm, rRoot.GetBasePath(), 0, 0, rRoot.GetDoc().GetDrawLayer(), 1440, COL_DEFAULT, 0 ), + SvxMSDffManager( rDffStrm, rRoot.GetBasePath(), 0, nullptr, rRoot.GetDoc().GetDrawLayer(), 1440, COL_DEFAULT, nullptr ), XclImpRoot( rRoot ) { SetSvxMSDffSettings( SVXMSDFF_SETTINGS_CROP_BITMAPS | SVXMSDFF_SETTINGS_IMPORT_EXCEL ); @@ -3454,7 +3454,7 @@ SdrObjectPtr XclImpDffConverter::CreateSdrObject( const XclImpPictureObj& rPicOb sal_Int64 nAspects = rPicObj.IsSymbol() ? cssea::MSOLE_ICON : cssea::MSOLE_CONTENT; xSdrObj.reset( CreateSdrOLEFromStorage( aStrgName, xSrcStrg, pDocShell->GetStorage(), aGraphic, - rAnchorRect, aVisArea, 0, nError, mnOleImpFlags, nAspects ) ); + rAnchorRect, aVisArea, nullptr, nError, mnOleImpFlags, nAspects ) ); } } } @@ -3511,7 +3511,7 @@ SdrObject* XclImpDffConverter::ProcessObj( SvStream& rDffStrm, DffObjData& rDffO // Do not process the global page group shape (flag SP_FPATRIARCH) bool bGlobalPageGroup = ::get_flag< sal_uInt32 >( rDffObjData.nSpFlags, SP_FPATRIARCH ); if( !xDrawObj || !xDrawObj->IsProcessSdrObj() || bGlobalPageGroup ) - return 0; // simply return, xSdrObj will be destroyed + return nullptr; // simply return, xSdrObj will be destroyed /* Pass pointer to top-level object back to caller. If the processed object is embedded in a group, the pointer is already set to the @@ -3531,7 +3531,7 @@ SdrObject* XclImpDffConverter::ProcessObj( SvStream& rDffStrm, DffObjData& rDffO #i58780# Ignore group shapes, size is not initialized. */ bool bEmbeddedGroup = !bIsTopLevel && dynamic_cast< SdrObjGroup* >( xSdrObj.get() ); if( !bEmbeddedGroup && !xDrawObj->IsValidSize( rAnchorRect ) ) - return 0; // simply return, xSdrObj will be destroyed + return nullptr; // simply return, xSdrObj will be destroyed // set shape information from DFF stream OUString aObjName = GetPropertyString( DFF_Prop_wzName, rDffStrm ); @@ -3740,7 +3740,7 @@ void XclImpDffConverter::ProcessShContainer( SvStream& rDffStrm, const DffRecord { rShHeader.SeekToBegOfRecord( rDffStrm ); Rectangle aDummy; - const XclImpDrawObjBase* pDrawObj = 0; + const XclImpDrawObjBase* pDrawObj = nullptr; /* The call to ImportObj() creates and returns a new SdrObject for the processed shape. We take ownership of the returned object here. If the shape is a group object, all embedded objects are created recursively, @@ -3932,7 +3932,7 @@ const XclImpObjTextData* XclImpDrawing::FindTextData( const DffRecordHeader& rHe XclImpObjTextMap::const_iterator aIt = maTextMap.upper_bound( rHeader.GetRecBegFilePos() ); if( (aIt != maTextMap.end()) && (aIt->first <= rHeader.GetRecEndFilePos()) ) return aIt->second.get(); - return 0; + return nullptr; } void XclImpDrawing::SetSkipObj( sal_uInt16 nObjId ) @@ -4293,7 +4293,7 @@ void XclImpDffPropSet::Read( XclImpStream& rStrm ) mxMemStrm.reset( new SvMemoryStream ); rStrm.CopyToStream( *mxMemStrm, 8 + nPropSetSize ); mxMemStrm->Seek( STREAM_SEEK_TO_BEGIN ); - maDffConv.ReadPropSet( *mxMemStrm, 0 ); + maDffConv.ReadPropSet( *mxMemStrm, nullptr ); } sal_uInt32 XclImpDffPropSet::GetPropertyValue( sal_uInt16 nPropId, sal_uInt32 nDefault ) const diff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxx index 9eacf36e4028..346621455788 100644 --- a/sc/source/filter/excel/xiformula.cxx +++ b/sc/source/filter/excel/xiformula.cxx @@ -70,7 +70,7 @@ const ScTokenArray* XclImpFmlaCompImpl::CreateFormula( XclFormulaType /*eType*/, const XclTokenArray& rXclTokArr ) { if (rXclTokArr.Empty()) - return NULL; + return nullptr; // evil hack! are we trying to phase out the old style formula converter ? SvMemoryStream aMemStrm; @@ -78,7 +78,7 @@ const ScTokenArray* XclImpFmlaCompImpl::CreateFormula( aMemStrm.Write( rXclTokArr.GetData(), rXclTokArr.GetSize() ); XclImpStream aFmlaStrm( aMemStrm, GetRoot() ); aFmlaStrm.StartNextRecord(); - const ScTokenArray* pArray = NULL; + const ScTokenArray* pArray = nullptr; GetOldFmlaConverter().Reset(); GetOldFmlaConverter().Convert(pArray, aFmlaStrm, aFmlaStrm.GetRecSize(), true); return pArray; diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index 1f7446df8a7e..462e89d7cdaa 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -140,7 +140,7 @@ namespace { EditTextObject* lclCreateTextObject( const XclImpRoot& rRoot, const XclImpString& rString, XclFontItemType eType, sal_uInt16 nXFIndex ) { - EditTextObject* pTextObj = 0; + EditTextObject* pTextObj = nullptr; const XclImpXFBuffer& rXFBuffer = rRoot.GetXFBuffer(); const XclImpFont* pFirstFont = rXFBuffer.GetFont( nXFIndex ); diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index 77647f50fc5a..ac2311305e46 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -97,7 +97,7 @@ public: /** Reads a CRN record (external referenced cell). */ void ReadCrn( XclImpStream& rStrm ); /** Reads an EXTERNNAME record. */ - void ReadExternname( XclImpStream& rStrm, ExcelToSc* pFormulaConv = NULL ); + void ReadExternname( XclImpStream& rStrm, ExcelToSc* pFormulaConv = nullptr ); /** Returns the SUPBOOK record type. */ inline XclSupbookType GetType() const { return meType; } @@ -170,7 +170,7 @@ public: /** Reads a CRN record and appends it to the current SUPBOOK. */ void ReadCrn( XclImpStream& rStrm ); /** Reads an EXTERNNAME record and appends it to the current SUPBOOK. */ - void ReadExternname( XclImpStream& rStrm, ExcelToSc* pFormulaConv = NULL ); + void ReadExternname( XclImpStream& rStrm, ExcelToSc* pFormulaConv = nullptr ); /** Returns true, if the specified XTI entry contains an internal reference. */ bool IsSelfRef( sal_uInt16 nXtiIndex ) const; @@ -335,7 +335,7 @@ const ScMatrix& XclImpExtName::MOper::GetCache() const } XclImpExtName::XclImpExtName( XclImpSupbook& rSupbook, XclImpStream& rStrm, XclSupbookType eSubType, ExcelToSc* pFormulaConv ) - : mpMOper(NULL) + : mpMOper(nullptr) , mnStorageId(0) { sal_uInt16 nFlags(0); @@ -379,7 +379,7 @@ XclImpExtName::XclImpExtName( XclImpSupbook& rSupbook, XclImpStream& rStrm, XclS { if (pFormulaConv) { - const ScTokenArray* pArray = NULL; + const ScTokenArray* pArray = nullptr; sal_uInt16 nFmlaLen; nFmlaLen = rStrm.ReaduInt16(); vector<OUString> aTabNames; @@ -544,7 +544,7 @@ bool XclImpExtName::CreateOleData(ScDocument& rDoc, const OUString& rUrl, bool XclImpExtName::HasFormulaTokens() const { - return (mxArray.get() != NULL); + return (mxArray.get() != nullptr); } // Cached external cells ====================================================== @@ -706,10 +706,10 @@ const XclImpExtName* XclImpSupbook::GetExternName( sal_uInt16 nXclIndex ) const if (nXclIndex == 0) { SAL_WARN("sc", "XclImpSupbook::GetExternName - index must be >0"); - return NULL; + return nullptr; } if (meType == EXC_SBTYPE_SELF || nXclIndex > maExtNameList.size()) - return NULL; + return nullptr; return &maExtNameList[nXclIndex-1]; } @@ -721,7 +721,7 @@ bool XclImpSupbook::GetLinkData( OUString& rApplic, OUString& rTopic ) const const OUString& XclImpSupbook::GetMacroName( sal_uInt16 nXclNameIdx ) const { OSL_ENSURE( nXclNameIdx > 0, "XclImpSupbook::GetMacroName - index must be >0" ); - const XclImpName* pName = (meType == EXC_SBTYPE_SELF) ? GetNameManager().GetName( nXclNameIdx ) : 0; + const XclImpName* pName = (meType == EXC_SBTYPE_SELF) ? GetNameManager().GetName( nXclNameIdx ) : nullptr; return (pName && pName->IsVBName()) ? pName->GetScName() : EMPTY_OUSTRING; } @@ -834,14 +834,14 @@ bool XclImpLinkManagerImpl::GetScTabRange( const XclImpExtName* XclImpLinkManagerImpl::GetExternName( sal_uInt16 nXtiIndex, sal_uInt16 nExtName ) const { const XclImpSupbook* pSupbook = GetSupbook( nXtiIndex ); - return pSupbook ? pSupbook->GetExternName( nExtName ) : 0; + return pSupbook ? pSupbook->GetExternName( nExtName ) : nullptr; } const OUString* XclImpLinkManagerImpl::GetSupbookUrl( sal_uInt16 nXtiIndex ) const { const XclImpSupbook* p = GetSupbook( nXtiIndex ); if (!p) - return NULL; + return nullptr; return &p->GetXclUrl(); } @@ -865,16 +865,16 @@ const OUString& XclImpLinkManagerImpl::GetMacroName( sal_uInt16 nExtSheet, sal_u const XclImpXti* XclImpLinkManagerImpl::GetXti( sal_uInt16 nXtiIndex ) const { - return (nXtiIndex < maXtiList.size()) ? &maXtiList[ nXtiIndex ] : 0; + return (nXtiIndex < maXtiList.size()) ? &maXtiList[ nXtiIndex ] : nullptr; } const XclImpSupbook* XclImpLinkManagerImpl::GetSupbook( sal_uInt16 nXtiIndex ) const { if ( maSupbookList.empty() ) - return NULL; + return nullptr; const XclImpXti* pXti = GetXti( nXtiIndex ); if (!pXti || pXti->mnSupbook >= maSupbookList.size()) - return NULL; + return nullptr; return &(maSupbookList.at( pXti->mnSupbook )); } diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index c5340bc8092f..c120693f0672 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -32,7 +32,7 @@ XclImpName::TokenStrmData::TokenStrmData( XclImpStream& rStrm ) : XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) : XclImpRoot( rStrm.GetRoot() ), - mpScData( 0 ), + mpScData( nullptr ), mcBuiltIn( EXC_BUILTIN_UNKNOWN ), mnScTab( SCTAB_MAX ), meNameType( RT_NAME ), @@ -143,7 +143,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) : // 3) *** convert the name definition formula *** ------------------------- rFmlaConv.Reset(); - const ScTokenArray* pTokArr = 0; // pointer to token array, owned by rFmlaConv + const ScTokenArray* pTokArr = nullptr; // pointer to token array, owned by rFmlaConv if( ::get_flag( nFlags, EXC_NAME_BIG ) ) { @@ -281,8 +281,8 @@ void XclImpNameManager::ReadName( XclImpStream& rStrm ) const XclImpName* XclImpNameManager::FindName( const OUString& rXclName, SCTAB nScTab ) const { - const XclImpName* pGlobalName = 0; // a found global name - const XclImpName* pLocalName = 0; // a found local name + const XclImpName* pGlobalName = nullptr; // a found global name + const XclImpName* pLocalName = nullptr; // a found local name for( XclImpNameList::const_iterator itName = maNameList.begin(); itName != maNameList.end() && !pLocalName; ++itName ) { if( itName->GetXclName() == rXclName ) diff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx index 2d22f531533b..379493f6c411 100644 --- a/sc/source/filter/excel/xipage.cxx +++ b/sc/source/filter/excel/xipage.cxx @@ -125,7 +125,7 @@ void XclImpPageSettings::ReadHeaderFooter( XclImpStream& rStrm ) void XclImpPageSettings::ReadPageBreaks( XclImpStream& rStrm ) { - ScfUInt16Vec* pVec = 0; + ScfUInt16Vec* pVec = nullptr; switch( rStrm.GetRecId() ) { case EXC_ID_HORPAGEBREAKS: pVec = &maData.maHorPageBreaks; break; diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 53afce640560..ef2a209c3bb9 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -204,19 +204,19 @@ const OUString& XclImpPCField::GetFieldName( const ScfStringVec& rVisNames ) con const XclImpPCField* XclImpPCField::GetGroupBaseField() const { OSL_ENSURE( IsGroupChildField(), "XclImpPCField::GetGroupBaseField - this field type does not have a base field" ); - return IsGroupChildField() ? mrPCache.GetField( maFieldInfo.mnGroupBase ) : 0; + return IsGroupChildField() ? mrPCache.GetField( maFieldInfo.mnGroupBase ) : nullptr; } const XclImpPCItem* XclImpPCField::GetItem( sal_uInt16 nItemIdx ) const { - return (nItemIdx < maItems.size()) ? maItems[ nItemIdx ].get() : 0; + return (nItemIdx < maItems.size()) ? maItems[ nItemIdx ].get() : nullptr; } const XclImpPCItem* XclImpPCField::GetLimitItem( sal_uInt16 nItemIdx ) const { OSL_ENSURE( nItemIdx < 3, "XclImpPCField::GetLimitItem - invalid item index" ); OSL_ENSURE( nItemIdx < maNumGroupItems.size(), "XclImpPCField::GetLimitItem - no item found" ); - return (nItemIdx < maNumGroupItems.size()) ? maNumGroupItems[ nItemIdx ].get() : 0; + return (nItemIdx < maNumGroupItems.size()) ? maNumGroupItems[ nItemIdx ].get() : nullptr; } void XclImpPCField::WriteFieldNameToSource( SCCOL nScCol, SCTAB nScTab ) @@ -545,7 +545,7 @@ const double* XclImpPCField::GetNumGroupLimit( sal_uInt16 nLimitIdx ) const OSL_ENSURE( pItem->GetDouble(), "XclImpPCField::GetNumGroupLimit - SXDOUBLE item expected" ); return pItem->GetDouble(); } - return 0; + return nullptr; } const DateTime* XclImpPCField::GetDateGroupLimit( sal_uInt16 nLimitIdx ) const @@ -556,7 +556,7 @@ const DateTime* XclImpPCField::GetDateGroupLimit( sal_uInt16 nLimitIdx ) const OSL_ENSURE( pItem->GetDateTime(), "XclImpPCField::GetDateGroupLimit - SXDATETIME item expected" ); return pItem->GetDateTime(); } - return 0; + return nullptr; } const sal_Int16* XclImpPCField::GetDateGroupStep() const @@ -574,12 +574,12 @@ const sal_Int16* XclImpPCField::GetDateGroupStep() const { OSL_ENSURE( *pnStep > 0, "XclImpPCField::GetDateGroupStep - invalid step count" ); // return nothing for step count 1 - this is also a standard date group in Excel - return (*pnStep > 1) ? pnStep : 0; + return (*pnStep > 1) ? pnStep : nullptr; } } } } - return 0; + return nullptr; } XclImpPivotCache::XclImpPivotCache( const XclImpRoot& rRoot ) : @@ -604,7 +604,7 @@ sal_uInt16 XclImpPivotCache::GetFieldCount() const const XclImpPCField* XclImpPivotCache::GetField( sal_uInt16 nFieldIdx ) const { - return (nFieldIdx < maFields.size()) ? maFields[ nFieldIdx ].get() : 0; + return (nFieldIdx < maFields.size()) ? maFields[ nFieldIdx ].get() : nullptr; } // records -------------------------------------------------------------------- @@ -890,8 +890,8 @@ const OUString* XclImpPTItem::GetItemName() const if( mpCacheField ) if( const XclImpPCItem* pCacheItem = mpCacheField->GetItem( maItemInfo.mnCacheIdx ) ) //TODO: use XclImpPCItem::ConvertToText(), if all conversions are available - return pCacheItem->IsEmpty() ? NULL : pCacheItem->GetText(); - return 0; + return pCacheItem->IsEmpty() ? nullptr : pCacheItem->GetText(); + return nullptr; } void XclImpPTItem::ReadSxvi( XclImpStream& rStrm ) @@ -922,7 +922,7 @@ XclImpPTField::XclImpPTField( const XclImpPivotTable& rPTable, sal_uInt16 nCache const XclImpPCField* XclImpPTField::GetCacheField() const { XclImpPivotCacheRef xPCache = mrPTable.GetPivotCache(); - return xPCache ? xPCache->GetField( maFieldInfo.mnCacheIdx ) : 0; + return xPCache ? xPCache->GetField( maFieldInfo.mnCacheIdx ) : nullptr; } OUString XclImpPTField::GetFieldName() const @@ -939,13 +939,13 @@ OUString XclImpPTField::GetVisFieldName() const const XclImpPTItem* XclImpPTField::GetItem( sal_uInt16 nItemIdx ) const { - return (nItemIdx < maItems.size()) ? maItems[ nItemIdx ].get() : 0; + return (nItemIdx < maItems.size()) ? maItems[ nItemIdx ].get() : nullptr; } const OUString* XclImpPTField::GetItemName( sal_uInt16 nItemIdx ) const { const XclImpPTItem* pItem = GetItem( nItemIdx ); - return pItem ? pItem->GetItemName() : 0; + return pItem ? pItem->GetItemName() : nullptr; } // records -------------------------------------------------------------------- @@ -1076,15 +1076,15 @@ ScDPSaveDimension* XclImpPTField::ConvertRCPField( ScDPSaveData& rSaveData ) con { const OUString& rFieldName = GetFieldName(); if( rFieldName.isEmpty() ) - return 0; + return nullptr; const XclImpPCField* pCacheField = GetCacheField(); if( !pCacheField || !pCacheField->IsSupportedField() ) - return 0; + return nullptr; ScDPSaveDimension* pTest = rSaveData.GetNewDimensionByName(rFieldName); if (!pTest) - return NULL; + return nullptr; ScDPSaveDimension& rSaveDim = *pTest; @@ -1194,7 +1194,7 @@ void XclImpPTField::ConvertItems( ScDPSaveDimension& rSaveDim ) const XclImpPivotTable::XclImpPivotTable( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), maDataOrientField( *this, EXC_SXIVD_DATA ), - mpDPObj(NULL) + mpDPObj(nullptr) { } @@ -1212,20 +1212,20 @@ sal_uInt16 XclImpPivotTable::GetFieldCount() const const XclImpPTField* XclImpPivotTable::GetField( sal_uInt16 nFieldIdx ) const { return (nFieldIdx == EXC_SXIVD_DATA) ? &maDataOrientField : - ((nFieldIdx < maFields.size()) ? maFields[ nFieldIdx ].get() : 0); + ((nFieldIdx < maFields.size()) ? maFields[ nFieldIdx ].get() : nullptr); } XclImpPTField* XclImpPivotTable::GetFieldAcc( sal_uInt16 nFieldIdx ) { // do not return maDataOrientField - return (nFieldIdx < maFields.size()) ? maFields[ nFieldIdx ].get() : 0; + return (nFieldIdx < maFields.size()) ? maFields[ nFieldIdx ].get() : nullptr; } const XclImpPTField* XclImpPivotTable::GetDataField( sal_uInt16 nDataFieldIdx ) const { if( nDataFieldIdx < maOrigDataFields.size() ) return GetField( maOrigDataFields[ nDataFieldIdx ] ); - return 0; + return nullptr; } OUString XclImpPivotTable::GetDataFieldName( sal_uInt16 nDataFieldIdx ) const @@ -1283,7 +1283,7 @@ void XclImpPivotTable::ReadSxivd( XclImpStream& rStrm ) mxCurrField.reset(); // find the index vector to fill (row SXIVD doesn't exist without row fields) - ScfUInt16Vec* pFieldVec = 0; + ScfUInt16Vec* pFieldVec = nullptr; if( maRowFields.empty() && (maPTInfo.mnRowFields > 0) ) pFieldVec = &maRowFields; else if( maColFields.empty() && (maPTInfo.mnColFields > 0) ) diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index c95245ed4daa..4dc07db02668 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -494,7 +494,7 @@ void XclImpFont::GuessScriptType() mbHasWstrn = (!mbHasAsian && !mbHasCmplx) || pCharMap->HasChar( 'A' ); } - pCharMap = 0; + pCharMap = nullptr; } } @@ -552,11 +552,11 @@ const XclImpFont* XclImpFontBuffer::GetFont( sal_uInt16 nFontIndex ) const if (nFontIndex < 4) { // Font ID is zero-based when it's less than 4. - return nFontIndex >= maFontList.size() ? NULL : &maFontList[nFontIndex]; + return nFontIndex >= maFontList.size() ? nullptr : &maFontList[nFontIndex]; } // Font ID is greater than 4. It is now 1-based. - return nFontIndex > maFontList.size() ? NULL : &maFontList[nFontIndex-1]; + return nFontIndex > maFontList.size() ? nullptr : &maFontList[nFontIndex-1]; } void XclImpFontBuffer::ReadFont( XclImpStream& rStrm ) @@ -1087,7 +1087,7 @@ void XclImpCellArea::FillToItemSet( SfxItemSet& rItemSet, const XclImpPalette& r XclImpXF::XclImpXF( const XclImpRoot& rRoot ) : XclXFBase( true ), // default is cell XF XclImpRoot( rRoot ), - mpStyleSheet( 0 ), + mpStyleSheet( nullptr ), mnXclNumFmt( 0 ), mnXclFont( 0 ) { @@ -1238,7 +1238,7 @@ const ScPatternAttr& XclImpXF::CreatePattern( bool bSkipPoolDefs ) // create new pattern attribute set mpPattern.reset( new ScPatternAttr( GetDoc().GetPool() ) ); SfxItemSet& rItemSet = mpPattern->GetItemSet(); - XclImpXF* pParentXF = IsCellXF() ? GetXFBuffer().GetXF( mnParent ) : 0; + XclImpXF* pParentXF = IsCellXF() ? GetXFBuffer().GetXF( mnParent ) : nullptr; // parent cell style if( IsCellXF() && !mpStyleSheet ) @@ -1310,8 +1310,8 @@ const ScPatternAttr& XclImpXF::CreatePattern( bool bSkipPoolDefs ) if( mbAlignUsed || mbBorderUsed ) { SvxRotateMode eRotateMode = SVX_ROTATE_MODE_STANDARD; - const XclImpCellAlign* pAlign = mbAlignUsed ? &maAlignment : (pParentXF ? &pParentXF->maAlignment : 0); - const XclImpCellBorder* pBorder = mbBorderUsed ? &maBorder : (pParentXF ? &pParentXF->maBorder : 0); + const XclImpCellAlign* pAlign = mbAlignUsed ? &maAlignment : (pParentXF ? &pParentXF->maAlignment : nullptr); + const XclImpCellBorder* pBorder = mbBorderUsed ? &maBorder : (pParentXF ? &pParentXF->maBorder : nullptr); if( pAlign && pBorder && (0 < pAlign->mnRotation) && (pAlign->mnRotation <= 180) && pBorder->HasAnyOuterBorder() ) eRotateMode = SVX_ROTATE_MODE_BOTTOM; ScfTools::PutItem( rItemSet, SvxRotateModeItem( eRotateMode, ATTR_ROTATE_MODE ), bSkipPoolDefs ); @@ -1466,7 +1466,7 @@ XclImpStyle::XclImpStyle( const XclImpRoot& rRoot ) : mbBuiltin( false ), mbCustom( false ), mbHidden( false ), - mpStyleSheet( 0 ) + mpStyleSheet( nullptr ) { } @@ -1626,7 +1626,7 @@ void XclImpXFBuffer::CreateUserStyles() for( SfxStyleSheetBase* pStyleSheet = aStyleIter.First(); pStyleSheet; pStyleSheet = aStyleIter.Next() ) if( (pStyleSheet->GetName() != aStandardName) && (bReserveAll || !pStyleSheet->IsUserDefined()) ) if( aCellStyles.count( pStyleSheet->GetName() ) == 0 ) - aCellStyles[ pStyleSheet->GetName() ] = 0; + aCellStyles[ pStyleSheet->GetName() ] = nullptr; /* Calculate names of built-in styles. Store styles with reserved names in the aConflictNameStyles list. */ @@ -1678,7 +1678,7 @@ void XclImpXFBuffer::CreateUserStyles() ScStyleSheet* XclImpXFBuffer::CreateStyleSheet( sal_uInt16 nXFIndex ) { XclImpStyleMap::iterator aIt = maStylesByXf.find( nXFIndex ); - return (aIt == maStylesByXf.end()) ? 0 : aIt->second->CreateStyleSheet(); + return (aIt == maStylesByXf.end()) ? nullptr : aIt->second->CreateStyleSheet(); } // Buffer for XF indexes in cells ============================================= @@ -1746,7 +1746,7 @@ void XclImpXFRangeColumn::SetXF( SCROW nScRow, const XclImpXFIndex& rXFIndex ) SCROW nLastScRow = pPrevRange->mnScRow2; sal_uLong nIndex = nNextIndex - 1; XclImpXFRange* pThisRange = pPrevRange; - pPrevRange = (nIndex > 0 && nIndex <= maIndexList.size()) ? &(maIndexList[ nIndex - 1 ]) : 0; + pPrevRange = (nIndex > 0 && nIndex <= maIndexList.size()) ? &(maIndexList[ nIndex - 1 ]) : nullptr; if( nFirstScRow == nLastScRow ) // replace solely XF { @@ -1804,7 +1804,7 @@ void XclImpXFRangeColumn::Find( // test whether list is empty if( maIndexList.empty() ) { - rpPrevRange = rpNextRange = 0; + rpPrevRange = rpNextRange = nullptr; rnNextIndex = 0; return; } @@ -1817,7 +1817,7 @@ void XclImpXFRangeColumn::Find( if( rpNextRange->mnScRow1 <= nScRow ) { rpPrevRange = rpNextRange; - rpNextRange = 0; + rpNextRange = nullptr; rnNextIndex = maIndexList.size(); return; } @@ -1826,7 +1826,7 @@ void XclImpXFRangeColumn::Find( if( nScRow < rpPrevRange->mnScRow1 ) { rpNextRange = rpPrevRange; - rpPrevRange = 0; + rpPrevRange = nullptr; rnNextIndex = 0; return; } @@ -1913,7 +1913,7 @@ void XclImpXFRangeBuffer::SetXF( const ScAddress& rScPos, sal_uInt16 nXFIndex, X if( pXF && ((pXF->GetHorAlign() == EXC_XF_HOR_CENTER_AS) || (pXF->GetHorAlign() == EXC_XF_HOR_FILL)) ) { // expand last merged range if this attribute is set repeatedly - ScRange* pRange = maMergeList.empty() ? NULL : maMergeList.back(); + ScRange* pRange = maMergeList.empty() ? nullptr : maMergeList.back(); if (pRange && (pRange->aEnd.Row() == nScRow) && (pRange->aEnd.Col() + 1 == nScCol) && (eMode == xlXFModeBlank)) pRange->aEnd.IncCol(); else if( eMode != xlXFModeBlank ) // do not merge empty cells diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index 73cf2595675d..bf395ac20425 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -619,28 +619,28 @@ namespace { /** Property names for line style in common objects. */ const sal_Char* const sppcLineNamesCommon[] = - { "LineStyle", "LineWidth", "LineColor", "LineTransparence", "LineDashName", 0 }; + { "LineStyle", "LineWidth", "LineColor", "LineTransparence", "LineDashName", nullptr }; /** Property names for line style in linear series objects. */ const sal_Char* const sppcLineNamesLinear[] = - { "LineStyle", "LineWidth", "Color", "Transparency", "LineDashName", 0 }; + { "LineStyle", "LineWidth", "Color", "Transparency", "LineDashName", nullptr }; /** Property names for line style in filled series objects. */ const sal_Char* const sppcLineNamesFilled[] = - { "BorderStyle", "BorderWidth", "BorderColor", "BorderTransparency", "BorderDashName", 0 }; + { "BorderStyle", "BorderWidth", "BorderColor", "BorderTransparency", "BorderDashName", nullptr }; /** Property names for solid area style in common objects. */ -const sal_Char* const sppcAreaNamesCommon[] = { "FillStyle", "FillColor", "FillTransparence", 0 }; +const sal_Char* const sppcAreaNamesCommon[] = { "FillStyle", "FillColor", "FillTransparence", nullptr }; /** Property names for solid area style in filled series objects. */ -const sal_Char* const sppcAreaNamesFilled[] = { "FillStyle", "Color", "Transparency", 0 }; +const sal_Char* const sppcAreaNamesFilled[] = { "FillStyle", "Color", "Transparency", nullptr }; /** Property names for gradient area style in common objects. */ -const sal_Char* const sppcGradNamesCommon[] = { "FillStyle", "FillGradientName", 0 }; +const sal_Char* const sppcGradNamesCommon[] = { "FillStyle", "FillGradientName", nullptr }; /** Property names for gradient area style in filled series objects. */ -const sal_Char* const sppcGradNamesFilled[] = { "FillStyle", "GradientName", 0 }; +const sal_Char* const sppcGradNamesFilled[] = { "FillStyle", "GradientName", nullptr }; /** Property names for hatch area style in common objects. */ -const sal_Char* const sppcHatchNamesCommon[] = { "FillStyle", "FillHatchName", "FillColor", "FillBackground", 0 }; +const sal_Char* const sppcHatchNamesCommon[] = { "FillStyle", "FillHatchName", "FillColor", "FillBackground", nullptr }; /** Property names for hatch area style in filled series objects. */ -const sal_Char* const sppcHatchNamesFilled[] = { "FillStyle", "HatchName", "Color", "FillBackground", 0 }; +const sal_Char* const sppcHatchNamesFilled[] = { "FillStyle", "HatchName", "Color", "FillBackground", nullptr }; /** Property names for bitmap area style. */ -const sal_Char* const sppcBitmapNames[] = { "FillStyle", "FillBitmapName", "FillBitmapMode", 0 }; +const sal_Char* const sppcBitmapNames[] = { "FillStyle", "FillBitmapName", "FillBitmapMode", nullptr }; } // namespace diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 2248725a031a..b1cd82caf52d 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -77,252 +77,252 @@ const sal_uInt8 MX = 30; /// Maximum parameter count. /** Functions new in BIFF2. */ static const XclFunctionInfo saFuncTable_2[] = { - { ocCount, 0, 0, MX, V, { RX }, 0, 0 }, - { ocIf, 1, 2, 3, R, { VO, RO }, 0, 0 }, - { ocIsNA, 2, 1, 1, V, { VR }, 0, 0 }, - { ocIsError, 3, 1, 1, V, { VR }, 0, 0 }, - { ocSum, 4, 0, MX, V, { RX }, 0, 0 }, - { ocAverage, 5, 1, MX, V, { RX }, 0, 0 }, - { ocMin, 6, 1, MX, V, { RX }, 0, 0 }, - { ocMax, 7, 1, MX, V, { RX }, 0, 0 }, - { ocRow, 8, 0, 1, V, { RO }, 0, 0 }, - { ocColumn, 9, 0, 1, V, { RO }, 0, 0 }, - { ocNotAvail, 10, 0, 0, V, {}, 0, 0 }, - { ocNPV, 11, 2, MX, V, { VR, RX }, 0, 0 }, - { ocStDev, 12, 1, MX, V, { RX }, 0, 0 }, - { ocCurrency, 13, 1, 2, V, { VR }, 0, 0 }, - { ocFixed, 14, 1, 2, V, { VR, VR, C }, 0, 0 }, - { ocSin, 15, 1, 1, V, { VR }, 0, 0 }, - { ocCosecant, 15, 1, 1, V, { VR }, EXC_FUNCFLAG_EXPORTONLY, 0 }, - { ocCos, 16, 1, 1, V, { VR }, 0, 0 }, - { ocSecant, 16, 1, 1, V, { VR }, EXC_FUNCFLAG_EXPORTONLY, 0 }, - { ocTan, 17, 1, 1, V, { VR }, 0, 0 }, - { ocCot, 17, 1, 1, V, { VR }, EXC_FUNCFLAG_EXPORTONLY, 0 }, - { ocArcTan, 18, 1, 1, V, { VR }, 0, 0 }, - { ocArcCot, 18, 1, 1, V, { VR }, EXC_FUNCFLAG_EXPORTONLY, 0 }, - { ocPi, 19, 0, 0, V, {}, 0, 0 }, - { ocSqrt, 20, 1, 1, V, { VR }, 0, 0 }, - { ocExp, 21, 1, 1, V, { VR }, 0, 0 }, - { ocLn, 22, 1, 1, V, { VR }, 0, 0 }, - { ocLog10, 23, 1, 1, V, { VR }, 0, 0 }, - { ocAbs, 24, 1, 1, V, { VR }, 0, 0 }, - { ocInt, 25, 1, 1, V, { VR }, 0, 0 }, - { ocPlusMinus, 26, 1, 1, V, { VR }, 0, 0 }, - { ocRound, 27, 2, 2, V, { VR }, 0, 0 }, - { ocLookup, 28, 2, 3, V, { VR, RA }, 0, 0 }, - { ocIndex, 29, 2, 4, R, { RA, VV }, 0, 0 }, - { ocRept, 30, 2, 2, V, { VR }, 0, 0 }, - { ocMid, 31, 3, 3, V, { VR }, 0, 0 }, - { ocLen, 32, 1, 1, V, { VR }, 0, 0 }, - { ocValue, 33, 1, 1, V, { VR }, 0, 0 }, - { ocTrue, 34, 0, 0, V, {}, 0, 0 }, - { ocFalse, 35, 0, 0, V, {}, 0, 0 }, - { ocAnd, 36, 1, MX, V, { RX }, 0, 0 }, - { ocOr, 37, 1, MX, V, { RX }, 0, 0 }, - { ocNot, 38, 1, 1, V, { VR }, 0, 0 }, - { ocMod, 39, 2, 2, V, { VR }, 0, 0 }, - { ocDBCount, 40, 3, 3, V, { RO, RR }, 0, 0 }, - { ocDBSum, 41, 3, 3, V, { RO, RR }, 0, 0 }, - { ocDBAverage, 42, 3, 3, V, { RO, RR }, 0, 0 }, - { ocDBMin, 43, 3, 3, V, { RO, RR }, 0, 0 }, - { ocDBMax, 44, 3, 3, V, { RO, RR }, 0, 0 }, - { ocDBStdDev, 45, 3, 3, V, { RO, RR }, 0, 0 }, - { ocVar, 46, 1, MX, V, { RX }, 0, 0 }, - { ocDBVar, 47, 3, 3, V, { RO, RR }, 0, 0 }, - { ocText, 48, 2, 2, V, { VR }, 0, 0 }, - { ocLinest, 49, 1, 2, A, { RA, RA, C, C }, 0, 0 }, - { ocTrend, 50, 1, 3, A, { RA, RA, RA, C }, 0, 0 }, - { ocLogest, 51, 1, 2, A, { RA, RA, C, C }, 0, 0 }, - { ocGrowth, 52, 1, 3, A, { RA, RA, RA, C }, 0, 0 }, - { ocPV, 56, 3, 5, V, { VR }, 0, 0 }, - { ocFV, 57, 3, 5, V, { VR }, 0, 0 }, - { ocNper, 58, 3, 5, V, { VR }, 0, 0 }, - { ocPMT, 59, 3, 5, V, { VR }, 0, 0 }, - { ocRate, 60, 3, 6, V, { VR }, 0, 0 }, - { ocMIRR, 61, 3, 3, V, { RA, VR }, 0, 0 }, - { ocIRR, 62, 1, 2, V, { RA, VR }, 0, 0 }, - { ocRandom, 63, 0, 0, V, {}, EXC_FUNCFLAG_VOLATILE, 0 }, - { ocMatch, 64, 2, 3, V, { VR, RX, RR }, 0, 0 }, - { ocGetDate, 65, 3, 3, V, { VR }, 0, 0 }, - { ocGetTime, 66, 3, 3, V, { VR }, 0, 0 }, - { ocGetDay, 67, 1, 1, V, { VR }, 0, 0 }, - { ocGetMonth, 68, 1, 1, V, { VR }, 0, 0 }, - { ocGetYear, 69, 1, 1, V, { VR }, 0, 0 }, - { ocGetDayOfWeek, 70, 1, 1, V, { VR, C }, 0, 0 }, - { ocGetHour, 71, 1, 1, V, { VR }, 0, 0 }, - { ocGetMin, 72, 1, 1, V, { VR }, 0, 0 }, - { ocGetSec, 73, 1, 1, V, { VR }, 0, 0 }, - { ocGetActTime, 74, 0, 0, V, {}, EXC_FUNCFLAG_VOLATILE, 0 }, - { ocAreas, 75, 1, 1, V, { RO }, 0, 0 }, - { ocRows, 76, 1, 1, V, { RO }, 0, 0 }, - { ocColumns, 77, 1, 1, V, { RO }, 0, 0 }, - { ocOffset, 78, 3, 5, R, { RO, VR }, EXC_FUNCFLAG_VOLATILE, 0 }, - { ocSearch, 82, 2, 3, V, { VR }, 0, 0 }, - { ocMatTrans, 83, 1, 1, A, { VO }, 0, 0 }, - { ocType, 86, 1, 1, V, { VX }, 0, 0 }, - { ocArcTan2, 97, 2, 2, V, { VR }, 0, 0 }, - { ocArcSin, 98, 1, 1, V, { VR }, 0, 0 }, - { ocArcCos, 99, 1, 1, V, { VR }, 0, 0 }, - { ocChoose, 100, 2, MX, R, { VO, RO }, 0, 0 }, - { ocHLookup, 101, 3, 3, V, { VV, RO, RO, C }, 0, 0 }, - { ocVLookup, 102, 3, 3, V, { VV, RO, RO, C }, 0, 0 }, - { ocIsRef, 105, 1, 1, V, { RX }, 0, 0 }, - { ocLog, 109, 1, 2, V, { VR }, 0, 0 }, - { ocChar, 111, 1, 1, V, { VR }, 0, 0 }, - { ocLower, 112, 1, 1, V, { VR }, 0, 0 }, - { ocUpper, 113, 1, 1, V, { VR }, 0, 0 }, - { ocProper, 114, 1, 1, V, { VR }, 0, 0 }, - { ocLeft, 115, 1, 2, V, { VR }, 0, 0 }, - { ocRight, 116, 1, 2, V, { VR }, 0, 0 }, - { ocExact, 117, 2, 2, V, { VR }, 0, 0 }, - { ocTrim, 118, 1, 1, V, { VR }, 0, 0 }, - { ocReplace, 119, 4, 4, V, { VR }, 0, 0 }, - { ocSubstitute, 120, 3, 4, V, { VR }, 0, 0 }, - { ocCode, 121, 1, 1, V, { VR }, 0, 0 }, - { ocFind, 124, 2, 3, V, { VR }, 0, 0 }, - { ocCell, 125, 1, 2, V, { VV, RO }, EXC_FUNCFLAG_VOLATILE, 0 }, - { ocIsErr, 126, 1, 1, V, { VR }, 0, 0 }, - { ocIsString, 127, 1, 1, V, { VR }, 0, 0 }, - { ocIsValue, 128, 1, 1, V, { VR }, 0, 0 }, - { ocIsEmpty, 129, 1, 1, V, { VR }, 0, 0 }, - { ocT, 130, 1, 1, V, { RO }, 0, 0 }, - { ocN, 131, 1, 1, V, { RO }, 0, 0 }, - { ocGetDateValue, 140, 1, 1, V, { VR }, 0, 0 }, - { ocGetTimeValue, 141, 1, 1, V, { VR }, 0, 0 }, - { ocSLN, 142, 3, 3, V, { VR }, 0, 0 }, - { ocSYD, 143, 4, 4, V, { VR }, 0, 0 }, - { ocDDB, 144, 4, 5, V, { VR }, 0, 0 }, - { ocIndirect, 148, 1, 2, R, { VR }, EXC_FUNCFLAG_VOLATILE, 0 }, - { ocClean, 162, 1, 1, V, { VR }, 0, 0 }, - { ocMatDet, 163, 1, 1, V, { VA }, 0, 0 }, - { ocMatInv, 164, 1, 1, A, { VA }, 0, 0 }, - { ocMatMult, 165, 2, 2, A, { VA }, 0, 0 }, - { ocIpmt, 167, 4, 6, V, { VR }, 0, 0 }, - { ocPpmt, 168, 4, 6, V, { VR }, 0, 0 }, - { ocCount2, 169, 0, MX, V, { RX }, 0, 0 }, - { ocProduct, 183, 0, MX, V, { RX }, 0, 0 }, - { ocFact, 184, 1, 1, V, { VR }, 0, 0 }, - { ocDBProduct, 189, 3, 3, V, { RO, RR }, 0, 0 }, - { ocIsNonString, 190, 1, 1, V, { VR }, 0, 0 }, - { ocStDevP, 193, 1, MX, V, { RX }, 0, 0 }, - { ocVarP, 194, 1, MX, V, { RX }, 0, 0 }, - { ocDBStdDevP, 195, 3, 3, V, { RO, RR }, 0, 0 }, - { ocDBVarP, 196, 3, 3, V, { RO, RR }, 0, 0 }, - { ocTrunc, 197, 1, 1, V, { VR, C }, 0, 0 }, - { ocIsLogical, 198, 1, 1, V, { VR }, 0, 0 }, - { ocDBCount2, 199, 3, 3, V, { RO, RR }, 0, 0 }, - { ocCurrency, 204, 1, 2, V, { VR }, EXC_FUNCFLAG_IMPORTONLY, 0 }, - { ocLeftB, 208, 1, 2, V, { VR }, 0, 0 }, - { ocRightB, 209, 1, 2, V, { VR }, 0, 0 }, - { ocMidB, 210, 3, 3, V, { VR }, 0, 0 }, - { ocLenB, 211, 1, 1, V, { VR }, 0, 0 }, - { ocRoundUp, 212, 2, 2, V, { VR }, 0, 0 }, - { ocRoundDown, 213, 2, 2, V, { VR }, 0, 0 }, - { ocExternal, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_IMPORTONLY, 0 } + { ocCount, 0, 0, MX, V, { RX }, 0, nullptr }, + { ocIf, 1, 2, 3, R, { VO, RO }, 0, nullptr }, + { ocIsNA, 2, 1, 1, V, { VR }, 0, nullptr }, + { ocIsError, 3, 1, 1, V, { VR }, 0, nullptr }, + { ocSum, 4, 0, MX, V, { RX }, 0, nullptr }, + { ocAverage, 5, 1, MX, V, { RX }, 0, nullptr }, + { ocMin, 6, 1, MX, V, { RX }, 0, nullptr }, + { ocMax, 7, 1, MX, V, { RX }, 0, nullptr }, + { ocRow, 8, 0, 1, V, { RO }, 0, nullptr }, + { ocColumn, 9, 0, 1, V, { RO }, 0, nullptr }, + { ocNotAvail, 10, 0, 0, V, {}, 0, nullptr }, + { ocNPV, 11, 2, MX, V, { VR, RX }, 0, nullptr }, + { ocStDev, 12, 1, MX, V, { RX }, 0, nullptr }, + { ocCurrency, 13, 1, 2, V, { VR }, 0, nullptr }, + { ocFixed, 14, 1, 2, V, { VR, VR, C }, 0, nullptr }, + { ocSin, 15, 1, 1, V, { VR }, 0, nullptr }, + { ocCosecant, 15, 1, 1, V, { VR }, EXC_FUNCFLAG_EXPORTONLY, nullptr }, + { ocCos, 16, 1, 1, V, { VR }, 0, nullptr }, + { ocSecant, 16, 1, 1, V, { VR }, EXC_FUNCFLAG_EXPORTONLY, nullptr }, + { ocTan, 17, 1, 1, V, { VR }, 0, nullptr }, + { ocCot, 17, 1, 1, V, { VR }, EXC_FUNCFLAG_EXPORTONLY, nullptr }, + { ocArcTan, 18, 1, 1, V, { VR }, 0, nullptr }, + { ocArcCot, 18, 1, 1, V, { VR }, EXC_FUNCFLAG_EXPORTONLY, nullptr }, + { ocPi, 19, 0, 0, V, {}, 0, nullptr }, + { ocSqrt, 20, 1, 1, V, { VR }, 0, nullptr }, + { ocExp, 21, 1, 1, V, { VR }, 0, nullptr }, + { ocLn, 22, 1, 1, V, { VR }, 0, nullptr }, + { ocLog10, 23, 1, 1, V, { VR }, 0, nullptr }, + { ocAbs, 24, 1, 1, V, { VR }, 0, nullptr }, + { ocInt, 25, 1, 1, V, { VR }, 0, nullptr }, + { ocPlusMinus, 26, 1, 1, V, { VR }, 0, nullptr }, + { ocRound, 27, 2, 2, V, { VR }, 0, nullptr }, + { ocLookup, 28, 2, 3, V, { VR, RA }, 0, nullptr }, + { ocIndex, 29, 2, 4, R, { RA, VV }, 0, nullptr }, + { ocRept, 30, 2, 2, V, { VR }, 0, nullptr }, + { ocMid, 31, 3, 3, V, { VR }, 0, nullptr }, + { ocLen, 32, 1, 1, V, { VR }, 0, nullptr }, + { ocValue, 33, 1, 1, V, { VR }, 0, nullptr }, + { ocTrue, 34, 0, 0, V, {}, 0, nullptr }, + { ocFalse, 35, 0, 0, V, {}, 0, nullptr }, + { ocAnd, 36, 1, MX, V, { RX }, 0, nullptr }, + { ocOr, 37, 1, MX, V, { RX }, 0, nullptr }, + { ocNot, 38, 1, 1, V, { VR }, 0, nullptr }, + { ocMod, 39, 2, 2, V, { VR }, 0, nullptr }, + { ocDBCount, 40, 3, 3, V, { RO, RR }, 0, nullptr }, + { ocDBSum, 41, 3, 3, V, { RO, RR }, 0, nullptr }, + { ocDBAverage, 42, 3, 3, V, { RO, RR }, 0, nullptr }, + { ocDBMin, 43, 3, 3, V, { RO, RR }, 0, nullptr }, + { ocDBMax, 44, 3, 3, V, { RO, RR }, 0, nullptr }, + { ocDBStdDev, 45, 3, 3, V, { RO, RR }, 0, nullptr }, + { ocVar, 46, 1, MX, V, { RX }, 0, nullptr }, + { ocDBVar, 47, 3, 3, V, { RO, RR }, 0, nullptr }, + { ocText, 48, 2, 2, V, { VR }, 0, nullptr }, + { ocLinest, 49, 1, 2, A, { RA, RA, C, C }, 0, nullptr }, + { ocTrend, 50, 1, 3, A, { RA, RA, RA, C }, 0, nullptr }, + { ocLogest, 51, 1, 2, A, { RA, RA, C, C }, 0, nullptr }, + { ocGrowth, 52, 1, 3, A, { RA, RA, RA, C }, 0, nullptr }, + { ocPV, 56, 3, 5, V, { VR }, 0, nullptr }, + { ocFV, 57, 3, 5, V, { VR }, 0, nullptr }, + { ocNper, 58, 3, 5, V, { VR }, 0, nullptr }, + { ocPMT, 59, 3, 5, V, { VR }, 0, nullptr }, + { ocRate, 60, 3, 6, V, { VR }, 0, nullptr }, + { ocMIRR, 61, 3, 3, V, { RA, VR }, 0, nullptr }, + { ocIRR, 62, 1, 2, V, { RA, VR }, 0, nullptr }, + { ocRandom, 63, 0, 0, V, {}, EXC_FUNCFLAG_VOLATILE, nullptr }, + { ocMatch, 64, 2, 3, V, { VR, RX, RR }, 0, nullptr }, + { ocGetDate, 65, 3, 3, V, { VR }, 0, nullptr }, + { ocGetTime, 66, 3, 3, V, { VR }, 0, nullptr }, + { ocGetDay, 67, 1, 1, V, { VR }, 0, nullptr }, + { ocGetMonth, 68, 1, 1, V, { VR }, 0, nullptr }, + { ocGetYear, 69, 1, 1, V, { VR }, 0, nullptr }, + { ocGetDayOfWeek, 70, 1, 1, V, { VR, C }, 0, nullptr }, + { ocGetHour, 71, 1, 1, V, { VR }, 0, nullptr }, + { ocGetMin, 72, 1, 1, V, { VR }, 0, nullptr }, + { ocGetSec, 73, 1, 1, V, { VR }, 0, nullptr }, + { ocGetActTime, 74, 0, 0, V, {}, EXC_FUNCFLAG_VOLATILE, nullptr }, + { ocAreas, 75, 1, 1, V, { RO }, 0, nullptr }, + { ocRows, 76, 1, 1, V, { RO }, 0, nullptr }, + { ocColumns, 77, 1, 1, V, { RO }, 0, nullptr }, + { ocOffset, 78, 3, 5, R, { RO, VR }, EXC_FUNCFLAG_VOLATILE, nullptr }, + { ocSearch, 82, 2, 3, V, { VR }, 0, nullptr }, + { ocMatTrans, 83, 1, 1, A, { VO }, 0, nullptr }, + { ocType, 86, 1, 1, V, { VX }, 0, nullptr }, + { ocArcTan2, 97, 2, 2, V, { VR }, 0, nullptr }, + { ocArcSin, 98, 1, 1, V, { VR }, 0, nullptr }, + { ocArcCos, 99, 1, 1, V, { VR }, 0, nullptr }, + { ocChoose, 100, 2, MX, R, { VO, RO }, 0, nullptr }, + { ocHLookup, 101, 3, 3, V, { VV, RO, RO, C }, 0, nullptr }, + { ocVLookup, 102, 3, 3, V, { VV, RO, RO, C }, 0, nullptr }, + { ocIsRef, 105, 1, 1, V, { RX }, 0, nullptr }, + { ocLog, 109, 1, 2, V, { VR }, 0, nullptr }, + { ocChar, 111, 1, 1, V, { VR }, 0, nullptr }, + { ocLower, 112, 1, 1, V, { VR }, 0, nullptr }, + { ocUpper, 113, 1, 1, V, { VR }, 0, nullptr }, + { ocProper, 114, 1, 1, V, { VR }, 0, nullptr }, + { ocLeft, 115, 1, 2, V, { VR }, 0, nullptr }, + { ocRight, 116, 1, 2, V, { VR }, 0, nullptr }, + { ocExact, 117, 2, 2, V, { VR }, 0, nullptr }, + { ocTrim, 118, 1, 1, V, { VR }, 0, nullptr }, + { ocReplace, 119, 4, 4, V, { VR }, 0, nullptr }, + { ocSubstitute, 120, 3, 4, V, { VR }, 0, nullptr }, + { ocCode, 121, 1, 1, V, { VR }, 0, nullptr }, + { ocFind, 124, 2, 3, V, { VR }, 0, nullptr }, + { ocCell, 125, 1, 2, V, { VV, RO }, EXC_FUNCFLAG_VOLATILE, nullptr }, + { ocIsErr, 126, 1, 1, V, { VR }, 0, nullptr }, + { ocIsString, 127, 1, 1, V, { VR }, 0, nullptr }, + { ocIsValue, 128, 1, 1, V, { VR }, 0, nullptr }, + { ocIsEmpty, 129, 1, 1, V, { VR }, 0, nullptr }, + { ocT, 130, 1, 1, V, { RO }, 0, nullptr }, + { ocN, 131, 1, 1, V, { RO }, 0, nullptr }, + { ocGetDateValue, 140, 1, 1, V, { VR }, 0, nullptr }, + { ocGetTimeValue, 141, 1, 1, V, { VR }, 0, nullptr }, + { ocSLN, 142, 3, 3, V, { VR }, 0, nullptr }, + { ocSYD, 143, 4, 4, V, { VR }, 0, nullptr }, + { ocDDB, 144, 4, 5, V, { VR }, 0, nullptr }, + { ocIndirect, 148, 1, 2, R, { VR }, EXC_FUNCFLAG_VOLATILE, nullptr }, + { ocClean, 162, 1, 1, V, { VR }, 0, nullptr }, + { ocMatDet, 163, 1, 1, V, { VA }, 0, nullptr }, + { ocMatInv, 164, 1, 1, A, { VA }, 0, nullptr }, + { ocMatMult, 165, 2, 2, A, { VA }, 0, nullptr }, + { ocIpmt, 167, 4, 6, V, { VR }, 0, nullptr }, + { ocPpmt, 168, 4, 6, V, { VR }, 0, nullptr }, + { ocCount2, 169, 0, MX, V, { RX }, 0, nullptr }, + { ocProduct, 183, 0, MX, V, { RX }, 0, nullptr }, + { ocFact, 184, 1, 1, V, { VR }, 0, nullptr }, + { ocDBProduct, 189, 3, 3, V, { RO, RR }, 0, nullptr }, + { ocIsNonString, 190, 1, 1, V, { VR }, 0, nullptr }, + { ocStDevP, 193, 1, MX, V, { RX }, 0, nullptr }, + { ocVarP, 194, 1, MX, V, { RX }, 0, nullptr }, + { ocDBStdDevP, 195, 3, 3, V, { RO, RR }, 0, nullptr }, + { ocDBVarP, 196, 3, 3, V, { RO, RR }, 0, nullptr }, + { ocTrunc, 197, 1, 1, V, { VR, C }, 0, nullptr }, + { ocIsLogical, 198, 1, 1, V, { VR }, 0, nullptr }, + { ocDBCount2, 199, 3, 3, V, { RO, RR }, 0, nullptr }, + { ocCurrency, 204, 1, 2, V, { VR }, EXC_FUNCFLAG_IMPORTONLY, nullptr }, + { ocLeftB, 208, 1, 2, V, { VR }, 0, nullptr }, + { ocRightB, 209, 1, 2, V, { VR }, 0, nullptr }, + { ocMidB, 210, 3, 3, V, { VR }, 0, nullptr }, + { ocLenB, 211, 1, 1, V, { VR }, 0, nullptr }, + { ocRoundUp, 212, 2, 2, V, { VR }, 0, nullptr }, + { ocRoundDown, 213, 2, 2, V, { VR }, 0, nullptr }, + { ocExternal, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_IMPORTONLY, nullptr } }; /** Functions new in BIFF3. */ static const XclFunctionInfo saFuncTable_3[] = { - { ocLinest, 49, 1, 4, A, { RA, RA, VV }, 0, 0 }, // BIFF2: 1-2, BIFF3: 1-4 - { ocTrend, 50, 1, 4, A, { RA, RA, RA, VV }, 0, 0 }, // BIFF2: 1-3, BIFF3: 1-4 - { ocLogest, 51, 1, 4, A, { RA, RA, VV }, 0, 0 }, // BIFF2: 1-2, BIFF3: 1-4 - { ocGrowth, 52, 1, 4, A, { RA, RA, RA, VV }, 0, 0 }, // BIFF2: 1-3, BIFF3: 1-4 - { ocTrunc, 197, 1, 2, V, { VR }, 0, 0 }, // BIFF2: 1, BIFF3: 1-2 - { ocAddress, 219, 2, 5, V, { VR }, 0, 0 }, - { ocGetDiffDate360, 220, 2, 2, V, { VR, VR, C }, 0, 0 }, - { ocGetActDate, 221, 0, 0, V, {}, EXC_FUNCFLAG_VOLATILE, 0 }, - { ocVBD, 222, 5, 7, V, { VR }, 0, 0 }, - { ocMedian, 227, 1, MX, V, { RX }, 0, 0 }, - { ocSumProduct, 228, 1, MX, V, { VA }, 0, 0 }, - { ocSinHyp, 229, 1, 1, V, { VR }, 0, 0 }, - { ocCosecantHyp, 229, 1, 1, V, { VR }, EXC_FUNCFLAG_EXPORTONLY, 0 }, - { ocCosHyp, 230, 1, 1, V, { VR }, 0, 0 }, - { ocSecantHyp, 230, 1, 1, V, { VR }, EXC_FUNCFLAG_EXPORTONLY, 0 }, - { ocTanHyp, 231, 1, 1, V, { VR }, 0, 0 }, - { ocCotHyp, 231, 1, 1, V, { VR }, EXC_FUNCFLAG_EXPORTONLY, 0 }, - { ocArcSinHyp, 232, 1, 1, V, { VR }, 0, 0 }, - { ocArcCosHyp, 233, 1, 1, V, { VR }, 0, 0 }, - { ocArcTanHyp, 234, 1, 1, V, { VR }, 0, 0 }, - { ocArcCotHyp, 234, 1, 1, V, { VR }, EXC_FUNCFLAG_EXPORTONLY, 0 }, - { ocDBGet, 235, 3, 3, V, { RO, RR }, 0, 0 }, - { ocInfo, 244, 1, 1, V, { VR }, EXC_FUNCFLAG_VOLATILE, 0 } + { ocLinest, 49, 1, 4, A, { RA, RA, VV }, 0, nullptr }, // BIFF2: 1-2, BIFF3: 1-4 + { ocTrend, 50, 1, 4, A, { RA, RA, RA, VV }, 0, nullptr }, // BIFF2: 1-3, BIFF3: 1-4 + { ocLogest, 51, 1, 4, A, { RA, RA, VV }, 0, nullptr }, // BIFF2: 1-2, BIFF3: 1-4 + { ocGrowth, 52, 1, 4, A, { RA, RA, RA, VV }, 0, nullptr }, // BIFF2: 1-3, BIFF3: 1-4 + { ocTrunc, 197, 1, 2, V, { VR }, 0, nullptr }, // BIFF2: 1, BIFF3: 1-2 + { ocAddress, 219, 2, 5, V, { VR }, 0, nullptr }, + { ocGetDiffDate360, 220, 2, 2, V, { VR, VR, C }, 0, nullptr }, + { ocGetActDate, 221, 0, 0, V, {}, EXC_FUNCFLAG_VOLATILE, nullptr }, + { ocVBD, 222, 5, 7, V, { VR }, 0, nullptr }, + { ocMedian, 227, 1, MX, V, { RX }, 0, nullptr }, + { ocSumProduct, 228, 1, MX, V, { VA }, 0, nullptr }, + { ocSinHyp, 229, 1, 1, V, { VR }, 0, nullptr }, + { ocCosecantHyp, 229, 1, 1, V, { VR }, EXC_FUNCFLAG_EXPORTONLY, nullptr }, + { ocCosHyp, 230, 1, 1, V, { VR }, 0, nullptr }, + { ocSecantHyp, 230, 1, 1, V, { VR }, EXC_FUNCFLAG_EXPORTONLY, nullptr }, + { ocTanHyp, 231, 1, 1, V, { VR }, 0, nullptr }, + { ocCotHyp, 231, 1, 1, V, { VR }, EXC_FUNCFLAG_EXPORTONLY, nullptr }, + { ocArcSinHyp, 232, 1, 1, V, { VR }, 0, nullptr }, + { ocArcCosHyp, 233, 1, 1, V, { VR }, 0, nullptr }, + { ocArcTanHyp, 234, 1, 1, V, { VR }, 0, nullptr }, + { ocArcCotHyp, 234, 1, 1, V, { VR }, EXC_FUNCFLAG_EXPORTONLY, nullptr }, + { ocDBGet, 235, 3, 3, V, { RO, RR }, 0, nullptr }, + { ocInfo, 244, 1, 1, V, { VR }, EXC_FUNCFLAG_VOLATILE, nullptr } }; /** Functions new in BIFF4. */ static const XclFunctionInfo saFuncTable_4[] = { - { ocFixed, 14, 1, 3, V, { VR }, 0, 0 }, // BIFF2-3: 1-2, BIFF4: 1-3 - { ocAsc, 214, 1, 1, V, { VR }, 0, 0 }, - { ocJis, 215, 1, 1, V, { VR }, 0, 0 }, - { ocRank, 216, 2, 3, V, { VR, RO, VR }, 0, 0 }, - { ocDB, 247, 4, 5, V, { VR }, 0, 0 }, - { ocFrequency, 252, 2, 2, A, { RA }, 0, 0 }, - { ocErrorType, 261, 1, 1, V, { VR }, 0, 0 }, - { ocAveDev, 269, 1, MX, V, { RX }, 0, 0 }, - { ocBetaDist, 270, 3, 5, V, { VR }, 0, 0 }, - { ocGammaLn, 271, 1, 1, V, { VR }, 0, 0 }, - { ocBetaInv, 272, 3, 5, V, { VR }, 0, 0 }, - { ocBinomDist, 273, 4, 4, V, { VR }, 0, 0 }, - { ocChiDist, 274, 2, 2, V, { VR }, 0, 0 }, - { ocChiInv, 275, 2, 2, V, { VR }, 0, 0 }, - { ocCombin, 276, 2, 2, V, { VR }, 0, 0 }, - { ocConfidence, 277, 3, 3, V, { VR }, 0, 0 }, - { ocCritBinom, 278, 3, 3, V, { VR }, 0, 0 }, - { ocEven, 279, 1, 1, V, { VR }, 0, 0 }, - { ocExpDist, 280, 3, 3, V, { VR }, 0, 0 }, - { ocFDist, 281, 3, 3, V, { VR }, 0, 0 }, - { ocFInv, 282, 3, 3, V, { VR }, 0, 0 }, - { ocFisher, 283, 1, 1, V, { VR }, 0, 0 }, - { ocFisherInv, 284, 1, 1, V, { VR }, 0, 0 }, - { ocFloor_MS, 285, 2, 2, V, { VR }, 0, 0 }, - { ocGammaDist, 286, 4, 4, V, { VR }, 0, 0 }, - { ocGammaInv, 287, 3, 3, V, { VR }, 0, 0 }, - { ocCeil_MS, 288, 2, 2, V, { VR }, 0, 0 }, - { ocHypGeomDist, 289, 4, 4, V, { VR }, 0, 0 }, - { ocLogNormDist, 290, 3, 3, V, { VR }, 0, 0 }, - { ocLogInv, 291, 3, 3, V, { VR }, 0, 0 }, - { ocNegBinomVert, 292, 3, 3, V, { VR }, 0, 0 }, - { ocNormDist, 293, 4, 4, V, { VR }, 0, 0 }, - { ocStdNormDist, 294, 1, 1, V, { VR }, 0, 0 }, - { ocNormInv, 295, 3, 3, V, { VR }, 0, 0 }, - { ocSNormInv, 296, 1, 1, V, { VR }, 0, 0 }, - { ocStandard, 297, 3, 3, V, { VR }, 0, 0 }, - { ocOdd, 298, 1, 1, V, { VR }, 0, 0 }, - { ocPermut, 299, 2, 2, V, { VR }, 0, 0 }, - { ocPoissonDist, 300, 3, 3, V, { VR }, 0, 0 }, - { ocTDist, 301, 3, 3, V, { VR }, 0, 0 }, - { ocWeibull, 302, 4, 4, V, { VR }, 0, 0 }, - { ocSumXMY2, 303, 2, 2, V, { VA }, 0, 0 }, - { ocSumX2MY2, 304, 2, 2, V, { VA }, 0, 0 }, - { ocSumX2DY2, 305, 2, 2, V, { VA }, 0, 0 }, - { ocChiTest, 306, 2, 2, V, { VA }, 0, 0 }, - { ocCorrel, 307, 2, 2, V, { VA }, 0, 0 }, - { ocCovar, 308, 2, 2, V, { VA }, 0, 0 }, - { ocForecast, 309, 3, 3, V, { VR, VA }, 0, 0 }, - { ocFTest, 310, 2, 2, V, { VA }, 0, 0 }, - { ocIntercept, 311, 2, 2, V, { VA }, 0, 0 }, - { ocPearson, 312, 2, 2, V, { VA }, 0, 0 }, - { ocRSQ, 313, 2, 2, V, { VA }, 0, 0 }, - { ocSTEYX, 314, 2, 2, V, { VA }, 0, 0 }, - { ocSlope, 315, 2, 2, V, { VA }, 0, 0 }, - { ocTTest, 316, 4, 4, V, { VA, VA, VR }, 0, 0 }, - { ocProb, 317, 3, 4, V, { VA, VA, VR }, 0, 0 }, - { ocDevSq, 318, 1, MX, V, { RX }, 0, 0 }, - { ocGeoMean, 319, 1, MX, V, { RX }, 0, 0 }, - { ocHarMean, 320, 1, MX, V, { RX }, 0, 0 }, - { ocSumSQ, 321, 0, MX, V, { RX }, 0, 0 }, - { ocKurt, 322, 1, MX, V, { RX }, 0, 0 }, - { ocSkew, 323, 1, MX, V, { RX }, 0, 0 }, - { ocZTest, 324, 2, 3, V, { RX, VR }, 0, 0 }, - { ocLarge, 325, 2, 2, V, { RX, VR }, 0, 0 }, - { ocSmall, 326, 2, 2, V, { RX, VR }, 0, 0 }, - { ocQuartile, 327, 2, 2, V, { RX, VR }, 0, 0 }, - { ocPercentile, 328, 2, 2, V, { RX, VR }, 0, 0 }, - { ocPercentrank, 329, 2, 3, V, { RX, VR, VR_E }, 0, 0 }, - { ocModalValue, 330, 1, MX, V, { VA }, 0, 0 }, - { ocTrimMean, 331, 2, 2, V, { RX, VR }, 0, 0 }, - { ocTInv, 332, 2, 2, V, { VR }, 0, 0 }, + { ocFixed, 14, 1, 3, V, { VR }, 0, nullptr }, // BIFF2-3: 1-2, BIFF4: 1-3 + { ocAsc, 214, 1, 1, V, { VR }, 0, nullptr }, + { ocJis, 215, 1, 1, V, { VR }, 0, nullptr }, + { ocRank, 216, 2, 3, V, { VR, RO, VR }, 0, nullptr }, + { ocDB, 247, 4, 5, V, { VR }, 0, nullptr }, + { ocFrequency, 252, 2, 2, A, { RA }, 0, nullptr }, + { ocErrorType, 261, 1, 1, V, { VR }, 0, nullptr }, + { ocAveDev, 269, 1, MX, V, { RX }, 0, nullptr }, + { ocBetaDist, 270, 3, 5, V, { VR }, 0, nullptr }, + { ocGammaLn, 271, 1, 1, V, { VR }, 0, nullptr }, + { ocBetaInv, 272, 3, 5, V, { VR }, 0, nullptr }, + { ocBinomDist, 273, 4, 4, V, { VR }, 0, nullptr }, + { ocChiDist, 274, 2, 2, V, { VR }, 0, nullptr }, + { ocChiInv, 275, 2, 2, V, { VR }, 0, nullptr }, + { ocCombin, 276, 2, 2, V, { VR }, 0, nullptr }, + { ocConfidence, 277, 3, 3, V, { VR }, 0, nullptr }, + { ocCritBinom, 278, 3, 3, V, { VR }, 0, nullptr }, + { ocEven, 279, 1, 1, V, { VR }, 0, nullptr }, + { ocExpDist, 280, 3, 3, V, { VR }, 0, nullptr }, + { ocFDist, 281, 3, 3, V, { VR }, 0, nullptr }, + { ocFInv, 282, 3, 3, V, { VR }, 0, nullptr }, + { ocFisher, 283, 1, 1, V, { VR }, 0, nullptr }, + { ocFisherInv, 284, 1, 1, V, { VR }, 0, nullptr }, + { ocFloor_MS, 285, 2, 2, V, { VR }, 0, nullptr }, + { ocGammaDist, 286, 4, 4, V, { VR }, 0, nullptr }, + { ocGammaInv, 287, 3, 3, V, { VR }, 0, nullptr }, + { ocCeil_MS, 288, 2, 2, V, { VR }, 0, nullptr }, + { ocHypGeomDist, 289, 4, 4, V, { VR }, 0, nullptr }, + { ocLogNormDist, 290, 3, 3, V, { VR }, 0, nullptr }, + { ocLogInv, 291, 3, 3, V, { VR }, 0, nullptr }, + { ocNegBinomVert, 292, 3, 3, V, { VR }, 0, nullptr }, + { ocNormDist, 293, 4, 4, V, { VR }, 0, nullptr }, + { ocStdNormDist, 294, 1, 1, V, { VR }, 0, nullptr }, + { ocNormInv, 295, 3, 3, V, { VR }, 0, nullptr }, + { ocSNormInv, 296, 1, 1, V, { VR }, 0, nullptr }, + { ocStandard, 297, 3, 3, V, { VR }, 0, nullptr }, + { ocOdd, 298, 1, 1, V, { VR }, 0, nullptr }, + { ocPermut, 299, 2, 2, V, { VR }, 0, nullptr }, + { ocPoissonDist, 300, 3, 3, V, { VR }, 0, nullptr }, + { ocTDist, 301, 3, 3, V, { VR }, 0, nullptr }, + { ocWeibull, 302, 4, 4, V, { VR }, 0, nullptr }, + { ocSumXMY2, 303, 2, 2, V, { VA }, 0, nullptr }, + { ocSumX2MY2, 304, 2, 2, V, { VA }, 0, nullptr }, + { ocSumX2DY2, 305, 2, 2, V, { VA }, 0, nullptr }, + { ocChiTest, 306, 2, 2, V, { VA }, 0, nullptr }, + { ocCorrel, 307, 2, 2, V, { VA }, 0, nullptr }, + { ocCovar, 308, 2, 2, V, { VA }, 0, nullptr }, + { ocForecast, 309, 3, 3, V, { VR, VA }, 0, nullptr }, + { ocFTest, 310, 2, 2, V, { VA }, 0, nullptr }, + { ocIntercept, 311, 2, 2, V, { VA }, 0, nullptr }, + { ocPearson, 312, 2, 2, V, { VA }, 0, nullptr }, + { ocRSQ, 313, 2, 2, V, { VA }, 0, nullptr }, + { ocSTEYX, 314, 2, 2, V, { VA }, 0, nullptr }, + { ocSlope, 315, 2, 2, V, { VA }, 0, nullptr }, + { ocTTest, 316, 4, 4, V, { VA, VA, VR }, 0, nullptr }, + { ocProb, 317, 3, 4, V, { VA, VA, VR }, 0, nullptr }, + { ocDevSq, 318, 1, MX, V, { RX }, 0, nullptr }, + { ocGeoMean, 319, 1, MX, V, { RX }, 0, nullptr }, + { ocHarMean, 320, 1, MX, V, { RX }, 0, nullptr }, + { ocSumSQ, 321, 0, MX, V, { RX }, 0, nullptr }, + { ocKurt, 322, 1, MX, V, { RX }, 0, nullptr }, + { ocSkew, 323, 1, MX, V, { RX }, 0, nullptr }, + { ocZTest, 324, 2, 3, V, { RX, VR }, 0, nullptr }, + { ocLarge, 325, 2, 2, V, { RX, VR }, 0, nullptr }, + { ocSmall, 326, 2, 2, V, { RX, VR }, 0, nullptr }, + { ocQuartile, 327, 2, 2, V, { RX, VR }, 0, nullptr }, + { ocPercentile, 328, 2, 2, V, { RX, VR }, 0, nullptr }, + { ocPercentrank, 329, 2, 3, V, { RX, VR, VR_E }, 0, nullptr }, + { ocModalValue, 330, 1, MX, V, { VA }, 0, nullptr }, + { ocTrimMean, 331, 2, 2, V, { RX, VR }, 0, nullptr }, + { ocTInv, 332, 2, 2, V, { VR }, 0, nullptr }, // Functions equivalent to add-in functions, use same parameters as // ocExternal but add programmatical function name (here without // "com.sun.star.sheet.addin.") so it can be looked up and stored as @@ -341,40 +341,40 @@ static const XclFunctionInfo saFuncTable_4[] = /** Functions new in BIFF5/BIFF7. Unsupported functions: DATESTRING, NUMBERSTRING. */ static const XclFunctionInfo saFuncTable_5[] = { - { ocGetDayOfWeek, 70, 1, 2, V, { VR }, 0, 0 }, // BIFF2-4: 1, BIFF5: 1-2 - { ocHLookup, 101, 3, 4, V, { VV, RO, RO, VV }, 0, 0 }, // BIFF2-4: 3, BIFF5: 3-4 - { ocVLookup, 102, 3, 4, V, { VV, RO, RO, VV }, 0, 0 }, // BIFF2-4: 3, BIFF5: 3-4 - { ocGetDiffDate360, 220, 2, 3, V, { VR }, 0, 0 }, // BIFF3-4: 2, BIFF5: 2-3 - { ocMacro, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY, 0 }, - { ocExternal, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY, 0 }, - { ocConcat, 336, 0, MX, V, { VR }, 0, 0 }, - { ocPower, 337, 2, 2, V, { VR }, 0, 0 }, - { ocRad, 342, 1, 1, V, { VR }, 0, 0 }, - { ocDeg, 343, 1, 1, V, { VR }, 0, 0 }, - { ocSubTotal, 344, 2, MX, V, { VR, RO }, 0, 0 }, - { ocSumIf, 345, 2, 3, V, { RO, VR, RO }, 0, 0 }, - { ocCountIf, 346, 2, 2, V, { RO, VR }, 0, 0 }, - { ocCountEmptyCells, 347, 1, 1, V, { RO }, 0, 0 }, - { ocISPMT, 350, 4, 4, V, { VR }, 0, 0 }, - { ocGetDateDif, 351, 3, 3, V, { VR }, 0, 0 }, - { ocNoName, 352, 1, 1, V, { VR }, EXC_FUNCFLAG_IMPORTONLY, 0 }, // DATESTRING - { ocNoName, 353, 2, 2, V, { VR }, EXC_FUNCFLAG_IMPORTONLY, 0 }, // NUMBERSTRING - { ocRoman, 354, 1, 2, V, { VR }, 0, 0 } + { ocGetDayOfWeek, 70, 1, 2, V, { VR }, 0, nullptr }, // BIFF2-4: 1, BIFF5: 1-2 + { ocHLookup, 101, 3, 4, V, { VV, RO, RO, VV }, 0, nullptr }, // BIFF2-4: 3, BIFF5: 3-4 + { ocVLookup, 102, 3, 4, V, { VV, RO, RO, VV }, 0, nullptr }, // BIFF2-4: 3, BIFF5: 3-4 + { ocGetDiffDate360, 220, 2, 3, V, { VR }, 0, nullptr }, // BIFF3-4: 2, BIFF5: 2-3 + { ocMacro, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY, nullptr }, + { ocExternal, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY, nullptr }, + { ocConcat, 336, 0, MX, V, { VR }, 0, nullptr }, + { ocPower, 337, 2, 2, V, { VR }, 0, nullptr }, + { ocRad, 342, 1, 1, V, { VR }, 0, nullptr }, + { ocDeg, 343, 1, 1, V, { VR }, 0, nullptr }, + { ocSubTotal, 344, 2, MX, V, { VR, RO }, 0, nullptr }, + { ocSumIf, 345, 2, 3, V, { RO, VR, RO }, 0, nullptr }, + { ocCountIf, 346, 2, 2, V, { RO, VR }, 0, nullptr }, + { ocCountEmptyCells, 347, 1, 1, V, { RO }, 0, nullptr }, + { ocISPMT, 350, 4, 4, V, { VR }, 0, nullptr }, + { ocGetDateDif, 351, 3, 3, V, { VR }, 0, nullptr }, + { ocNoName, 352, 1, 1, V, { VR }, EXC_FUNCFLAG_IMPORTONLY, nullptr }, // DATESTRING + { ocNoName, 353, 2, 2, V, { VR }, EXC_FUNCFLAG_IMPORTONLY, nullptr }, // NUMBERSTRING + { ocRoman, 354, 1, 2, V, { VR }, 0, nullptr } }; /** Functions new in BIFF8. Unsupported functions: PHONETIC. */ static const XclFunctionInfo saFuncTable_8[] = { - { ocGetPivotData, 358, 2, MX, V, { RR, RR, VR }, 0, 0 }, - { ocHyperLink, 359, 1, 2, V, { VV, VO }, 0, 0 }, - { ocNoName, 360, 1, 1, V, { RO }, EXC_FUNCFLAG_IMPORTONLY, 0 }, // PHONETIC - { ocAverageA, 361, 1, MX, V, { RX }, 0, 0 }, - { ocMaxA, 362, 1, MX, V, { RX }, 0, 0 }, - { ocMinA, 363, 1, MX, V, { RX }, 0, 0 }, - { ocStDevPA, 364, 1, MX, V, { RX }, 0, 0 }, - { ocVarPA, 365, 1, MX, V, { RX }, 0, 0 }, - { ocStDevA, 366, 1, MX, V, { RX }, 0, 0 }, - { ocVarA, 367, 1, MX, V, { RX }, 0, 0 }, + { ocGetPivotData, 358, 2, MX, V, { RR, RR, VR }, 0, nullptr }, + { ocHyperLink, 359, 1, 2, V, { VV, VO }, 0, nullptr }, + { ocNoName, 360, 1, 1, V, { RO }, EXC_FUNCFLAG_IMPORTONLY, nullptr }, // PHONETIC + { ocAverageA, 361, 1, MX, V, { RX }, 0, nullptr }, + { ocMaxA, 362, 1, MX, V, { RX }, 0, nullptr }, + { ocMinA, 363, 1, MX, V, { RX }, 0, nullptr }, + { ocStDevPA, 364, 1, MX, V, { RX }, 0, nullptr }, + { ocVarPA, 365, 1, MX, V, { RX }, 0, nullptr }, + { ocStDevA, 366, 1, MX, V, { RX }, 0, nullptr }, + { ocVarA, 367, 1, MX, V, { RX }, 0, nullptr }, { ocBahtText, 368, 1, 1, V, { VR }, EXC_FUNCFLAG_IMPORTONLY, EXC_FUNCNAME( "BAHTTEXT" ) }, { ocBahtText, 255, 2, 2, V, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY, EXC_FUNCNAME( "BAHTTEXT" ) }, { ocEuroConvert, 255, 4, 6, V, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY, "EUROCONVERT" } @@ -622,7 +622,7 @@ const XclFunctionInfo* XclFunctionProvider::GetFuncInfoFromXclFunc( sal_uInt16 n // only in import filter allowed OSL_ENSURE( !maXclFuncMap.empty(), "XclFunctionProvider::GetFuncInfoFromXclFunc - wrong filter" ); XclFuncMap::const_iterator aIt = maXclFuncMap.find( nXclFunc ); - return (aIt == maXclFuncMap.end()) ? 0 : aIt->second; + return (aIt == maXclFuncMap.end()) ? nullptr : aIt->second; } const XclFunctionInfo* XclFunctionProvider::GetFuncInfoFromXclMacroName( const OUString& rXclMacroName ) const @@ -630,7 +630,7 @@ const XclFunctionInfo* XclFunctionProvider::GetFuncInfoFromXclMacroName( const O // only in import filter allowed, but do not test maXclMacroNameMap, it may be empty for old BIFF versions OSL_ENSURE( !maXclFuncMap.empty(), "XclFunctionProvider::GetFuncInfoFromXclMacroName - wrong filter" ); XclMacroNameMap::const_iterator aIt = maXclMacroNameMap.find( rXclMacroName ); - return (aIt == maXclMacroNameMap.end()) ? 0 : aIt->second; + return (aIt == maXclMacroNameMap.end()) ? nullptr : aIt->second; } const XclFunctionInfo* XclFunctionProvider::GetFuncInfoFromOpCode( OpCode eOpCode ) const @@ -638,7 +638,7 @@ const XclFunctionInfo* XclFunctionProvider::GetFuncInfoFromOpCode( OpCode eOpCod // only in export filter allowed OSL_ENSURE( !maScFuncMap.empty(), "XclFunctionProvider::GetFuncInfoFromOpCode - wrong filter" ); ScFuncMap::const_iterator aIt = maScFuncMap.find( eOpCode ); - return (aIt == maScFuncMap.end()) ? 0 : aIt->second; + return (aIt == maScFuncMap.end()) ? nullptr : aIt->second; } void XclFunctionProvider::FillXclFuncMap( const XclFunctionInfo* pBeg, const XclFunctionInfo* pEnd ) @@ -747,9 +747,9 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclTokenArrayRef& rxTokArr } XclTokenArrayIterator::XclTokenArrayIterator() : - mppScTokenBeg( 0 ), - mppScTokenEnd( 0 ), - mppScToken( 0 ), + mppScTokenBeg( nullptr ), + mppScTokenEnd( nullptr ), + mppScToken( nullptr ), mbSkipSpaces( false ) { } @@ -771,9 +771,9 @@ XclTokenArrayIterator::XclTokenArrayIterator( const XclTokenArrayIterator& rTokA void XclTokenArrayIterator::Init( const ScTokenArray& rScTokArr, bool bSkipSpaces ) { sal_uInt16 nTokArrLen = rScTokArr.GetLen(); - mppScTokenBeg = static_cast< const FormulaToken* const* >( nTokArrLen ? rScTokArr.GetArray() : 0 ); - mppScTokenEnd = mppScTokenBeg ? (mppScTokenBeg + nTokArrLen) : 0; - mppScToken = (mppScTokenBeg != mppScTokenEnd) ? mppScTokenBeg : 0; + mppScTokenBeg = static_cast< const FormulaToken* const* >( nTokArrLen ? rScTokArr.GetArray() : nullptr ); + mppScTokenEnd = mppScTokenBeg ? (mppScTokenBeg + nTokArrLen) : nullptr; + mppScToken = (mppScTokenBeg != mppScTokenEnd) ? mppScTokenBeg : nullptr; mbSkipSpaces = bSkipSpaces; SkipSpaces(); } @@ -789,7 +789,7 @@ void XclTokenArrayIterator::NextRawToken() { if( mppScToken ) if( (++mppScToken == mppScTokenEnd) || !*mppScToken ) - mppScToken = 0; + mppScToken = nullptr; } void XclTokenArrayIterator::SkipSpaces() diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index cb2116af615e..a70308a1eb68 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -137,27 +137,27 @@ const OUString* XclPCItem::GetText() const const double* XclPCItem::GetDouble() const { - return (meType == EXC_PCITEM_DOUBLE) ? &mfValue : 0; + return (meType == EXC_PCITEM_DOUBLE) ? &mfValue : nullptr; } const DateTime* XclPCItem::GetDateTime() const { - return (meType == EXC_PCITEM_DATETIME) ? &maDateTime : 0; + return (meType == EXC_PCITEM_DATETIME) ? &maDateTime : nullptr; } const sal_Int16* XclPCItem::GetInteger() const { - return (meType == EXC_PCITEM_INTEGER) ? &mnValue : 0; + return (meType == EXC_PCITEM_INTEGER) ? &mnValue : nullptr; } const sal_uInt16* XclPCItem::GetError() const { - return (meType == EXC_PCITEM_ERROR) ? &mnError : 0; + return (meType == EXC_PCITEM_ERROR) ? &mnError : nullptr; } const bool* XclPCItem::GetBool() const { - return (meType == EXC_PCITEM_BOOL) ? &mbValue : 0; + return (meType == EXC_PCITEM_BOOL) ? &mbValue : nullptr; } // Field settings ============================================================= @@ -412,7 +412,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTCachedName& rCachedNam const OUString* XclPTVisNameInfo::GetVisName() const { - return HasVisName() ? &maVisName.maName : 0; + return HasVisName() ? &maVisName.maName : nullptr; } void XclPTVisNameInfo::SetVisName( const OUString& rName ) diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index 551e035d80c8..874b7971131c 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -284,7 +284,7 @@ SfxObjectShell* XclRoot::GetDocShell() const ScModelObj* XclRoot::GetDocModelObj() const { SfxObjectShell* pDocShell = GetDocShell(); - return pDocShell ? ScModelObj::getImplementation( pDocShell->GetModel() ) : 0; + return pDocShell ? ScModelObj::getImplementation( pDocShell->GetModel() ) : nullptr; } OutputDevice* XclRoot::GetPrinter() const @@ -305,7 +305,7 @@ ScRangeName& XclRoot::GetNamedRanges() const SdrPage* XclRoot::GetSdrPage( SCTAB nScTab ) const { return ((nScTab >= 0) && GetDoc().GetDrawLayer()) ? - GetDoc().GetDrawLayer()->GetPage( static_cast< sal_uInt16 >( nScTab ) ) : 0; + GetDoc().GetDrawLayer()->GetPage( static_cast< sal_uInt16 >( nScTab ) ) : nullptr; } SvNumberFormatter& XclRoot::GetFormatter() const diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index 3a65bf6d2db3..9005282156d9 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -85,7 +85,7 @@ static const ColorData spnDefColorTable8[] = #undef EXC_PALETTE_EGA_COLORS_DARK XclDefaultPalette::XclDefaultPalette( const XclRoot& rRoot ) : - mpnColorTable( 0 ), + mpnColorTable( nullptr ), mnTableSize( 0 ) { const StyleSettings& rSett = Application::GetSettings().GetStyleSettings(); @@ -533,27 +533,27 @@ namespace { /** Property names for common font settings. */ const sal_Char *const sppcPropNamesChCommon[] = { - "CharUnderline", "CharStrikeout", "CharColor", "CharContoured", "CharShadowed", 0 + "CharUnderline", "CharStrikeout", "CharColor", "CharContoured", "CharShadowed", nullptr }; /** Property names for Western font settings. */ const sal_Char *const sppcPropNamesChWstrn[] = { - "CharFontName", "CharHeight", "CharPosture", "CharWeight", 0 + "CharFontName", "CharHeight", "CharPosture", "CharWeight", nullptr }; /** Property names for Asian font settings. */ const sal_Char *const sppcPropNamesChAsian[] = { - "CharFontNameAsian", "CharHeightAsian", "CharPostureAsian", "CharWeightAsian", 0 + "CharFontNameAsian", "CharHeightAsian", "CharPostureAsian", "CharWeightAsian", nullptr }; /** Property names for Complex font settings. */ const sal_Char *const sppcPropNamesChCmplx[] = { - "CharFontNameComplex", "CharHeightComplex", "CharPostureComplex", "CharWeightComplex", 0 + "CharFontNameComplex", "CharHeightComplex", "CharPostureComplex", "CharWeightComplex", nullptr }; /** Property names for escapement. */ const sal_Char *const sppcPropNamesChEscapement[] = { - "CharEscapement", "CharEscapementHeight", 0 + "CharEscapement", "CharEscapementHeight", nullptr }; const sal_Int8 EXC_API_ESC_HEIGHT = 58; /// Default escapement font height. @@ -568,7 +568,7 @@ const sal_Char *const *const sppcPropNamesChCmplxNoName = sppcPropNamesChCmplx + const sal_Char *const sppcPropNamesControl[] = { "FontName", "FontFamily", "FontCharset", "FontHeight", "FontSlant", - "FontWeight", "FontUnderline", "FontStrikeout", "TextColor", 0 + "FontWeight", "FontUnderline", "FontStrikeout", "TextColor", nullptr }; /** Inserts all passed API font settings into the font data object. */ @@ -779,15 +779,15 @@ struct XclBuiltInFormat /** Defines an Excel built-in number format that maps to an own built-in format. */ #define EXC_NUMFMT_OFFSET( nXclNumFmt, eOffset ) \ - { nXclNumFmt, 0, eOffset, 0 } + { nXclNumFmt, nullptr, eOffset, 0 } /** Defines an Excel built-in number format that is the same as the specified. */ #define EXC_NUMFMT_REUSE( nXclNumFmt, nXclReuse ) \ - { nXclNumFmt, 0, PRV_NF_INDEX_REUSE, nXclReuse } + { nXclNumFmt, nullptr, PRV_NF_INDEX_REUSE, nXclReuse } /** Terminates an Excel built-in number format table. */ #define EXC_NUMFMT_ENDTABLE() \ - { EXC_FORMAT_NOTFOUND, 0, NF_NUMBER_STANDARD, 0 } + { EXC_FORMAT_NOTFOUND, nullptr, NF_NUMBER_STANDARD, 0 } // Currency unit characters #define UTF8_BAHT "\340\270\277" @@ -1412,15 +1412,15 @@ static const XclBuiltInFormatTable spBuiltInFormatTables[] = { LANGUAGE_ENGLISH_CAN, LANGUAGE_ENGLISH, spBuiltInFormats_ENGLISH_CAN }, { LANGUAGE_ENGLISH_AUS, LANGUAGE_ENGLISH, spBuiltInFormats_ENGLISH_AUS }, { LANGUAGE_ENGLISH_SAFRICA, LANGUAGE_ENGLISH, spBuiltInFormats_ENGLISH_SAFRICA }, - { LANGUAGE_ENGLISH_NZ, LANGUAGE_ENGLISH_AUS, 0 }, + { LANGUAGE_ENGLISH_NZ, LANGUAGE_ENGLISH_AUS, nullptr }, { PRV_LANGUAGE_FRENCH_PRIM, LANGUAGE_DONTKNOW, spBuiltInFormats_FRENCH }, { LANGUAGE_FRENCH, PRV_LANGUAGE_FRENCH_PRIM, spBuiltInFormats_FRENCH_FRANCE }, { LANGUAGE_FRENCH_CANADIAN, PRV_LANGUAGE_FRENCH_PRIM, spBuiltInFormats_FRENCH_CANADIAN }, { LANGUAGE_FRENCH_SWISS, PRV_LANGUAGE_FRENCH_PRIM, spBuiltInFormats_FRENCH_SWISS }, { LANGUAGE_FRENCH_BELGIAN, LANGUAGE_FRENCH, spBuiltInFormats_FRENCH_BELGIAN }, - { LANGUAGE_FRENCH_LUXEMBOURG, LANGUAGE_FRENCH, 0 }, - { LANGUAGE_FRENCH_MONACO, LANGUAGE_FRENCH, 0 }, + { LANGUAGE_FRENCH_LUXEMBOURG, LANGUAGE_FRENCH, nullptr }, + { LANGUAGE_FRENCH_MONACO, LANGUAGE_FRENCH, nullptr }, { PRV_LANGUAGE_GERMAN_PRIM, LANGUAGE_DONTKNOW, spBuiltInFormats_GERMAN }, { LANGUAGE_GERMAN, PRV_LANGUAGE_GERMAN_PRIM, spBuiltInFormats_GERMAN_GERMANY }, diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index df10559ad5a0..5e26d7c4428b 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -394,7 +394,7 @@ ScCTBWrapper::Print( FILE* fp ) ScCTB* ScCTBWrapper::GetCustomizationData( const OUString& sTBName ) { - ScCTB* pCTB = NULL; + ScCTB* pCTB = nullptr; for ( std::vector< ScCTB >::iterator it = rCTB.begin(); it != rCTB.end(); ++it ) { if ( it->GetName().equals( sTBName ) ) diff --git a/sc/source/filter/excel/xlview.cxx b/sc/source/filter/excel/xlview.cxx index dca88f213692..7d227b73fc18 100644 --- a/sc/source/filter/excel/xlview.cxx +++ b/sc/source/filter/excel/xlview.cxx @@ -90,7 +90,7 @@ bool XclTabViewData::HasPane( sal_uInt8 nPaneId ) const const XclSelectionData* XclTabViewData::GetSelectionData( sal_uInt8 nPane ) const { XclSelectionMap::const_iterator aIt = maSelMap.find( nPane ); - return (aIt == maSelMap.end()) ? 0 : aIt->second.get(); + return (aIt == maSelMap.end()) ? nullptr : aIt->second.get(); } XclSelectionData& XclTabViewData::CreateSelectionData( sal_uInt8 nPane ) diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index e2d0a2a0a3dd..0f17a3e2c541 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -320,7 +320,7 @@ bool ScfPropSetHelper::ReadValue( Any& rAny ) Any* pAny = GetNextAny(); if( pAny ) rAny = *pAny; - return pAny != 0; + return pAny != nullptr; } bool ScfPropSetHelper::ReadValue( Color& rColor ) @@ -371,7 +371,7 @@ void ScfPropSetHelper::WriteToPropertySet( ScfPropertySet& rPropSet ) const Any* ScfPropSetHelper::GetNextAny() { OSL_ENSURE( mnNextIdx < maNameOrder.size(), "ScfPropSetHelper::GetNextAny - sequence overflow" ); - Any* pAny = 0; + Any* pAny = nullptr; if( mnNextIdx < maNameOrder.size() ) pAny = &maValueSeq[ maNameOrder[ mnNextIdx++ ] ]; return pAny; diff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx index 645323b9cf1c..84deda9ec4a2 100644 --- a/sc/source/filter/ftools/fprogressbar.cxx +++ b/sc/source/filter/ftools/fprogressbar.cxx @@ -58,8 +58,8 @@ ScfProgressBar::~ScfProgressBar() void ScfProgressBar::Init( SfxObjectShell* pDocShell ) { mpDocShell = pDocShell; - mpParentProgress = 0; - mpParentSegment = mpCurrSegment = 0; + mpParentProgress = nullptr; + mpParentSegment = mpCurrSegment = nullptr; mnTotalSize = mnTotalPos = mnUnitSize = mnNextUnitPos = 0; mnSysProgressScale = 1; // used to workaround the ULONG_MAX/100 limit mbInProgress = false; @@ -68,7 +68,7 @@ void ScfProgressBar::Init( SfxObjectShell* pDocShell ) ScfProgressBar::ScfProgressSegment* ScfProgressBar::GetSegment( sal_Int32 nSegment ) { if( nSegment < 0 ) - return 0; + return nullptr; return &(maSegments.at( nSegment )); } diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 324c0e34c9fd..fb80b938c3b7 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -234,7 +234,7 @@ ScStyleSheet& lclMakeStyleSheet( ScStyleSheetPool& rPool, const OUString& rStyle // find an unused name OUString aNewName( rStyleName ); sal_Int32 nIndex = 0; - SfxStyleSheetBase* pOldStyleSheet = 0; + SfxStyleSheetBase* pOldStyleSheet = nullptr; while( SfxStyleSheetBase* pStyleSheet = rPool.Find( aNewName, eFamily ) ) { if( !pOldStyleSheet ) diff --git a/sc/source/filter/ftools/sharedformulagroups.cxx b/sc/source/filter/ftools/sharedformulagroups.cxx index 9a00ade2f0a8..46ccb31d03c6 100644 --- a/sc/source/filter/ftools/sharedformulagroups.cxx +++ b/sc/source/filter/ftools/sharedformulagroups.cxx @@ -19,7 +19,7 @@ void SharedFormulaGroups::set( size_t nSharedId, ScTokenArray* pArray ) const ScTokenArray* SharedFormulaGroups::get( size_t nSharedId ) const { StoreType::const_iterator it = maStore.find(nSharedId); - return it == maStore.end() ? NULL : it->second; + return it == maStore.end() ? nullptr : it->second; } } diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index a3d36ea435de..3e2e8c81e318 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -341,7 +341,7 @@ void ScHTMLExport::WriteHeader() if ( pDoc->IsClipOrUndo() ) { // no real DocInfo available, but some META information like charset needed - SfxFrameHTMLWriter::Out_DocInfo( rStrm, aBaseURL, NULL, sIndent, eDestEnc, &aNonConvertibleChars ); + SfxFrameHTMLWriter::Out_DocInfo( rStrm, aBaseURL, nullptr, sIndent, eDestEnc, &aNonConvertibleChars ); } else { @@ -471,7 +471,7 @@ void ScHTMLExport::WriteOverview() const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab ) { SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool(); - SfxStyleSheetBase* pStyleSheet = NULL; + SfxStyleSheetBase* pStyleSheet = nullptr; OSL_ENSURE( pStylePool, "StylePool not found! :-(" ); // remember defaults for compare in WriteCell @@ -879,7 +879,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) return ; ScAddress aPos( nCol, nRow, nTab ); - ScHTMLGraphEntry* pGraphEntry = NULL; + ScHTMLGraphEntry* pGraphEntry = nullptr; if ( bTabHasGraphics && !mbSkipImages ) { size_t ListSize = aGraphList.size(); @@ -1060,7 +1060,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) case SVX_VER_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_HTML_VA_middle; break; case SVX_VER_JUSTIFY_BOTTOM: pChar = OOO_STRING_SVTOOLS_HTML_VA_bottom; break; case SVX_VER_JUSTIFY_STANDARD: - default: pChar = NULL; + default: pChar = nullptr; } if ( pChar ) { diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx index 6e4cc376f49b..8e82e3072f2c 100644 --- a/sc/source/filter/html/htmlimp.cxx +++ b/sc/source/filter/html/htmlimp.cxx @@ -176,9 +176,9 @@ void ScHTMLImport::WriteToDocument( SCsROW nRowDiff = (SCsROW)maRange.aStart.Row(); SCsTAB nTabDiff = (SCsTAB)maRange.aStart.Tab(); - ScHTMLTable* pTable = NULL; + ScHTMLTable* pTable = nullptr; ScHTMLTableId nTableId = SC_HTML_GLOBAL_TABLE; - while( (pTable = pGlobTable->FindNestedTable( ++nTableId )) != 0 ) + while( (pTable = pGlobTable->FindNestedTable( ++nTableId )) != nullptr ) { pTable->GetDocRange( aNewRange ); aNewRange.Move( nColDiff, nRowDiff, nTabDiff ); diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index b7b01db301ab..c5dad934a2eb 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -205,7 +205,7 @@ ScHTMLLayoutParser::ScHTMLLayoutParser( aPageSize( aPageSizeP ), aBaseURL( rBaseURL ), xLockedList( new ScRangeList ), - pTables( NULL ), + pTables( nullptr ), pColOffset( new ScHTMLColOffset ), pLocalColOffset( new ScHTMLColOffset ), nFirstTableCell(0), @@ -268,7 +268,7 @@ sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL bool bLoading = pObjSh && pObjSh->IsLoading(); SvKeyValueIteratorRef xValues; - SvKeyValueIterator* pAttributes = NULL; + SvKeyValueIterator* pAttributes = nullptr; if ( bLoading ) pAttributes = pObjSh->GetHeaderAttributes(); else @@ -308,7 +308,7 @@ sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL const ScHTMLTable* ScHTMLLayoutParser::GetGlobalTable() const { - return 0; + return nullptr; } void ScHTMLLayoutParser::NewActEntry( ScEEParseEntry* pE ) @@ -489,13 +489,13 @@ void ScHTMLLayoutParser::Adjust() xLockedList->RemoveAll(); std::stack< ScHTMLAdjustStackEntry* > aStack; - ScHTMLAdjustStackEntry* pS = NULL; + ScHTMLAdjustStackEntry* pS = nullptr; sal_uInt16 nTab = 0; SCCOL nLastCol = SCCOL_MAX; SCROW nNextRow = 0; SCROW nCurRow = 0; sal_uInt16 nPageWidth = (sal_uInt16) aPageSize.Width(); - InnerMap* pTab = NULL; + InnerMap* pTab = nullptr; for ( size_t i = 0, nListSize = maList.size(); i < nListSize; ++i ) { ScEEParseEntry* pE = maList[ i ]; @@ -511,7 +511,7 @@ void ScHTMLLayoutParser::Adjust() nCurRow = pS->nCurRow; } delete pS; - pS = NULL; + pS = nullptr; nTab = pE->nTab; if (pTables) { @@ -1115,7 +1115,7 @@ void ScHTMLLayoutParser::TableOn( ImportInfo* pInfo ) nColOffsetStart = nColOffset; } - ScEEParseEntry* pE = NULL; + ScEEParseEntry* pE = nullptr; if (maList.size()) pE = maList.back(); NewActEntry( pE ); // New free flying pActEntry @@ -1221,7 +1221,7 @@ void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo ) nRowKGV = nRowsPerRow1 = nRows; nRowsPerRow2 = 1; } - InnerMap* pTab2 = NULL; + InnerMap* pTab2 = nullptr; if ( nRowsPerRow2 > 1 ) { // Height of the inner table pTab2 = new InnerMap; @@ -1815,7 +1815,7 @@ private: ScHTMLTableMap::ScHTMLTableMap( ScHTMLTable& rParentTable ) : mrParentTable(rParentTable), - mpCurrTable(NULL) + mpCurrTable(nullptr) { } @@ -1825,7 +1825,7 @@ ScHTMLTableMap::~ScHTMLTableMap() ScHTMLTable* ScHTMLTableMap::FindTable( ScHTMLTableId nTableId, bool bDeep ) const { - ScHTMLTable* pResult = 0; + ScHTMLTable* pResult = nullptr; if( mpCurrTable && (nTableId == mpCurrTable->GetTableId()) ) pResult = mpCurrTable; // cached table else @@ -1898,7 +1898,7 @@ ScHTMLTable::ScHTMLTable( ScHTMLTable& rParentTable, const ImportInfo& rInfo, bo maTableItemSet( rParentTable.GetCurrItemSet() ), mrEditEngine( rParentTable.mrEditEngine ), mrEEParseList( rParentTable.mrEEParseList ), - mpCurrEntryList( 0 ), + mpCurrEntryList( nullptr ), maSize( 1, 1 ), mpParser(rParentTable.mpParser), mbBorderOn( false ), @@ -1940,12 +1940,12 @@ ScHTMLTable::ScHTMLTable( std::vector< ScEEParseEntry* >& rEEParseList, ScHTMLTableId& rnUnusedId, ScHTMLParser* pParser ) : - mpParentTable( 0 ), + mpParentTable( nullptr ), maTableId( rnUnusedId ), maTableItemSet( rPool ), mrEditEngine( rEditEngine ), mrEEParseList( rEEParseList ), - mpCurrEntryList( 0 ), + mpCurrEntryList( nullptr ), maSize( 1, 1 ), mpParser(pParser), mbBorderOn( false ), @@ -1973,9 +1973,9 @@ const SfxItemSet& ScHTMLTable::GetCurrItemSet() const ScHTMLSize ScHTMLTable::GetSpan( const ScHTMLPos& rCellPos ) const { ScHTMLSize aSpan( 1, 1 ); - const ScRange* pRange = NULL; - if( ( (pRange = maVMergedCells.Find( rCellPos.MakeAddr() ) ) != 0) - || ( (pRange = maHMergedCells.Find( rCellPos.MakeAddr() ) ) != 0) + const ScRange* pRange = nullptr; + if( ( (pRange = maVMergedCells.Find( rCellPos.MakeAddr() ) ) != nullptr) + || ( (pRange = maHMergedCells.Find( rCellPos.MakeAddr() ) ) != nullptr) ) aSpan.Set( pRange->aEnd.Col() - pRange->aStart.Col() + 1, pRange->aEnd.Row() - pRange->aStart.Row() + 1 ); return aSpan; @@ -1983,7 +1983,7 @@ ScHTMLSize ScHTMLTable::GetSpan( const ScHTMLPos& rCellPos ) const ScHTMLTable* ScHTMLTable::FindNestedTable( ScHTMLTableId nTableId ) const { - return mxNestedTables.get() ? mxNestedTables->FindTable( nTableId ) : 0; + return mxNestedTables.get() ? mxNestedTables->FindTable( nTableId ) : nullptr; } void ScHTMLTable::PutItem( const SfxPoolItem& rItem ) @@ -2307,8 +2307,8 @@ void ScHTMLTable::ApplyCellBorders( ScDocument* pDoc, const ScAddress& rFirstPos const SCROW nLastRow = maSize.mnRows - 1; const long nOuterLine = DEF_LINE_WIDTH_2; const long nInnerLine = DEF_LINE_WIDTH_0; - SvxBorderLine aOuterLine(0, nOuterLine, table::BorderLineStyle::SOLID); - SvxBorderLine aInnerLine(0, nInnerLine, table::BorderLineStyle::SOLID); + SvxBorderLine aOuterLine(nullptr, nOuterLine, table::BorderLineStyle::SOLID); + SvxBorderLine aInnerLine(nullptr, nInnerLine, table::BorderLineStyle::SOLID); SvxBoxItem aBorderItem( ATTR_BORDER ); for( SCCOL nCol = 0; nCol <= nLastCol; ++nCol ) @@ -2325,12 +2325,12 @@ void ScHTMLTable::ApplyCellBorders( ScDocument* pDoc, const ScAddress& rFirstPos SCROW nCellRow2 = nCellRow1 + GetDocSize( tdRow, nRow ) - 1; for( SCCOL nCellCol = nCellCol1; nCellCol <= nCellCol2; ++nCellCol ) { - aBorderItem.SetLine( (nCellCol == nCellCol1) ? pLeftLine : 0, SvxBoxItemLine::LEFT ); - aBorderItem.SetLine( (nCellCol == nCellCol2) ? pRightLine : 0, SvxBoxItemLine::RIGHT ); + aBorderItem.SetLine( (nCellCol == nCellCol1) ? pLeftLine : nullptr, SvxBoxItemLine::LEFT ); + aBorderItem.SetLine( (nCellCol == nCellCol2) ? pRightLine : nullptr, SvxBoxItemLine::RIGHT ); for( SCROW nCellRow = nCellRow1; nCellRow <= nCellRow2; ++nCellRow ) { - aBorderItem.SetLine( (nCellRow == nCellRow1) ? pTopLine : 0, SvxBoxItemLine::TOP ); - aBorderItem.SetLine( (nCellRow == nCellRow2) ? pBottomLine : 0, SvxBoxItemLine::BOTTOM ); + aBorderItem.SetLine( (nCellRow == nCellRow1) ? pTopLine : nullptr, SvxBoxItemLine::TOP ); + aBorderItem.SetLine( (nCellRow == nCellRow2) ? pBottomLine : nullptr, SvxBoxItemLine::BOTTOM ); pDoc->ApplyAttr( nCellCol, nCellRow, rFirstPos.Tab(), aBorderItem ); } } @@ -2444,7 +2444,7 @@ bool ScHTMLTable::PushTableEntry( ScHTMLTableId nTableId ) ScHTMLTable* ScHTMLTable::GetExistingTable( ScHTMLTableId nTableId ) const { ScHTMLTable* pTable = ((nTableId != SC_HTML_GLOBAL_TABLE) && mxNestedTables.get()) ? - mxNestedTables->FindTable( nTableId, false ) : 0; + mxNestedTables->FindTable( nTableId, false ) : nullptr; OSL_ENSURE( pTable || (nTableId == SC_HTML_GLOBAL_TABLE), "ScHTMLTable::GetExistingTable - table not found" ); return pTable; } @@ -2464,7 +2464,7 @@ void ScHTMLTable::InsertNewCell( const ScHTMLSize& rSpanSize ) /* Find an unused cell by skipping all merged ranges that cover the current cell position stored in maCurrCell. */ - while( ((pRange = maVMergedCells.Find( maCurrCell.MakeAddr() )) != 0) || ((pRange = maHMergedCells.Find( maCurrCell.MakeAddr() )) != 0) ) + while( ((pRange = maVMergedCells.Find( maCurrCell.MakeAddr() )) != nullptr) || ((pRange = maHMergedCells.Find( maCurrCell.MakeAddr() )) != nullptr) ) maCurrCell.mnCol = pRange->aEnd.Col() + 1; mpCurrEntryList = &maEntryMap[ maCurrCell ]; @@ -2473,7 +2473,7 @@ void ScHTMLTable::InsertNewCell( const ScHTMLSize& rSpanSize ) vertically merged ranges (do not shrink the new cell). */ SCCOL nColEnd = maCurrCell.mnCol + rSpanSize.mnCols; for( ScAddress aAddr( maCurrCell.MakeAddr() ); aAddr.Col() < nColEnd; aAddr.IncCol() ) - if( (pRange = maVMergedCells.Find( aAddr )) != 0 ) + if( (pRange = maVMergedCells.Find( aAddr )) != nullptr ) pRange->aEnd.SetRow( maCurrCell.mnRow - 1 ); // insert the new range into the cell lists @@ -2540,7 +2540,7 @@ void ScHTMLTable::ImplDataOff() { mxDataItemSet.reset(); ++maCurrCell.mnCol; - mpCurrEntryList = 0; + mpCurrEntryList = nullptr; mbDataOn = false; } } @@ -2742,7 +2742,7 @@ void ScHTMLTable::RecalcDocPos( const ScHTMLPos& rBasePos ) ScHTMLPos aEntryDocPos( aCellDocPos ); ScHTMLEntryList& rEntryList = aMapIter->second; - ScHTMLEntry* pEntry = 0; + ScHTMLEntry* pEntry = nullptr; ScHTMLEntryList::iterator aListIterEnd = rEntryList.end(); for( ScHTMLEntryList::iterator aListIter = rEntryList.begin(); aListIter != aListIterEnd; ++aListIter ) { @@ -2847,7 +2847,7 @@ ScHTMLQueryParser::~ScHTMLQueryParser() sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const OUString& rBaseURL ) { SvKeyValueIteratorRef xValues; - SvKeyValueIterator* pAttributes = 0; + SvKeyValueIterator* pAttributes = nullptr; SfxObjectShell* pObjSh = mpDoc->GetDocumentShell(); if( pObjSh && pObjSh->IsLoading() ) @@ -3094,7 +3094,7 @@ class CSSHandler const char* mp; size_t mn; - MemStr() : mp(NULL), mn(0) {} + MemStr() : mp(nullptr), mn(0) {} MemStr(const char* p, size_t n) : mp(p), mn(n) {} MemStr& operator=(const MemStr& r) { diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index c88284d56d03..875906e08ee3 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -319,13 +319,13 @@ private: sal_uInt16* pBuffer; sal_uInt16 nTabCount; - inline void Clear() { if( pBuffer ) delete[] pBuffer; pBuffer = NULL; } + inline void Clear() { if( pBuffer ) delete[] pBuffer; pBuffer = nullptr; } virtual void SaveCont( XclExpStream& rStrm ) override; public: inline XclExpChTrTabId( sal_uInt16 nCount ) : - pBuffer( NULL ), nTabCount( nCount ) {} + pBuffer( nullptr ), nTabCount( nCount ) {} XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer ); virtual ~XclExpChTrTabId(); diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index 3bb393cff0ef..09115c12c0c5 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -61,7 +61,7 @@ public: explicit Shape( const WorksheetHelper& rHelper, const AttributeList& rAttribs, - const sal_Char* pcServiceName = 0 ); + const sal_Char* pcServiceName = nullptr ); protected: virtual void finalizeXShape( @@ -89,7 +89,7 @@ public: sal_Int32 nElement, const AttributeList& rAttribs, const ::oox::drawingml::ShapePtr& rxParentShape, - ::oox::drawingml::ShapePtr* pxShape = 0 ); + ::oox::drawingml::ShapePtr* pxShape = nullptr ); protected: virtual ::oox::core::ContextHandlerRef diff --git a/sc/source/filter/inc/eeimport.hxx b/sc/source/filter/inc/eeimport.hxx index 3b1217dbf808..ed86794005bf 100644 --- a/sc/source/filter/inc/eeimport.hxx +++ b/sc/source/filter/inc/eeimport.hxx @@ -55,7 +55,7 @@ public: virtual ScRange GetRange() override { return maRange; } virtual void WriteToDocument( bool bSizeColsRows = false, double nOutputFactor = 1.0, - SvNumberFormatter* pFormatter = NULL, + SvNumberFormatter* pFormatter = nullptr, bool bConvertDate = true ) override; }; diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index ccd5e685d545..ec2b45b6fce2 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -42,7 +42,7 @@ struct ScHTMLImage sal_Char nDir; // 1==hori, 2==verti, 3==beides ScHTMLImage() : - aSize( 0, 0 ), aSpace( 0, 0 ), pGraphic( NULL ), + aSize( 0, 0 ), aSpace( 0, 0 ), pGraphic( nullptr ), nDir( nHorizontal ) {} @@ -70,16 +70,16 @@ struct ScEEParseEntry bool bEntirePara:1; // true = use entire paragraph, false = use selection ScEEParseEntry( SfxItemPool* pPool ) : - aItemSet( *pPool ), pValStr( NULL ), - pNumStr( NULL ), pName( NULL ), + aItemSet( *pPool ), pValStr( nullptr ), + pNumStr( nullptr ), pName( nullptr ), nCol(SCCOL_MAX), nRow(SCROW_MAX), nTab(0), nTwips(0), nColOverlap(1), nRowOverlap(1), nOffset(0), nWidth(0), bHasGraphic(false), bEntirePara(true) {} ScEEParseEntry( const SfxItemSet& rItemSet ) : - aItemSet( rItemSet ), pValStr( NULL ), - pNumStr( NULL ), pName( NULL ), + aItemSet( rItemSet ), pValStr( nullptr ), + pNumStr( nullptr ), pName( nullptr ), nCol(SCCOL_MAX), nRow(SCROW_MAX), nTab(0), nTwips(0), nColOverlap(1), nRowOverlap(1), nOffset(0), nWidth(0), bHasGraphic(false), bEntirePara(true) diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index fa3b152c0564..547fdb144b57 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -82,7 +82,7 @@ public: @return The encryption data or an empty sequence on 'Cancel' or any error. */ static css::uno::Sequence< css::beans::NamedValue > QueryEncryptionDataForMedium( SfxMedium& rMedium, ::comphelper::IDocPasswordVerifier& rVerifier, - const ::std::vector< OUString >* pDefaultPasswords = 0 ); + const ::std::vector< OUString >* pDefaultPasswords = nullptr ); }; template< typename Type > diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index 5a920c870620..0a9667a36769 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -280,7 +280,7 @@ public: virtual FltError ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ) override; virtual FltError ScImportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, bool bCalcWidthHeight = true, - SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) override; + SvNumberFormatter* pFormatter = nullptr, bool bConvertDate = true ) override; virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) override; virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight ) override; diff --git a/sc/source/filter/inc/htmlimp.hxx b/sc/source/filter/inc/htmlimp.hxx index 858e5beeb25c..562a64b45afd 100644 --- a/sc/source/filter/inc/htmlimp.hxx +++ b/sc/source/filter/inc/htmlimp.hxx @@ -34,7 +34,7 @@ public: const ScHTMLParser* GetParser() const { return static_cast<ScHTMLParser*>(mpParser); } virtual void WriteToDocument( bool bSizeColsRows = false, double nOutputFactor = 1.0, - SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) override; + SvNumberFormatter* pFormatter = nullptr, bool bConvertDate = true ) override; static OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ); }; diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx index 3529d6e3565d..230a9a77530e 100644 --- a/sc/source/filter/inc/lotfntbf.hxx +++ b/sc/source/filter/inc/lotfntbf.hxx @@ -39,10 +39,10 @@ private: sal_Int32 nType; // < 0 -> undefiniert inline ENTRY() { - pTmpName = NULL; - pFont = NULL; - pHeight = NULL; - pColor = NULL; + pTmpName = nullptr; + pFont = nullptr; + pHeight = nullptr; + pColor = nullptr; nType = -1; } inline ~ENTRY() diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx index 766193710810..7312d26d4ef4 100644 --- a/sc/source/filter/inc/richstring.hxx +++ b/sc/source/filter/inc/richstring.hxx @@ -63,7 +63,7 @@ public: /** Returns the text data of this portion. */ inline const OUString& getText() const { return maText; } /** Returns true, if the portion contains font formatting. */ - inline bool hasFont() const { return mxFont.get() != 0; } + inline bool hasFont() const { return mxFont.get() != nullptr; } /** Converts the portion and replaces or appends to the passed XText. */ void convert( @@ -248,7 +248,7 @@ public: if there is only one unformatted portion. */ bool extractPlainString( OUString& orString, - const oox::xls::Font* pFirstPortionFont = 0 ) const; + const oox::xls::Font* pFirstPortionFont = nullptr ) const; /** Converts the string and writes it into the passed XText. @param rxText The XText interface of the target object. @@ -258,7 +258,7 @@ public: void convert( const css::uno::Reference< css::text::XText >& rxText, bool bReplaceOld, - const oox::xls::Font* pFirstPortionFont = 0 ) const; + const oox::xls::Font* pFirstPortionFont = nullptr ) const; ::EditTextObject* convert( ScEditEngineDefaulter& rEE, const oox::xls::Font* pFont ) const; private: diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index 9e0457fd6b58..216dc4f41e52 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -467,7 +467,7 @@ struct Sc10ColAttr Sc10ColAttr() : Count(0) - , pData(NULL) + , pData(nullptr) { } ~Sc10ColAttr() { delete [] pData; } diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index a1d2aea4e9d6..b14007958c23 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -824,25 +824,25 @@ public: /** Creates a new empty font object. @param opnFontId (out-param) The identifier of the new font object. */ - FontRef createFont( sal_Int32* opnFontId = 0 ); + FontRef createFont( sal_Int32* opnFontId = nullptr ); /** Creates a number format. */ NumberFormatRef createNumFmt( sal_Int32 nNumFmtId, const OUString& rFmtCode ); sal_Int32 nextFreeNumFmtId(); /** Creates a new empty border object. @param opnBorderId (out-param) The identifier of the new border object. */ - BorderRef createBorder( sal_Int32* opnBorderId = 0 ); + BorderRef createBorder( sal_Int32* opnBorderId = nullptr ); /** Creates a new empty fill object. @param opnFillId (out-param) The identifier of the new fill object. */ - FillRef createFill( sal_Int32* opnFillId = 0 ); + FillRef createFill( sal_Int32* opnFillId = nullptr ); /** Creates a new empty cell formatting object. @param opnXfId (out-param) The identifier of the new XF object. */ - XfRef createCellXf( sal_Int32* opnXfId = 0 ); + XfRef createCellXf( sal_Int32* opnXfId = nullptr ); /** Creates a new empty style formatting object. @param opnXfId (out-param) The identifier of the new XF object. */ - XfRef createStyleXf( sal_Int32* opnXfId = 0 ); + XfRef createStyleXf( sal_Int32* opnXfId = nullptr ); /** Creates a new empty differential formatting object. @param opnDxfId (out-param) The identifier of the new DXF object. */ - DxfRef createDxf( sal_Int32* opnDxfId = 0 ); + DxfRef createDxf( sal_Int32* opnDxfId = nullptr ); /** Appends a new color to the color palette. */ void importPaletteColor( const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index 3c02a9500ad0..a3895c7c5efc 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -69,7 +69,7 @@ public: const XclExpRoot& rRoot, XclExpObjectManager& rObjMgr, SvStream& rStrm, - const XclEscherEx* pParent = 0 ); + const XclEscherEx* pParent = nullptr ); virtual ~XclEscherEx(); /** Called by MSODRAWING record constructors to initialize the DFF stream diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index 6d34a3410aa5..9f23f9cfc627 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -42,7 +42,7 @@ public: ///! count>=0xFFFF: Obj will be deleted, return 0 sal_uInt16 Add( XclObj* ); - XclObj* back () { return maObjs.empty() ? NULL : maObjs.back(); } + XclObj* back () { return maObjs.empty() ? nullptr : maObjs.back(); } /** * diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 001666a9c63a..3292a24097a7 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -496,7 +496,7 @@ public: virtual void SetRotation( sal_uInt16 nRotation ) override; /** Converts all text settings of the passed title text object. */ - void ConvertTitle( css::uno::Reference< css::chart2::XTitle > xTitle, sal_uInt16 nTarget, const OUString* pSubTitle = NULL ); + void ConvertTitle( css::uno::Reference< css::chart2::XTitle > xTitle, sal_uInt16 nTarget, const OUString* pSubTitle = nullptr ); /** Converts all text settings of the passed legend. */ void ConvertLegend( const ScfPropertySet& rPropSet ); /** Converts all settings of the passed data point caption text object. */ diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index e735b0fe6d80..ba1ff9500e77 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -104,7 +104,7 @@ public: virtual ~XclExpHyperlink(); /** Returns the cell representation text or 0, if not available. */ - inline const OUString* GetRepr() const { return m_Repr.isEmpty() ? 0 : &m_Repr; } + inline const OUString* GetRepr() const { return m_Repr.isEmpty() ? nullptr : &m_Repr; } virtual void SaveXml( XclExpXmlStream& rStrm ) override; diff --git a/sc/source/filter/inc/xeformula.hxx b/sc/source/filter/inc/xeformula.hxx index f42d2b4c6397..4c3839fb3371 100644 --- a/sc/source/filter/inc/xeformula.hxx +++ b/sc/source/filter/inc/xeformula.hxx @@ -56,7 +56,7 @@ public: /** Creates and returns the token array of a formula. */ XclTokenArrayRef CreateFormula( XclFormulaType eType, const ScTokenArray& rScTokArr, - const ScAddress* pScBasePos = 0, XclExpRefLog* pRefLog = 0 ); + const ScAddress* pScBasePos = nullptr, XclExpRefLog* pRefLog = nullptr ); /** Creates and returns a token array containing a single cell address. */ XclTokenArrayRef CreateFormula( XclFormulaType eType, const ScAddress& rScPos ); diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index a55cae54da2f..af40492984d7 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -398,7 +398,7 @@ class XclExpUrlHelper : boost::noncopyable public: /** Encodes and returns the URL passed in rAbsUrl to an Excel like URL. @param pTableName Optional pointer to a table name to be encoded in this URL. */ - static OUString EncodeUrl( const XclExpRoot& rRoot, const OUString& rAbsUrl, const OUString* pTableName = 0 ); + static OUString EncodeUrl( const XclExpRoot& rRoot, const OUString& rAbsUrl, const OUString* pTableName = nullptr ); /** Encodes and returns the passed DDE link to an Excel like DDE link. */ static OUString EncodeDde( const OUString& rApplic, const OUString& rTopic ); diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx index 9112a9c7192a..b269e29e43a5 100644 --- a/sc/source/filter/inc/xelink.hxx +++ b/sc/source/filter/inc/xelink.hxx @@ -145,7 +145,7 @@ public: param pRefLogEntry If not 0, data about the external link is stored here. */ void FindExtSheet( sal_uInt16& rnExtSheet, sal_uInt16& rnXclTab, SCTAB nScTab, - XclExpRefLogEntry* pRefLogEntry = 0 ); + XclExpRefLogEntry* pRefLogEntry = nullptr ); /** Searches for an EXTERNSHEET index for the given Calc sheet range. @descr See above for the meaning of EXTERNSHEET indexes. @param rnExtSheet (out-param) Returns the EXTERNSHEET index. @@ -157,13 +157,13 @@ public: void FindExtSheet( sal_uInt16& rnExtSheet, sal_uInt16& rnFirstXclTab, sal_uInt16& rnLastXclTab, SCTAB nFirstScTab, SCTAB nLastScTab, - XclExpRefLogEntry* pRefLogEntry = 0 ); + XclExpRefLogEntry* pRefLogEntry = nullptr ); /** Searches for a special EXTERNSHEET index for the own document. */ sal_uInt16 FindExtSheet( sal_Unicode cCode ); void FindExtSheet( sal_uInt16 nFileId, const OUString& rTabName, sal_uInt16 nXclTabSpan, sal_uInt16& rnExtSheet, sal_uInt16& rnFirstSBTab, sal_uInt16& rnLastSBTab, - XclExpRefLogEntry* pRefLogEntry = NULL ); + XclExpRefLogEntry* pRefLogEntry = nullptr ); /** Stores the cell with the given address in a CRN record list. */ void StoreCell( const ScSingleRefData& rRef, const ScAddress& rPos ); diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index a13a39650f75..dd10a6fa1533 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -233,7 +233,7 @@ private: // `s.GetChar(0) != 0` needed because some strings on export only contain NULL. #define XESTRING_TO_PSZ(s) \ - (s.Len() && s.GetChar( 0 ) != 0 ? XclXmlUtils::ToOString( s ).getStr() : NULL) + (s.Len() && s.GetChar( 0 ) != 0 ? XclXmlUtils::ToOString( s ).getStr() : nullptr) class ScAddress; class ScDocShell; @@ -317,7 +317,7 @@ public: const css::uno::Reference< css::io::XOutputStream >& xParentRelation, const char* sContentType, const char* sRelationshipType, - OUString* pRelationshipId = NULL ); + OUString* pRelationshipId = nullptr ); // ignore virtual bool exportDocument() diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index dd012cf090f4..f06f6f80bb92 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -158,7 +158,7 @@ public: void ConvertFont( ScfPropertySet& rPropSet, sal_uInt16 nFontIdx, - const Color* pFontColor = 0 ) const; + const Color* pFontColor = nullptr ) const; /** Writes the pie rotation property for the passed angle. */ static void ConvertPieRotation( diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 85536e6a6a3a..eb27f388ea7d 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -466,7 +466,7 @@ public: virtual ~XclImpControlHelper(); /** Returns true, if a linked cell address is present. */ - inline bool HasCellLink() const { return mxCellLink != 0; } + inline bool HasCellLink() const { return mxCellLink != nullptr; } /** Returns the SdrObject from the passed control shape and sets the bounding rectangle. */ SdrObjectPtr CreateSdrObjectFromShape( @@ -891,7 +891,7 @@ public: private: /** Updates the data of a connected shape in a connector rule. */ - void UpdateConnection( sal_uInt32 nDffShapeId, SdrObject*& rpSdrObj, sal_uInt32* pnDffFlags = 0 ); + void UpdateConnection( sal_uInt32 nDffShapeId, SdrObject*& rpSdrObj, sal_uInt32* pnDffFlags = nullptr ); private: /** Stores data about an SdrObject processed during import. */ @@ -899,7 +899,7 @@ private: { SdrObject* mpSdrObj; /// Pointer to an SdrObject. sal_uInt32 mnDffFlags; /// Shape flags from DFF stream. - inline explicit XclImpSdrInfo() : mpSdrObj( 0 ), mnDffFlags( 0 ) {} + inline explicit XclImpSdrInfo() : mpSdrObj( nullptr ), mnDffFlags( 0 ) {} inline void Set( SdrObject* pSdrObj, sal_uInt32 nDffFlags ) { mpSdrObj = pSdrObj; mnDffFlags = nDffFlags; } }; @@ -978,7 +978,7 @@ private: DffObjData& rDffObjData, void* pClientData, Rectangle& rTextRect, - SdrObject* pOldSdrObj = 0 ) override; + SdrObject* pOldSdrObj = nullptr ) override; // virtual functions of SvxMSConvertOCXControls diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx index 4da2a7025063..6bdbbfc163a9 100644 --- a/sc/source/filter/inc/xilink.hxx +++ b/sc/source/filter/inc/xilink.hxx @@ -194,7 +194,7 @@ public: /** Reads a CRN record and appends it to the current SUPBOOK. */ void ReadCrn( XclImpStream& rStrm ); /** Reads an EXTERNNAME record and appends it to the current SUPBOOK. */ - void ReadExternname( XclImpStream& rStrm, ExcelToSc* pFormulaConv = NULL ); + void ReadExternname( XclImpStream& rStrm, ExcelToSc* pFormulaConv = nullptr ); /** Returns true, if the specified XTI entry contains an internal reference. */ bool IsSelfRef( sal_uInt16 nXtiIndex ) const; diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx index f4dc557c9c32..d0e8771f8204 100644 --- a/sc/source/filter/inc/xistyle.hxx +++ b/sc/source/filter/inc/xistyle.hxx @@ -117,7 +117,7 @@ public: /** Writes all font properties to the passed property set. @param pFontColor If set, overrides internal stored font color. */ void WriteFontProperties( ScfPropertySet& rPropSet, - XclFontPropSetType eType, const Color* pFontColor = 0 ) const; + XclFontPropSetType eType, const Color* pFontColor = nullptr ) const; private: /** Reads and sets height and flags. */ @@ -185,7 +185,7 @@ public: @param pFontColor If set, overrides internal stored font color. */ void WriteFontProperties( ScfPropertySet& rPropSet, XclFontPropSetType eType, - sal_uInt16 nFontIdx, const Color* pFontColor = 0 ) const; + sal_uInt16 nFontIdx, const Color* pFontColor = nullptr ) const; /** Writes default font properties for form controls to the passed property set. */ void WriteDefaultCtrlFontProperties( ScfPropertySet& rPropSet ) const; @@ -488,10 +488,10 @@ public: /** Returns the object that stores all contents of an XF record. */ inline XclImpXF* GetXF( sal_uInt16 nXFIndex ) - { return (nXFIndex >= maXFList.size()) ? NULL : &maXFList.at(nXFIndex); } + { return (nXFIndex >= maXFList.size()) ? nullptr : &maXFList.at(nXFIndex); } inline const XclImpXF* GetXF( sal_uInt16 nXFIndex ) const - { return (nXFIndex >= maXFList.size()) ? NULL : &maXFList.at(nXFIndex); } + { return (nXFIndex >= maXFList.size()) ? nullptr : &maXFList.at(nXFIndex); } /** Returns the index to the Excel font used in the specified XF record. */ sal_uInt16 GetFontIndex( sal_uInt16 nXFIndex ) const; diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx index 9efb0697cc95..f235cf9fa7fd 100644 --- a/sc/source/filter/inc/xlescher.hxx +++ b/sc/source/filter/inc/xlescher.hxx @@ -428,11 +428,11 @@ public: css::script::ScriptEventDescriptor& rDescriptor, XclTbxEventType eEventType, const OUString& rXclMacroName, - SfxObjectShell* pDocShell = 0 ); + SfxObjectShell* pDocShell = nullptr ); /** Tries to extract an Excel macro name from the passed macro descriptor. */ static OUString ExtractFromMacroDescriptor( const css::script::ScriptEventDescriptor& rDescriptor, - XclTbxEventType eEventType, SfxObjectShell* pShell = NULL ); + XclTbxEventType eEventType, SfxObjectShell* pShell = nullptr ); }; #endif diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx index 4283ad16b17d..a5e9f9516b57 100644 --- a/sc/source/filter/inc/xlformula.hxx +++ b/sc/source/filter/inc/xlformula.hxx @@ -330,9 +330,9 @@ struct XclFunctionInfo /** Returns true, if the function parameter count is fixed. */ inline bool IsFixedParamCount() const { return (mnXclFunc != EXC_FUNCID_EXTERNCALL) && (mnMinParamCount == mnMaxParamCount); } /** Returns true, if the function is simulated by a macro call. */ - inline bool IsMacroFunc() const { return mpcMacroName != 0 && !(mnFlags & EXC_FUNCFLAG_ADDINEQUIV); } + inline bool IsMacroFunc() const { return mpcMacroName != nullptr && !(mnFlags & EXC_FUNCFLAG_ADDINEQUIV); } /** Returns true, if the function is stored as an add-in call. */ - inline bool IsAddInEquivalent() const { return mpcMacroName != 0 && (mnFlags & EXC_FUNCFLAG_ADDINEQUIV); } + inline bool IsAddInEquivalent() const { return mpcMacroName != nullptr && (mnFlags & EXC_FUNCFLAG_ADDINEQUIV); } /** Returns the name of the external function as string. */ OUString GetMacroFuncName() const; /** Returns the programmatical name of the Add-In function as string. */ @@ -387,7 +387,7 @@ public: /** Returns the size of the token array in bytes. */ sal_uInt16 GetSize() const; /** Returns read-only access to the byte vector storing token data. */ - inline const sal_uInt8* GetData() const { return maTokVec.empty() ? 0 : &maTokVec.front(); } + inline const sal_uInt8* GetData() const { return maTokVec.empty() ? nullptr : &maTokVec.front(); } /** Returns true, if the formula contains a volatile function. */ inline bool IsVolatile() const { return mbVolatile; } @@ -446,9 +446,9 @@ public: void Init( const ScTokenArray& rScTokArr, bool bSkipSpaces ); - inline bool Is() const { return mppScToken != 0; } + inline bool Is() const { return mppScToken != nullptr; } inline bool operator!() const { return !Is(); } - inline const ::formula::FormulaToken* Get() const { return mppScToken ? *mppScToken : 0; } + inline const ::formula::FormulaToken* Get() const { return mppScToken ? *mppScToken : nullptr; } inline const ::formula::FormulaToken* operator->() const { return Get(); } inline const ::formula::FormulaToken& operator*() const { return *Get(); } diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx index f861cecd9bb7..73e332837b98 100644 --- a/sc/source/filter/inc/xlstyle.hxx +++ b/sc/source/filter/inc/xlstyle.hxx @@ -421,7 +421,7 @@ public: ScfPropertySet& rPropSet, XclFontPropSetType eType, const XclFontData& rFontData, bool bHasWstrn, bool bHasAsian, bool bHasCmplx, - const Color* pFontColor = 0 ); + const Color* pFontColor = nullptr ); private: /** Returns a chart property set helper according to the passed script type. */ diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx index 4a067cfad69a..67c8f3ca4966 100644 --- a/sc/source/filter/inc/xltools.hxx +++ b/sc/source/filter/inc/xltools.hxx @@ -195,7 +195,7 @@ public: /** Returns true, if the passed string is a name of an Excel built-in style. @param pnStyleId If not 0, the found style identifier will be returned here. @param pnNextChar If not 0, the index of the char after the evaluated substring will be returned here. */ - static bool IsBuiltInStyleName( const OUString& rStyleName, sal_uInt8* pnStyleId = 0, sal_Int32* pnNextChar = 0 ); + static bool IsBuiltInStyleName( const OUString& rStyleName, sal_uInt8* pnStyleId = nullptr, sal_Int32* pnNextChar = nullptr ); /** Returns the Excel built-in style identifier of a passed style name. @param rnStyleId The style identifier is returned here. @param rnLevel The zero-based outline level for RowLevel and ColLevel styles is returned here. @@ -225,7 +225,7 @@ public: // Basic macro names ------------------------------------------------------ /** Returns the full StarBasic macro URL from an Excel macro name. */ - static OUString GetSbMacroUrl( const OUString& rMacroName, SfxObjectShell* pDocShell = 0 ); + static OUString GetSbMacroUrl( const OUString& rMacroName, SfxObjectShell* pDocShell = nullptr ); /** Returns the Excel macro name from a full StarBasic macro URL. */ static OUString GetXclMacroName( const OUString& rSbMacroUrl ); diff --git a/sc/source/filter/lotus/lotfilter.hxx b/sc/source/filter/lotus/lotfilter.hxx index 22e55d2b9bff..85acbdc9ac83 100644 --- a/sc/source/filter/lotus/lotfilter.hxx +++ b/sc/source/filter/lotus/lotfilter.hxx @@ -56,18 +56,18 @@ struct LotusContext , eTyp(eWK_UNKNOWN) , bEOF(false) , eCharVon(RTL_TEXTENCODING_DONTKNOW) - , pDoc(0) - , pLotusRoot(NULL) + , pDoc(nullptr) + , pLotusRoot(nullptr) , nDefaultFormat(0) - , pAttrRight(NULL) - , pAttrLeft(NULL) - , pAttrCenter(NULL) - , pAttrRepeat(NULL) - , pAttrStandard(NULL) - , pAttrUnprot(NULL) - , pAttrValForms(NULL) - , pValueFormCache(NULL) + , pAttrRight(nullptr) + , pAttrLeft(nullptr) + , pAttrCenter(nullptr) + , pAttrRepeat(nullptr) + , pAttrStandard(nullptr) + , pAttrUnprot(nullptr) + , pAttrValForms(nullptr) + , pValueFormCache(nullptr) { } }; diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index 9ec3a5030d47..14647408e680 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -380,7 +380,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest, FUNC_TYPE eType = FT_NOP; TokenId nMerk0; DefTokenId eOc; - const sal_Char* pExtName = 0; + const sal_Char* pExtName = nullptr; RangeNameBufferWK3& rRangeNameBufferWK3 = *m_rContext.pLotusRoot->pRngNmBffWK3; ScComplexRefData aCRD; @@ -609,10 +609,10 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest, DoFunc( ocNoName, nAnz, p.get() ); } else - DoFunc( ocNoName, nAnz, NULL ); + DoFunc( ocNoName, nAnz, nullptr ); } else - DoFunc( ocNoName, nAnz, NULL ); + DoFunc( ocNoName, nAnz, nullptr ); } break; case FT_Const10Float: @@ -1720,159 +1720,159 @@ const sal_Char* GetAddInName( const sal_uInt8 n ) { static const sal_Char* pNames[ 256 ] = { - NULL, // 0 8-Byte-IEEE-Float - NULL, // 1 Variable - NULL, // 2 Bereich - NULL, // 3 return - NULL, // 4 Bracket - NULL, // 5 2-Byte-Integer - NULL, // 6 ASCII-String - NULL, // 7 Named range reference - NULL, // 8 Absolut named range - NULL, // 9 Err range reference - NULL, // 10 Err cell reference - NULL, // 11 Err constant - NULL, // 12 - NULL, // 13 - NULL, // 14 Negation - NULL, // 15 Addition - NULL, // 16 Subtraktion - NULL, // 17 Multiplikation - NULL, // 18 Division - NULL, // 19 Potenzierung - NULL, // 20 equal - NULL, // 21 unequal - NULL, // 22 <= - NULL, // 23 >= - NULL, // 24 < - NULL, // 25 > - NULL, // 26 And (logic) - NULL, // 27 Or (logic) - NULL, // 28 Not (logic) - NULL, // 29 unary Plus - NULL, // 30 Concatenation - NULL, // 31 Not applicable - NULL, // 32 Error - NULL, // 33 Absolute Value ABS() - NULL, // 34 Integer INT() - NULL, // 35 Square Root - NULL, // 36 Zehnerlogarithmus - NULL, // 37 Natuerlicher Logarithmus - NULL, // 38 PI - NULL, // 39 Sinus - NULL, // 40 Cosinus - NULL, // 41 Tangens - NULL, // 42 Arcus-Tangens 2 (4.Quadrant) - NULL, // 43 Arcus-Tangens (2.Quadrant) - NULL, // 44 Arcus-Sinus - NULL, // 45 Arcus-Cosinus - NULL, // 46 Exponentialfunction - NULL, // 47 Modulo - NULL, // 48 Auswahl - NULL, // 49 Is not applicable? - NULL, // 50 Is Error? - NULL, // 51 FALSE - NULL, // 52 TRUE - NULL, // 53 Random number - NULL, // 54 Date - NULL, // 55 Today - NULL, // 56 Payment - NULL, // 57 Present Value - NULL, // 58 Future Value - NULL, // 59 If ... then ... else ... - NULL, // 60 Day of Month - NULL, // 61 Monat - NULL, // 62 Year - NULL, // 63 Round - NULL, // 64 Time - NULL, // 65 Hour - NULL, // 66 Minute - NULL, // 67 Second - NULL, // 68 Is Number? - NULL, // 69 Is Text? - NULL, // 70 Len() - NULL, // 71 Val() - NULL, // 72 String() ocFixed as substitute + special case - NULL, // 73 Mid() - NULL, // 74 Char() - NULL, // 75 Ascii() - NULL, // 76 Find() - NULL, // 77 Datevalue - NULL, // 78 Timevalue + nullptr, // 0 8-Byte-IEEE-Float + nullptr, // 1 Variable + nullptr, // 2 Bereich + nullptr, // 3 return + nullptr, // 4 Bracket + nullptr, // 5 2-Byte-Integer + nullptr, // 6 ASCII-String + nullptr, // 7 Named range reference + nullptr, // 8 Absolut named range + nullptr, // 9 Err range reference + nullptr, // 10 Err cell reference + nullptr, // 11 Err constant + nullptr, // 12 + nullptr, // 13 + nullptr, // 14 Negation + nullptr, // 15 Addition + nullptr, // 16 Subtraktion + nullptr, // 17 Multiplikation + nullptr, // 18 Division + nullptr, // 19 Potenzierung + nullptr, // 20 equal + nullptr, // 21 unequal + nullptr, // 22 <= + nullptr, // 23 >= + nullptr, // 24 < + nullptr, // 25 > + nullptr, // 26 And (logic) + nullptr, // 27 Or (logic) + nullptr, // 28 Not (logic) + nullptr, // 29 unary Plus + nullptr, // 30 Concatenation + nullptr, // 31 Not applicable + nullptr, // 32 Error + nullptr, // 33 Absolute Value ABS() + nullptr, // 34 Integer INT() + nullptr, // 35 Square Root + nullptr, // 36 Zehnerlogarithmus + nullptr, // 37 Natuerlicher Logarithmus + nullptr, // 38 PI + nullptr, // 39 Sinus + nullptr, // 40 Cosinus + nullptr, // 41 Tangens + nullptr, // 42 Arcus-Tangens 2 (4.Quadrant) + nullptr, // 43 Arcus-Tangens (2.Quadrant) + nullptr, // 44 Arcus-Sinus + nullptr, // 45 Arcus-Cosinus + nullptr, // 46 Exponentialfunction + nullptr, // 47 Modulo + nullptr, // 48 Auswahl + nullptr, // 49 Is not applicable? + nullptr, // 50 Is Error? + nullptr, // 51 FALSE + nullptr, // 52 TRUE + nullptr, // 53 Random number + nullptr, // 54 Date + nullptr, // 55 Today + nullptr, // 56 Payment + nullptr, // 57 Present Value + nullptr, // 58 Future Value + nullptr, // 59 If ... then ... else ... + nullptr, // 60 Day of Month + nullptr, // 61 Monat + nullptr, // 62 Year + nullptr, // 63 Round + nullptr, // 64 Time + nullptr, // 65 Hour + nullptr, // 66 Minute + nullptr, // 67 Second + nullptr, // 68 Is Number? + nullptr, // 69 Is Text? + nullptr, // 70 Len() + nullptr, // 71 Val() + nullptr, // 72 String() ocFixed as substitute + special case + nullptr, // 73 Mid() + nullptr, // 74 Char() + nullptr, // 75 Ascii() + nullptr, // 76 Find() + nullptr, // 77 Datevalue + nullptr, // 78 Timevalue "ZELLZEIGER", // 79 Cellpointer - NULL, // 80 Sum() - NULL, // 81 Avg() - NULL, // 82 Cnt() - NULL, // 83 Min() - NULL, // 84 Max() - NULL, // 85 Vlookup() - NULL, // 86 Npv() - NULL, // 87 Var() - NULL, // 88 Std() - NULL, // 89 Irr() - NULL, // 90 Hlookup() - NULL, // 91 XlfDsum - NULL, // 92 XlfDaverage - NULL, // 93 XlfDcount - NULL, // 94 XlfDmin - NULL, // 95 XlfDmax - NULL, // 96 XlfDvar - NULL, // 97 XlfDstdev - NULL, // 98 Index() - NULL, // 99 Cols() - NULL, // 100 Rows() - NULL, // 101 Repeat() - NULL, // 102 Upper() - NULL, // 103 Lower() - NULL, // 104 Left() - NULL, // 105 Right() - NULL, // 106 Replace() - NULL, // 107 Proper() + nullptr, // 80 Sum() + nullptr, // 81 Avg() + nullptr, // 82 Cnt() + nullptr, // 83 Min() + nullptr, // 84 Max() + nullptr, // 85 Vlookup() + nullptr, // 86 Npv() + nullptr, // 87 Var() + nullptr, // 88 Std() + nullptr, // 89 Irr() + nullptr, // 90 Hlookup() + nullptr, // 91 XlfDsum + nullptr, // 92 XlfDaverage + nullptr, // 93 XlfDcount + nullptr, // 94 XlfDmin + nullptr, // 95 XlfDmax + nullptr, // 96 XlfDvar + nullptr, // 97 XlfDstdev + nullptr, // 98 Index() + nullptr, // 99 Cols() + nullptr, // 100 Rows() + nullptr, // 101 Repeat() + nullptr, // 102 Upper() + nullptr, // 103 Lower() + nullptr, // 104 Left() + nullptr, // 105 Right() + nullptr, // 106 Replace() + nullptr, // 107 Proper() "ZELLE", // 108 Cell() - NULL, // 109 Trim() - NULL, // 110 Clean() + nullptr, // 109 Trim() + nullptr, // 110 Clean() "F", // 111 F() (Excel: T()?) "W", // 112 W() - NULL, // 113 Exact() - NULL, // 114 Call() - NULL, // 115 @@() - NULL, // 116 Rate() + nullptr, // 113 Exact() + nullptr, // 114 Call() + nullptr, // 115 @@() + nullptr, // 116 Rate() "TERM", // 117 Term() "CTERM", // 118 Cterm() - NULL, // 119 Sln() - NULL, // 120 Syd(), Soy() - NULL, // 121 Ddb() + nullptr, // 119 Sln() + nullptr, // 120 Syd(), Soy() + nullptr, // 121 Ddb() "SplFunc", // 122 Splfunc "BLAETTER", // 123 Sheets "INFO", // 124 Info - NULL, // 125 Sumproduct + nullptr, // 125 Sumproduct "ISTBEREICH", // 126 Isrange - NULL, // 127 Dget + nullptr, // 127 Dget "DABFRAGE", // 128 Dquery "KOORD", // 129 Coord - NULL, // 130 Reserved (internal) - NULL, // 131 Today - NULL, // 132 Vdb - NULL, // 133 Dvars - NULL, // 134 Dstds - NULL, // 135 Vars - NULL, // 136 Stds - NULL, // 137 D360 - NULL, // 138 Reserved (internal) - NULL, // 139 Isapp + nullptr, // 130 Reserved (internal) + nullptr, // 131 Today + nullptr, // 132 Vdb + nullptr, // 133 Dvars + nullptr, // 134 Dstds + nullptr, // 135 Vars + nullptr, // 136 Stds + nullptr, // 137 D360 + nullptr, // 138 Reserved (internal) + nullptr, // 139 Isapp "ISTDEFZUS", // 140 Isaaf - NULL, // 141 Weekday - NULL, // 142 Datedif - NULL, // 143 Rank - NULL, // 144 Numberstring + nullptr, // 141 Weekday + nullptr, // 142 Datedif + nullptr, // 143 Rank + nullptr, // 144 Numberstring "DATUMFOLGE", // 145 Datestring "DEZIMAL", // 146 Decimal "HEX", // 147 Hex - NULL, // 148 Db - NULL, // 149 Pmti - NULL, // 150 Spi - NULL, // 151 Fullp - NULL, // 152 Halfp + nullptr, // 148 Db + nullptr, // 149 Pmti + nullptr, // 150 Spi + nullptr, // 151 Fullp + nullptr, // 152 Halfp "PURMITTELWERT", // 153 Pureavg "PURquantity", // 154 Purecount "PURMAX", // 155 Puremax @@ -1881,101 +1881,101 @@ const sal_Char* GetAddInName( const sal_uInt8 n ) "PURVAR", // 158 Purevar "PURSTDABWP", // 159 Purestds "PURVARP", // 160 Purevars - NULL, // 161 Pmt2 - NULL, // 162 Pv2 - NULL, // 163 Fv2 - NULL, // 164 Term2 - NULL, // 165-- <- new quantity ? - NULL, // 166 D360 (US-Version, alternatively as in D360-function) - NULL, // 167 - NULL, // 168 - NULL, // 169 - NULL, // 170 - NULL, // 171 - NULL, // 172 - NULL, // 173 - NULL, // 174 - NULL, // 175 - NULL, // 176 - NULL, // 177 - NULL, // 178 - NULL, // 179 - NULL, // 180 - NULL, // 181 - NULL, // 182 - NULL, // 183 - NULL, // 184 - NULL, // 185 - NULL, // 186 - NULL, // 187 - NULL, // 188 - NULL, // 189 - NULL, // 190 - NULL, // 191 - NULL, // 192 - NULL, // 193 - NULL, // 194 - NULL, // 195 - NULL, // 196 - NULL, // 197 - NULL, // 198 - NULL, // 199 - NULL, // 200 - NULL, // 201 - NULL, // 202 - NULL, // 203 - NULL, // 204 - NULL, // 205 - NULL, // 206 TODO: ? - NULL, // 207 - NULL, // 208 - NULL, // 209 - NULL, // 210 - NULL, // 211 - NULL, // 212 - NULL, // 213 - NULL, // 214 - NULL, // 215 - NULL, // 216 - NULL, // 217 - NULL, // 218 - NULL, // 219 - NULL, // 220 - NULL, // 221 - NULL, // 222 - NULL, // 223 - NULL, // 224 - NULL, // 225 - NULL, // 226 - NULL, // 227 - NULL, // 228 - NULL, // 229 - NULL, // 230 - NULL, // 231 - NULL, // 232 - NULL, // 233 - NULL, // 234 - NULL, // 235 - NULL, // 236 - NULL, // 237 - NULL, // 238 - NULL, // 239 - NULL, // 240 - NULL, // 241 - NULL, // 242 - NULL, // 243 - NULL, // 244 - NULL, // 245 - NULL, // 246 - NULL, // 247 - NULL, // 248 - NULL, // 249 - NULL, // 250 - NULL, // 251 - NULL, // 252 - NULL, // 253 - NULL, // 254 - NULL // 255 TODO: ? + nullptr, // 161 Pmt2 + nullptr, // 162 Pv2 + nullptr, // 163 Fv2 + nullptr, // 164 Term2 + nullptr, // 165-- <- new quantity ? + nullptr, // 166 D360 (US-Version, alternatively as in D360-function) + nullptr, // 167 + nullptr, // 168 + nullptr, // 169 + nullptr, // 170 + nullptr, // 171 + nullptr, // 172 + nullptr, // 173 + nullptr, // 174 + nullptr, // 175 + nullptr, // 176 + nullptr, // 177 + nullptr, // 178 + nullptr, // 179 + nullptr, // 180 + nullptr, // 181 + nullptr, // 182 + nullptr, // 183 + nullptr, // 184 + nullptr, // 185 + nullptr, // 186 + nullptr, // 187 + nullptr, // 188 + nullptr, // 189 + nullptr, // 190 + nullptr, // 191 + nullptr, // 192 + nullptr, // 193 + nullptr, // 194 + nullptr, // 195 + nullptr, // 196 + nullptr, // 197 + nullptr, // 198 + nullptr, // 199 + nullptr, // 200 + nullptr, // 201 + nullptr, // 202 + nullptr, // 203 + nullptr, // 204 + nullptr, // 205 + nullptr, // 206 TODO: ? + nullptr, // 207 + nullptr, // 208 + nullptr, // 209 + nullptr, // 210 + nullptr, // 211 + nullptr, // 212 + nullptr, // 213 + nullptr, // 214 + nullptr, // 215 + nullptr, // 216 + nullptr, // 217 + nullptr, // 218 + nullptr, // 219 + nullptr, // 220 + nullptr, // 221 + nullptr, // 222 + nullptr, // 223 + nullptr, // 224 + nullptr, // 225 + nullptr, // 226 + nullptr, // 227 + nullptr, // 228 + nullptr, // 229 + nullptr, // 230 + nullptr, // 231 + nullptr, // 232 + nullptr, // 233 + nullptr, // 234 + nullptr, // 235 + nullptr, // 236 + nullptr, // 237 + nullptr, // 238 + nullptr, // 239 + nullptr, // 240 + nullptr, // 241 + nullptr, // 242 + nullptr, // 243 + nullptr, // 244 + nullptr, // 245 + nullptr, // 246 + nullptr, // 247 + nullptr, // 248 + nullptr, // 249 + nullptr, // 250 + nullptr, // 251 + nullptr, // 252 + nullptr, // 253 + nullptr, // 254 + nullptr // 255 TODO: ? }; return pNames[ n ]; diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx index 8df563a5ac01..d51c7a8aaadc 100644 --- a/sc/source/filter/lotus/lotimpop.cxx +++ b/sc/source/filter/lotus/lotimpop.cxx @@ -80,7 +80,7 @@ ImportLotus::~ImportLotus() { LotusContext &rContext = aConv.getContext(); delete rContext.pLotusRoot; - rContext.pLotusRoot = NULL; + rContext.pLotusRoot = nullptr; // no need 4 pLotusRoot anymore aLotImpSemaphore.release(); @@ -286,7 +286,7 @@ ScFormulaCell *ImportLotus::Formulacell( sal_uInt16 n ) pD->EnsureTable(aAddr.Tab()); pD->SetFormulaCell(aAddr, pCell); - return NULL; + return nullptr; } void ImportLotus::Read( OUString &r ) diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx index aec53f3d5542..7760fe2dc930 100644 --- a/sc/source/filter/lotus/tool.cxx +++ b/sc/source/filter/lotus/tool.cxx @@ -40,12 +40,12 @@ void PutFormString(LotusContext& rContext, SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char* pString) { // evaluate Label-Format - OSL_ENSURE( pString != NULL, "PutFormString(): pString == NULL" ); + OSL_ENSURE( pString != nullptr, "PutFormString(): pString == NULL" ); if (!pString) return; sal_Char cForm; - SvxHorJustifyItem* pJustify = NULL; + SvxHorJustifyItem* pJustify = nullptr; cForm = *pString; @@ -64,7 +64,7 @@ void PutFormString(LotusContext& rContext, SCCOL nCol, SCROW nRow, SCTAB nTab, s pString++; break; case '|': // printer command - pString = NULL; + pString = nullptr; break; case '\\': // repetition pJustify = rContext.pAttrRepeat; 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 diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index be14ec89b8e0..334efb38c947 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -71,7 +71,7 @@ orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(const char { OUString aTabName(sheet_name, sheet_name_length, RTL_TEXTENCODING_UTF8); if (!maDoc.appendSheet(aTabName)) - return NULL; + return nullptr; SCTAB nTab = maDoc.getSheetCount() - 1; maSheets.push_back(new ScOrcusSheet(maDoc, nTab, *this)); @@ -95,7 +95,7 @@ orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::get_sheet(const char* s SCTAB nTab = maDoc.getSheetIndex(aTabName); if (nTab < 0) // Sheet by that name not found. - return NULL; + return nullptr; // See if we already have an orcus sheet instance by that index. boost::ptr_vector<ScOrcusSheet>::iterator it = @@ -461,7 +461,7 @@ void ScOrcusSheet::cellInserted() os::iface::import_table* ScOrcusSheet::get_table() { - return NULL; + return nullptr; } os::iface::import_sheet_properties* ScOrcusSheet::get_sheet_properties() diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx index 284d7cc8b0f1..d0412b25c111 100644 --- a/sc/source/filter/orcus/xmlcontext.cxx +++ b/sc/source/filter/orcus/xmlcontext.cxx @@ -203,7 +203,7 @@ bool ScOrcusXMLContextImpl::loadXMLStructure(SvTreeListBox& rTreeCtrl, ScOrcusXM // Root element. orcus::xml_structure_tree::element aElem = aWalker.root(); - populateTree(rTreeCtrl, aWalker, aElem.name, aElem.repeat, NULL, rParam); + populateTree(rTreeCtrl, aWalker, aElem.name, aElem.repeat, nullptr, rParam); } catch (const std::exception&) { @@ -244,7 +244,7 @@ bool ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam) const char* path = aSysPath.getStr(); try { - orcus::orcus_xml filter(maNsRepo, &aFactory, NULL); + orcus::orcus_xml filter(maNsRepo, &aFactory, nullptr); // Define all used namespaces. std::for_each(rParam.maNamespaces.begin(), rParam.maNamespaces.end(), SetNamespaceAlias(filter, maNsRepo)); diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index 95e4db36549f..770aa6e8d9f6 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -189,7 +189,7 @@ ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, con FUNC_TYPE eType; DefTokenId eOc; double nFloatArray[ nBufSize ] = {0}; - const sal_Char* pExtString = 0; + const sal_Char* pExtString = nullptr; aCRD.InitFlags(); aSRD.InitFlags(); @@ -255,37 +255,37 @@ ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, con break; case FT_FuncFix0: - DoFunc( eOc, 0, NULL ); + DoFunc( eOc, 0, nullptr ); break; case FT_FuncFix1: - DoFunc( eOc, 1, NULL ); + DoFunc( eOc, 1, nullptr ); break; case FT_FuncFix2: - DoFunc( eOc, 2, NULL ); + DoFunc( eOc, 2, nullptr ); break; case FT_FuncFix3: - DoFunc( eOc, 3, NULL ); + DoFunc( eOc, 3, nullptr ); break; case FT_FuncFix4: - DoFunc( eOc, 4, NULL ); + DoFunc( eOc, 4, nullptr ); break; case FT_FuncFix5: - DoFunc( eOc, 5, NULL ); + DoFunc( eOc, 5, nullptr ); break; case FT_FuncFix6: - DoFunc( eOc, 6, NULL ); + DoFunc( eOc, 6, nullptr ); break; case FT_DLL:{ eOc = IndexToDLLId( nDLLArray[ nDLLCount ] ); sal_uInt8 nPar = nArgArray[ nArgCount ]; - DoFunc( eOc, nPar, NULL ); + DoFunc( eOc, nPar, nullptr ); nDLLCount++; nArgCount++; } @@ -313,7 +313,7 @@ ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, con sal_uInt8 nArgs; i++; nArgs = nFmla[ i ]; - DoFunc( eOc, nArgs, NULL ); + DoFunc( eOc, nArgs, nullptr ); } break; @@ -633,7 +633,7 @@ DefTokenId QProToSc::IndexToDLLId( sal_uInt16 nIndex ) const sal_Char* QProToSc::getString( sal_uInt8 nIndex ) { - const sal_Char* pExtString = 0; + const sal_Char* pExtString = nullptr; switch( nIndex ) { case 57: @@ -717,7 +717,7 @@ const sal_Char* QProToSc::getString( sal_uInt8 nIndex ) break; default: - pExtString = NULL; + pExtString = nullptr; break; } return pExtString; diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index d988d365dbe8..2b91ff2ad5ac 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -61,7 +61,7 @@ ScEEImport::ScEEImport( ScDocument* pDocP, const ScRange& rRange ) : maRange( rRange ), mpDoc( pDocP ), - mpParser( NULL ) + mpParser( nullptr ) { const ScPatternAttr* pPattern = mpDoc->GetPattern( maRange.aStart.Col(), maRange.aStart.Row(), maRange.aStart.Tab() ); @@ -174,7 +174,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu bool bSimple = ( pE->aSel.nStartPara == pE->aSel.nEndPara ); for (sal_uInt16 nId = EE_CHAR_START; nId <= EE_CHAR_END && bSimple; nId++) { - const SfxPoolItem* pItem = 0; + const SfxPoolItem* pItem = nullptr; SfxItemState eState = aSet.GetItemState( nId, true, &pItem ); if (eState == SfxItemState::DONTCARE) bSimple = false; @@ -242,18 +242,18 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu // HTML LATIN/CJK/CTL script type dependent const SfxPoolItem* pFont; if ( rESet.GetItemState( ATTR_FONT, false, &pFont) != SfxItemState::SET ) - pFont = 0; + pFont = nullptr; const SfxPoolItem* pHeight; if ( rESet.GetItemState( ATTR_FONT_HEIGHT, false, &pHeight) != SfxItemState::SET ) - pHeight = 0; + pHeight = nullptr; const SfxPoolItem* pWeight; if ( rESet.GetItemState( ATTR_FONT_WEIGHT, false, &pWeight) != SfxItemState::SET ) - pWeight = 0; + pWeight = nullptr; const SfxPoolItem* pPosture; if ( rESet.GetItemState( ATTR_FONT_POSTURE, false, &pPosture) != SfxItemState::SET ) - pPosture = 0; + pPosture = nullptr; // Number format - const SfxPoolItem* pNumFmt = NULL; + const SfxPoolItem* pNumFmt = nullptr; if ( rESet.GetItemState(ATTR_VALUE_FORMAT, false, &pNumFmt) == SfxItemState::SET ) rSet.Put(*pNumFmt); if ( pFont || pHeight || pWeight || pPosture ) @@ -342,7 +342,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu bool bTextFormat = false; - const SfxPoolItem* pNumFmt = NULL; + const SfxPoolItem* pNumFmt = nullptr; if (rSet.GetItemState(ATTR_VALUE_FORMAT, false, &pNumFmt) == SfxItemState::SET) { sal_uInt32 nNumFmt = static_cast<const SfxUInt32Item*>(pNumFmt)->GetValue(); @@ -610,7 +610,7 @@ ScEEParser::ScEEParser( EditEngine* pEditP ) : // pPool is foisted on SvxRTFParser at RTFIMP_START later on pPool->SetSecondaryPool( pDocPool ); pPool->FreezeIdRanges(); - NewActEntry( NULL ); + NewActEntry( nullptr ); } ScEEParser::~ScEEParser() @@ -623,7 +623,7 @@ ScEEParser::~ScEEParser() } // Don't delete Pool until the lists have been deleted - pPool->SetSecondaryPool( NULL ); + pPool->SetSecondaryPool( nullptr ); SfxItemPool::Free(pDocPool); SfxItemPool::Free(pPool); } diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxx index acfee57d5389..c9dc1c340fbe 100644 --- a/sc/source/filter/rtf/expbase.cxx +++ b/sc/source/filter/rtf/expbase.cxx @@ -28,7 +28,7 @@ ScExportBase::ScExportBase( SvStream& rStrmP, ScDocument* pDocP, aRange( rRangeP ), pDoc( pDocP ), pFormatter( pDocP->GetFormatTable() ), - pEditEngine( NULL ) + pEditEngine( nullptr ) { } diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx index f36f24109de8..96e000d17cb2 100644 --- a/sc/source/filter/rtf/rtfexp.cxx +++ b/sc/source/filter/rtf/rtfexp.cxx @@ -128,7 +128,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) case SVX_VER_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALC; break; case SVX_VER_JUSTIFY_BOTTOM: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALB; break; case SVX_VER_JUSTIFY_STANDARD: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALB; break; //! Bottom - default: pChar = NULL; break; + default: pChar = nullptr; break; } if ( pChar ) rStrm.WriteCharPtr( pChar ); diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx index 729a8fffce12..1fa1dbd635c4 100644 --- a/sc/source/filter/rtf/rtfparse.cxx +++ b/sc/source/filter/rtf/rtfparse.cxx @@ -36,8 +36,8 @@ ScRTFParser::ScRTFParser( EditEngine* pEditP ) : ScEEParser( pEditP ), mnCurPos(0), pColTwips( new ScRTFColTwips ), - pActDefault( NULL ), - pDefMerge( NULL ), + pActDefault( nullptr ), + pDefMerge( nullptr ), nStartAdjust( (sal_uLong)~0 ), nLastWidth(0), bNewDef( false ) @@ -177,7 +177,7 @@ IMPL_LINK_TYPED( ScRTFParser, RTFImportHdl, ImportInfo&, rInfo, void ) case RTFIMP_END: if ( rInfo.aSelection.nEndPos ) { // If still text: create last paragraph - pActDefault = NULL; + pActDefault = nullptr; rInfo.nToken = RTF_PAR; // EditEngine did not attach an empty paragraph anymore // which EntryEnd could strip @@ -230,8 +230,8 @@ void ScRTFParser::NewCellRow( ImportInfo* /*pInfo*/ ) pColTwips->insert( rD.nTwips ); } } - pDefMerge = NULL; - pActDefault = maDefaultList.empty() ? NULL : &maDefaultList[0]; + pDefMerge = nullptr; + pActDefault = maDefaultList.empty() ? nullptr : &maDefaultList[0]; mnCurPos = 0; OSL_ENSURE( pActDefault, "NewCellRow: pActDefault==0" ); } @@ -274,7 +274,7 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo ) nColCnt = 0; maDefaultList.clear(); - pDefMerge = NULL; + pDefMerge = nullptr; nLastToken = pInfo->nToken; mnCurPos = 0; } @@ -357,7 +357,7 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo ) pActEntry->aSel.nStartPara = pInfo->aSelection.nEndPara - 1; } - pActDefault = NULL; + pActDefault = nullptr; if (!maDefaultList.empty() && (mnCurPos+1) < maDefaultList.size()) pActDefault = &maDefaultList[++mnCurPos]; diff --git a/sc/source/filter/starcalc/collect.cxx b/sc/source/filter/starcalc/collect.cxx index dcc20858b474..dbb4c10f63a2 100644 --- a/sc/source/filter/starcalc/collect.cxx +++ b/sc/source/filter/starcalc/collect.cxx @@ -43,7 +43,7 @@ ScCollection::ScCollection(sal_uInt16 nLim, sal_uInt16 nDel) : nCount ( 0 ), nLimit ( nLim ), nDelta ( nDel ), - pItems ( NULL ) + pItems ( nullptr ) { if (nDelta > MAXDELTA) nDelta = MAXDELTA; @@ -61,7 +61,7 @@ ScCollection::ScCollection(const ScCollection& rCollection) nCount ( 0 ), nLimit ( 0 ), nDelta ( 0 ), - pItems ( NULL ) + pItems ( nullptr ) { *this = rCollection; } @@ -104,7 +104,7 @@ ScDataObject* ScCollection::At(sal_uInt16 nIndex) const if (nIndex < nCount) return pItems[nIndex]; else - return NULL; + return nullptr; } ScCollection& ScCollection::operator=( const ScCollection& r ) diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index 683445c8c4cd..7d3a56e77e64 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -875,8 +875,8 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc ) // Area-Parameter: { - ScRange* pRepeatRow = NULL; - ScRange* pRepeatCol = NULL; + ScRange* pRepeatRow = nullptr; + ScRange* pRepeatCol = nullptr; if ( pPage->ColRepeatStart >= 0 ) pRepeatCol = new ScRange( static_cast<SCCOL> (pPage->ColRepeatStart), 0, 0 ); @@ -928,14 +928,14 @@ ScDataObject* Sc10PageData::Clone() const Sc10Import::Sc10Import(SvStream& rStr, ScDocument* pDocument ) : rStream (rStr), pDoc (pDocument), - pFontCollection (NULL), - pNameCollection (NULL), - pPatternCollection (NULL), - pDataBaseCollection (NULL), + pFontCollection (nullptr), + pNameCollection (nullptr), + pPatternCollection (nullptr), + pDataBaseCollection (nullptr), nError (0), nShowTab (0) { - pPrgrsBar = NULL; + pPrgrsBar = nullptr; } Sc10Import::~Sc10Import() @@ -948,7 +948,7 @@ Sc10Import::~Sc10Import() delete pPatternCollection; delete pDataBaseCollection; - OSL_ENSURE( pPrgrsBar == NULL, + OSL_ENSURE( pPrgrsBar == nullptr, "*Sc10Import::Sc10Import(): Progressbar lebt noch!?" ); } @@ -987,7 +987,7 @@ sal_uLong Sc10Import::Import() delete pPrgrsBar; #if OSL_DEBUG_LEVEL > 0 - pPrgrsBar = NULL; + pPrgrsBar = nullptr; #endif return nError; @@ -1110,7 +1110,7 @@ void Sc10Import::LoadPatternCollection() Sc10PatternData* pPattern = pPatternCollection->At( i ); OUString aName( pPattern->Name, strlen(pPattern->Name), DEFCHARSET ); SfxStyleSheetBase* pStyle = pStylePool->Find( aName, SFX_STYLE_FAMILY_PARA ); - if( pStyle == NULL ) + if( pStyle == nullptr ) pStylePool->Make( aName, SFX_STYLE_FAMILY_PARA ); else { @@ -1120,7 +1120,7 @@ void Sc10Import::LoadPatternCollection() pStylePool->Make( aName, SFX_STYLE_FAMILY_PARA ); } pStyle = pStylePool->Find( aName, SFX_STYLE_FAMILY_PARA ); - if( pStyle != NULL ) + if( pStyle != nullptr ) { SfxItemSet &rItemSet = pStyle->GetItemSet(); // Font @@ -2111,12 +2111,12 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) { sal_uInt16 nPatternIndex = (aPattern.pData[i].Value & 0x00FF) - 1; Sc10PatternData* pPattern = pPatternCollection->At(nPatternIndex); - if (pPattern != NULL) + if (pPattern != nullptr) { ScStyleSheet* pStyle = static_cast<ScStyleSheet*>( pStylePool->Find( SC10TOSTRING( pPattern->Name ), SFX_STYLE_FAMILY_PARA) ); - if (pStyle != NULL) + if (pStyle != nullptr) pDoc->ApplyStyleAreaTab(Col, nStart, Col, nEnd, Tab, *pStyle); } } @@ -2137,7 +2137,7 @@ void Sc10Import::LoadAttr(Sc10ColAttr& rAttr) return; rAttr.pData = new (::std::nothrow) Sc10ColData[rAttr.Count]; - if (rAttr.pData == NULL) + if (rAttr.pData == nullptr) { nError = errOutOfMemory; rAttr.Count = 0; diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index 970459fe6dc4..bc23c549488b 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -81,7 +81,7 @@ static void lcl_WriteFixedString( XclExpStream& rStrm, const XclExpString& rStri static inline void lcl_GenerateGUID( sal_uInt8* pGUID, bool& rValidGUID ) { - rtl_createUuid( pGUID, rValidGUID ? pGUID : NULL, false ); + rtl_createUuid( pGUID, rValidGUID ? pGUID : nullptr, false ); rValidGUID = true; } @@ -350,17 +350,17 @@ void XclExpChTrHeader::SaveXml( XclExpXmlStream& rRevisionHeadersStrm ) sax_fastparser::FSHelperPtr pHeaders = rRevisionHeadersStrm.GetCurrentStream(); rRevisionHeadersStrm.WriteAttributes( XML_guid, lcl_GuidToOString( aGUID ).getStr(), - XML_lastGuid, NULL, // OOXTODO - XML_shared, NULL, // OOXTODO - XML_diskRevisions, NULL, // OOXTODO - XML_history, NULL, // OOXTODO - XML_trackRevisions, NULL, // OOXTODO - XML_exclusive, NULL, // OOXTODO - XML_revisionId, NULL, // OOXTODO - XML_version, NULL, // OOXTODO - XML_keepChangeHistory, NULL, // OOXTODO - XML_protected, NULL, // OOXTODO - XML_preserveHistory, NULL, // OOXTODO + XML_lastGuid, nullptr, // OOXTODO + XML_shared, nullptr, // OOXTODO + XML_diskRevisions, nullptr, // OOXTODO + XML_history, nullptr, // OOXTODO + XML_trackRevisions, nullptr, // OOXTODO + XML_exclusive, nullptr, // OOXTODO + XML_revisionId, nullptr, // OOXTODO + XML_version, nullptr, // OOXTODO + XML_keepChangeHistory, nullptr, // OOXTODO + XML_protected, nullptr, // OOXTODO + XML_preserveHistory, nullptr, // OOXTODO FSEND ); pHeaders->write( ">" ); } @@ -380,17 +380,17 @@ void XclExpXmlChTrHeaders::SaveXml( XclExpXmlStream& rStrm ) XML_xmlns, "http://schemas.openxmlformats.org/spreadsheetml/2006/main", FSNS(XML_xmlns, XML_r), "http://schemas.openxmlformats.org/officeDocument/2006/relationships", XML_guid, lcl_GuidToOString(maGUID).getStr(), - XML_lastGuid, NULL, // OOXTODO - XML_shared, NULL, // OOXTODO - XML_diskRevisions, NULL, // OOXTODO - XML_history, NULL, // OOXTODO - XML_trackRevisions, NULL, // OOXTODO - XML_exclusive, NULL, // OOXTODO - XML_revisionId, NULL, // OOXTODO - XML_version, NULL, // OOXTODO - XML_keepChangeHistory, NULL, // OOXTODO - XML_protected, NULL, // OOXTODO - XML_preserveHistory, NULL, // OOXTODO + XML_lastGuid, nullptr, // OOXTODO + XML_shared, nullptr, // OOXTODO + XML_diskRevisions, nullptr, // OOXTODO + XML_history, nullptr, // OOXTODO + XML_trackRevisions, nullptr, // OOXTODO + XML_exclusive, nullptr, // OOXTODO + XML_revisionId, nullptr, // OOXTODO + XML_version, nullptr, // OOXTODO + XML_keepChangeHistory, nullptr, // OOXTODO + XML_protected, nullptr, // OOXTODO + XML_preserveHistory, nullptr, // OOXTODO FSEND); pHeaders->write(">"); @@ -419,7 +419,7 @@ void XclExpXmlChTrHeader::SaveXml( XclExpXmlStream& rStrm ) OUString aRelId; sax_fastparser::FSHelperPtr pRevLogStrm = rStrm.CreateOutputStream( XclXmlUtils::GetStreamName("xl/revisions/", "revisionLog", mnLogNumber), - XclXmlUtils::GetStreamName(NULL, "revisionLog", mnLogNumber), + XclXmlUtils::GetStreamName(nullptr, "revisionLog", mnLogNumber), rStrm.GetCurrentStream()->getOutputStream(), "application/vnd.openxmlformats-officedocument.spreadsheetml.revisionLog+xml", CREATE_OFFICEDOC_RELATION_TYPE("revisionLog"), @@ -654,7 +654,7 @@ XclExpChTrAction::XclExpChTrAction( const XclExpChTrAction& rCopy ) : sUsername( rCopy.sUsername ), aDateTime( rCopy.aDateTime ), nIndex( 0 ), - pAddAction( 0 ), + pAddAction( nullptr ), bAccepted( rCopy.bAccepted ), rTabInfo( rCopy.rTabInfo ), rIdBuffer( rCopy.rIdBuffer ), @@ -672,7 +672,7 @@ XclExpChTrAction::XclExpChTrAction( sUsername( rAction.GetUser() ), aDateTime( rAction.GetDateTime() ), nIndex( 0 ), - pAddAction( NULL ), + pAddAction( nullptr ), bAccepted( rAction.IsAccepted() ), rTabInfo( rRoot.GetTabInfo() ), rIdBuffer( rTabIdBuffer ), @@ -750,8 +750,8 @@ sal_Size XclExpChTrAction::GetLen() const } XclExpChTrData::XclExpChTrData() : - pString( NULL ), - mpFormulaCell( NULL ), + pString( nullptr ), + mpFormulaCell( nullptr ), fValue( 0.0 ), nRKValue( 0 ), nType( EXC_CHTR_TYPE_EMPTY ), @@ -767,7 +767,7 @@ XclExpChTrData::~XclExpChTrData() void XclExpChTrData::Clear() { DELETEZ( pString ); - mpFormulaCell = NULL; + mpFormulaCell = nullptr; mxTokArr.reset(); maRefLog.clear(); fValue = 0.0; @@ -829,8 +829,8 @@ XclExpChTrCellContent::XclExpChTrCellContent( const XclExpChTrTabIdBuffer& rTabIdBuffer ) : XclExpChTrAction( rAction, rRoot, rTabIdBuffer, EXC_CHTR_OP_CELL ), XclExpRoot( rRoot ), - pOldData( 0 ), - pNewData( 0 ), + pOldData( nullptr ), + pNewData( nullptr ), aPosition( rAction.GetBigRange().MakeRange().aStart ) { sal_uInt32 nDummy32; @@ -864,7 +864,7 @@ void XclExpChTrCellContent::GetCellData( if (rScCell.isEmpty()) { delete rpData; - rpData = NULL; + rpData = nullptr; return; } @@ -897,7 +897,7 @@ void XclExpChTrCellContent::GetCellData( { sCellStr = rScCell.mpString->getString(); rpData->mpFormattedString = XclExpStringHelper::CreateCellString( - rRoot, sCellStr, NULL); + rRoot, sCellStr, nullptr); } else { @@ -906,12 +906,12 @@ void XclExpChTrCellContent::GetCellData( { sCellStr = ScEditUtil::GetString(*rScCell.mpEditText, &GetDoc()); rpData->mpFormattedString = XclExpStringHelper::CreateCellString( - rRoot, *rScCell.mpEditText, NULL, aLinkHelper); + rRoot, *rScCell.mpEditText, nullptr, aLinkHelper); } else { rpData->mpFormattedString = XclExpStringHelper::CreateCellString( - rRoot, EMPTY_OUSTRING, NULL); + rRoot, EMPTY_OUSTRING, nullptr); } } rpData->pString = new XclExpString( sCellStr, EXC_STR_DEFAULT, 32766 ); @@ -1013,11 +1013,11 @@ static void lcl_WriteCell( XclExpXmlStream& rStrm, sal_Int32 nElement, const ScA pStream->startElement( nElement, XML_r, XclXmlUtils::ToOString( rPosition ).getStr(), - XML_s, NULL, // OOXTODO: not supported + XML_s, nullptr, // OOXTODO: not supported XML_t, lcl_GetType( pData ), - XML_cm, NULL, // OOXTODO: not supported - XML_vm, NULL, // OOXTODO: not supported - XML_ph, NULL, // OOXTODO: not supported + XML_cm, nullptr, // OOXTODO: not supported + XML_vm, nullptr, // OOXTODO: not supported + XML_ph, nullptr, // OOXTODO: not supported FSEND ); switch( pData->nType ) { @@ -1057,18 +1057,18 @@ void XclExpChTrCellContent::SaveXml( XclExpXmlStream& rRevisionLogStrm ) pStream->startElement( XML_rcc, XML_rId, OString::number( GetActionNumber() ).getStr(), XML_ua, XclXmlUtils::ToPsz( GetAccepted () ), // OOXTODO? bAccepted == ua or ra; not sure. - XML_ra, NULL, // OOXTODO: RRD.fUndoAction? Or RRD.fAccepted? + XML_ra, nullptr, // OOXTODO: RRD.fUndoAction? Or RRD.fAccepted? XML_sId, OString::number( GetTabId( aPosition.Tab() ) ).getStr(), - XML_odxf, NULL, // OOXTODO: not supported - XML_xfDxf, NULL, // OOXTODO: not supported - XML_s, NULL, // OOXTODO: not supported - XML_dxf, NULL, // OOXTODO: not supported - XML_numFmtId, NULL, // OOXTODO: not supported - XML_quotePrefix, NULL, // OOXTODO: not supported - XML_oldQuotePrefix, NULL, // OOXTODO: not supported - XML_ph, NULL, // OOXTODO: not supported - XML_oldPh, NULL, // OOXTODO: not supported - XML_endOfListFormulaUpdate, NULL, // OOXTODO: not supported + XML_odxf, nullptr, // OOXTODO: not supported + XML_xfDxf, nullptr, // OOXTODO: not supported + XML_s, nullptr, // OOXTODO: not supported + XML_dxf, nullptr, // OOXTODO: not supported + XML_numFmtId, nullptr, // OOXTODO: not supported + XML_quotePrefix, nullptr, // OOXTODO: not supported + XML_oldQuotePrefix, nullptr, // OOXTODO: not supported + XML_ph, nullptr, // OOXTODO: not supported + XML_oldPh, nullptr, // OOXTODO: not supported + XML_endOfListFormulaUpdate, nullptr, // OOXTODO: not supported FSEND ); if( pOldData ) { @@ -1190,17 +1190,17 @@ void XclExpChTrInsert::SaveXml( XclExpXmlStream& rRevisionLogStrm ) pStream->startElement( XML_rrc, XML_rId, OString::number( GetActionNumber() ).getStr(), XML_ua, XclXmlUtils::ToPsz( GetAccepted () ), // OOXTODO? bAccepted == ua or ra; not sure. - XML_ra, NULL, // OOXTODO: RRD.fUndoAction? Or RRD.fAccepted? + XML_ra, nullptr, // OOXTODO: RRD.fUndoAction? Or RRD.fAccepted? XML_sId, OString::number( GetTabId( aRange.aStart.Tab() ) ).getStr(), XML_eol, XclXmlUtils::ToPsz10(mbEndOfList), XML_ref, XclXmlUtils::ToOString( aRange ).getStr(), XML_action, lcl_GetAction( nOpCode ), - XML_edge, NULL, // OOXTODO: ??? + XML_edge, nullptr, // OOXTODO: ??? FSEND ); // OOXTODO: does this handle XML_rfmt, XML_undo? XclExpChTrAction* pAction = GetAddAction(); - while( pAction != NULL ) + while( pAction != nullptr ) { pAction->SaveXml( rRevisionLogStrm ); pAction = pAction->GetAddAction(); @@ -1249,7 +1249,7 @@ void XclExpChTrInsertTab::SaveXml( XclExpXmlStream& rStrm ) pStream->singleElement( XML_ris, XML_rId, OString::number( GetActionNumber() ).getStr(), XML_ua, XclXmlUtils::ToPsz( GetAccepted () ), // OOXTODO? bAccepted == ua or ra; not sure. - XML_ra, NULL, // OOXTODO: RRD.fUndoAction? Or RRD.fAccepted? + XML_ra, nullptr, // OOXTODO: RRD.fUndoAction? Or RRD.fAccepted? XML_sheetId, OString::number( GetTabId( nTab ) ).getStr(), XML_name, XclXmlUtils::ToOString( GetTabInfo().GetScTabName( nTab ) ).getStr(), XML_sheetPosition, OString::number( nTab ).getStr(), @@ -1317,7 +1317,7 @@ void XclExpChTrMoveRange::SaveXml( XclExpXmlStream& rRevisionLogStrm ) pStream->startElement( XML_rm, XML_rId, OString::number( GetActionNumber() ).getStr(), XML_ua, XclXmlUtils::ToPsz( GetAccepted () ), // OOXTODO? bAccepted == ua or ra; not sure. - XML_ra, NULL, // OOXTODO: RRD.fUndoAction? Or RRD.fAccepted? + XML_ra, nullptr, // OOXTODO: RRD.fUndoAction? Or RRD.fAccepted? XML_sheetId, OString::number( GetTabId( aDestRange.aStart.Tab() ) ).getStr(), XML_source, XclXmlUtils::ToOString( aSourceRange ).getStr(), XML_destination, XclXmlUtils::ToOString( aDestRange ).getStr(), @@ -1325,7 +1325,7 @@ void XclExpChTrMoveRange::SaveXml( XclExpXmlStream& rRevisionLogStrm ) FSEND ); // OOXTODO: does this handle XML_rfmt, XML_undo? XclExpChTrAction* pAction = GetAddAction(); - while( pAction != NULL ) + while( pAction != nullptr ) { pAction->SaveXml( rRevisionLogStrm ); pAction = pAction->GetAddAction(); @@ -1368,11 +1368,11 @@ void XclExpChTr0x014A::SaveXml( XclExpXmlStream& rStrm ) pStream->startElement( XML_rfmt, XML_sheetId, OString::number( GetTabId( aRange.aStart.Tab() ) ).getStr(), - XML_xfDxf, NULL, // OOXTODO: not supported - XML_s, NULL, // OOXTODO: style + XML_xfDxf, nullptr, // OOXTODO: not supported + XML_s, nullptr, // OOXTODO: style XML_sqref, XclXmlUtils::ToOString( aRange ).getStr(), - XML_start, NULL, // OOXTODO: for string changes - XML_length, NULL, // OOXTODO: for string changes + XML_start, nullptr, // OOXTODO: for string changes + XML_length, nullptr, // OOXTODO: for string changes FSEND ); // OOXTODO: XML_dxf, XML_extLst @@ -1411,9 +1411,9 @@ void EndXmlElement::SaveXml( XclExpXmlStream& rStrm ) XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), aActionStack(), - pTabIdBuffer( NULL ), - pTempDoc( NULL ), - pHeader( NULL ), + pTabIdBuffer( nullptr ), + pTempDoc( nullptr ), + pHeader( nullptr ), bValidGUID( false ) { OSL_ENSURE( GetOldRoot().pTabId, "XclExpChangeTrack::XclExpChangeTrack - root data incomplete" ); @@ -1496,7 +1496,7 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) : DateTime aLastDateTime(DateTime::EMPTY); sal_uInt32 nIndex = 1; sal_Int32 nLogNumber = 1; - XclExpXmlChTrHeader* pCurHeader = NULL; + XclExpXmlChTrHeader* pCurHeader = nullptr; while (!aActionStack.empty()) { @@ -1542,7 +1542,7 @@ ScChangeTrack* XclExpChangeTrack::CreateTempChangeTrack() ScChangeTrack* pOrigChangeTrack = GetDoc().GetChangeTrack(); OSL_ENSURE( pOrigChangeTrack, "XclExpChangeTrack::CreateTempChangeTrack - no change track data" ); if( !pOrigChangeTrack ) - return NULL; + return nullptr; // create empty document pTempDoc = new ScDocument; @@ -1558,14 +1558,14 @@ ScChangeTrack* XclExpChangeTrack::CreateTempChangeTrack() OSL_ENSURE( nOrigCount == pTempDoc->GetTableCount(), "XclExpChangeTrack::CreateTempChangeTrack - table count mismatch" ); if( nOrigCount != pTempDoc->GetTableCount() ) - return NULL; + return nullptr; return pOrigChangeTrack->Clone(pTempDoc); } void XclExpChangeTrack::PushActionRecord( const ScChangeAction& rAction ) { - XclExpChTrAction* pXclAction = NULL; + XclExpChTrAction* pXclAction = nullptr; ScChangeTrack* pTempChangeTrack = pTempDoc->GetChangeTrack(); switch( rAction.GetType() ) { diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index 06c41e0bd473..75da05a11f29 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx @@ -35,8 +35,8 @@ XclImpChangeTrack::XclImpChangeTrack( const XclImpRoot& rRoot, const XclImpStrea XclImpRoot( rRoot ), aRecHeader(), sOldUsername(), - pChangeTrack( NULL ), - pStrm( NULL ), + pChangeTrack( nullptr ), + pStrm( nullptr ), nTabIdCount( 0 ), bGlobExit( false ), eNestedMode( nmBase ) @@ -104,7 +104,7 @@ void XclImpChangeTrack::DoInsertRange( const ScRange& rRange, bool bEndOfList ) void XclImpChangeTrack::DoDeleteRange( const ScRange& rRange ) { sal_uLong nFirst, nLast; - pChangeTrack->AppendDeleteRange( rRange, NULL, nFirst, nLast ); + pChangeTrack->AppendDeleteRange( rRange, nullptr, nFirst, nLast ); DoAcceptRejectAction( nFirst, nLast ); } @@ -199,7 +199,7 @@ void XclImpChangeTrack::ReadFormula( ScTokenArray*& rpTokenArray, const ScAddres // assume that this part is broken if(nRead != nFmlSize) { - rpTokenArray = NULL; + rpTokenArray = nullptr; pStrm->Ignore(1); return; } @@ -209,10 +209,10 @@ void XclImpChangeTrack::ReadFormula( ScTokenArray*& rpTokenArray, const ScAddres XclImpChTrFmlConverter aFmlConv( GetRoot(), *this ); // read the formula, 3D tab refs from extended data - const ScTokenArray* pArray = NULL; + const ScTokenArray* pArray = nullptr; aFmlConv.Reset( rPosition ); bool bOK = (aFmlConv.Convert( pArray, aFmlaStrm, nFmlSize, false ) == ConvOK); // JEG : Check This - rpTokenArray = (bOK && pArray) ? new ScTokenArray( *pArray ) : NULL; + rpTokenArray = (bOK && pArray) ? new ScTokenArray( *pArray ) : nullptr; pStrm->Ignore( 1 ); } @@ -268,7 +268,7 @@ void XclImpChangeTrack::ReadCell( break; case EXC_CHTR_TYPE_FORMULA: { - ScTokenArray* pTokenArray = NULL; + ScTokenArray* pTokenArray = nullptr; ReadFormula( pTokenArray, rPosition ); if( pStrm->IsValid() && pTokenArray ) { @@ -416,7 +416,7 @@ void XclImpChangeTrack::ReadChTrMoveRange() if( bValid ) { - pChangeTrack->AppendMove( aSourceRange, aDestRange, NULL ); + pChangeTrack->AppendMove( aSourceRange, aDestRange, nullptr ); DoAcceptRejectAction( pChangeTrack->GetLast() ); } } @@ -492,7 +492,7 @@ void XclImpChangeTrack::Apply() pChangeTrack->SetUseFixDateTime( false ); GetDoc().SetChangeTrack( pChangeTrack ); - pChangeTrack = NULL; + pChangeTrack = nullptr; ScChangeViewSettings aSettings; aSettings.SetShowChanges( true ); diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index f71f2f639fa8..0297cbfb07a0 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -96,13 +96,13 @@ XclEscherEx::XclEscherEx( const XclExpRoot& rRoot, XclExpObjectManager& rObjMgr, EscherEx( pParent ? pParent->mxGlobal : EscherExGlobalRef( new XclEscherExGlobal( rRoot ) ), &rStrm ), XclExpRoot( rRoot ), mrObjMgr( rObjMgr ), - pCurrXclObj( NULL ), - pCurrAppData( NULL ), + pCurrXclObj( nullptr ), + pCurrAppData( nullptr ), pTheClientData( new XclEscherClientData ), - pAdditionalText( NULL ), + pAdditionalText( nullptr ), nAdditionalText( 0 ), mnNextKey( 0 ), - mbIsRootDff( pParent == 0 ) + mbIsRootDff( pParent == nullptr ) { InsertPersistOffset( mnNextKey, 0 ); } @@ -191,7 +191,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape { if ( nAdditionalText ) nAdditionalText++; - bool bInGroup = ( pCurrXclObj != NULL ); + bool bInGroup = ( pCurrXclObj != nullptr ); if ( bInGroup ) { // stacked recursive group object if ( !pCurrAppData->IsStackedGroup() ) @@ -209,7 +209,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape pCurrXclObj = new XclObjAny( mrObjMgr, rxShape, &GetDocRef() ); // just what is it?!? else { - pCurrXclObj = NULL; + pCurrXclObj = nullptr; sal_uInt16 nObjType = pObj->GetObjIdentifier(); if( nObjType == OBJ_OLE2 ) @@ -225,7 +225,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape if ( SotExchange::IsChart( aObjClsId ) ) { // yes, it's a chart diagram mrObjMgr.AddObj( new XclExpChartObj( mrObjMgr, rxShape, pChildAnchor ) ); - pCurrXclObj = NULL; // no metafile or whatsoever + pCurrXclObj = nullptr; // no metafile or whatsoever } else // metafile and OLE object pCurrXclObj = new XclObjOle( mrObjMgr, *pObj ); @@ -269,7 +269,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape { if ( !mrObjMgr.AddObj( pCurrXclObj ) ) { // maximum count reached, object got deleted - pCurrXclObj = NULL; + pCurrXclObj = nullptr; } else { @@ -358,7 +358,7 @@ void XclEscherEx::EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID ) XclObj* pLastObj = mrObjMgr.RemoveLastObj(); OSL_ENSURE( pLastObj == pCurrXclObj, "XclEscherEx::EndShape - wrong object" ); DELETEZ( pLastObj ); - pCurrXclObj = 0; + pCurrXclObj = nullptr; } if( pCurrXclObj ) @@ -378,8 +378,8 @@ void XclEscherEx::EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID ) DeleteCurrAppData(); if (aStack.empty()) { - pCurrXclObj = NULL; - pCurrAppData = NULL; + pCurrXclObj = nullptr; + pCurrAppData = nullptr; } else { @@ -395,7 +395,7 @@ EscherExHostAppData* XclEscherEx::EnterAdditionalTextGroup() { nAdditionalText = 1; pAdditionalText = static_cast<XclEscherClientTextbox*>( pCurrAppData->GetClientTextbox() ); - pCurrAppData->SetClientTextbox( NULL ); + pCurrAppData->SetClientTextbox( nullptr ); return pCurrAppData; } @@ -425,7 +425,7 @@ std::unique_ptr<XclExpOcxControlObj> XclEscherEx::CreateOCXCtrlObj( Reference< X // writes from xCtrlModel into mxCtlsStrm, raw class name returned in aClassName Reference< XOutputStream > xOut( new utl::OSeekableOutputStreamWrapper( *mxCtlsStrm ) ); - Reference< css::frame::XModel > xModel( GetDocShell() ? GetDocShell()->GetModel() : NULL ); + Reference< css::frame::XModel > xModel( GetDocShell() ? GetDocShell()->GetModel() : nullptr ); if( xModel.is() && xOut.is() && oox::ole::MSConvertOCXControls::WriteOCXExcelKludgeStream( xModel, xOut, xCtrlModel, xShape->getSize(), aClassName ) ) { sal_uInt32 nStrmSize = static_cast< sal_uInt32 >( mxCtlsStrm->Tell() - nStrmStart ); @@ -552,7 +552,7 @@ ShapeInteractionHelper::PopulateShapeInteractionInfo( XclExpObjectManager& rObjM { try { - SvMemoryStream* pMemStrm = NULL; + SvMemoryStream* pMemStrm = nullptr; OUString sHyperLink; OUString sMacro; if ( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( ::GetSdrObjectFromXShape( xShape ) ) ) diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 31acde1a86dd..5a76ae87ef27 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -99,7 +99,7 @@ XclExpObjList::XclExpObjList( const XclExpRoot& rRoot, XclEscherEx& rEscherEx ) XclExpRoot( rRoot ), mnScTab( rRoot.GetCurrScTab() ), mrEscherEx( rEscherEx ), - pSolverContainer( 0 ) + pSolverContainer( nullptr ) { pMsodrawingPerSheet = new XclExpMsoDrawing( rEscherEx ); // open the DGCONTAINER and the patriarch group shape @@ -342,8 +342,8 @@ void XclExpObjList::ResetCounters() XclObj::XclObj( XclExpObjectManager& rObjMgr, sal_uInt16 nObjType, bool bOwnEscher ) : XclExpRecord( EXC_ID_OBJ, 26 ), mrEscherEx( rObjMgr.GetEscherEx() ), - pClientTextbox( NULL ), - pTxo( NULL ), + pClientTextbox( nullptr ), + pTxo( nullptr ), mnObjType( nObjType ), nObjId(0), nGrbit( 0x6011 ), // AutoLine, AutoFill, Printable, Locked @@ -799,7 +799,7 @@ XclTxo::XclTxo( const XclExpRoot& rRoot, const EditTextObject& rEditObj, SdrObje if( !aParaText.isEmpty() ) { SfxItemSet aSet( rEditObj.GetParaAttribs( 0)); - const SfxPoolItem* pItem = NULL; + const SfxPoolItem* pItem = nullptr; if( aSet.GetItemState( EE_PARA_JUST, true, &pItem ) == SfxItemState::SET ) { SvxAdjust eEEAlign = static_cast< const SvxAdjustItem& >( *pItem ).GetAdjust(); @@ -1164,7 +1164,7 @@ void XclObjAny::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr pDrawing = rStrm.GetCurrentStream(); - ShapeExport aDML( XML_xdr, pDrawing, NULL, &rStrm, DrawingML::DOCUMENT_XLSX ); + ShapeExport aDML( XML_xdr, pDrawing, nullptr, &rStrm, DrawingML::DOCUMENT_XLSX ); std::shared_ptr<oox::drawingml::URLTransformer> pURLTransformer(new ScURLTransformer(*mpDoc)); aDML.SetURLTranslator(pURLTransformer); @@ -1250,7 +1250,7 @@ void ExcBundlesheet8::SaveXml( XclExpXmlStream& rStrm ) OUString sId; rStrm.CreateOutputStream( XclXmlUtils::GetStreamName( "xl/", "worksheets/sheet", nTab+1), - XclXmlUtils::GetStreamName( NULL, "worksheets/sheet", nTab+1), + XclXmlUtils::GetStreamName( nullptr, "worksheets/sheet", nTab+1), rStrm.GetCurrentStream()->getOutputStream(), "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet", 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() ) { |