diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:22:39 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:36 +0100 |
commit | de29ac09535d814e4be7e1bf0f10beb9f0f847e3 (patch) | |
tree | 139f75d657cb825622e812254b8b7df4e509140b /sc/source/filter/excel/xecontent.cxx | |
parent | 60c40af090e420a8619b5236bde1ff4ef79100c6 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I765d2a600f9c57da50c85354688e3ae796750d94
Diffstat (limited to 'sc/source/filter/excel/xecontent.cxx')
-rw-r--r-- | sc/source/filter/excel/xecontent.cxx | 30 |
1 files changed, 15 insertions, 15 deletions
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 |