summaryrefslogtreecommitdiff
path: root/sw/source/core/tox
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:25:48 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:53 +0100
commit01b49802c7cda7fd4d5ba71263cef7bc95234b89 (patch)
treeb8d92f1c6abf5ac548d0bcb0c581ebfcffd8bfac /sw/source/core/tox
parent6cd7bf2043146a630925a2e49336f02c802f707a (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I01e11fa956a249974e77dce9deebe79311f098d0
Diffstat (limited to 'sw/source/core/tox')
-rw-r--r--sw/source/core/tox/tox.cxx14
-rw-r--r--sw/source/core/tox/txmsrt.cxx14
2 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index a0b93093f701..2285d9150b89 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -96,9 +96,9 @@ TYPEINIT2( SwTOXMark, SfxPoolItem, SwClient ); // fuers rtti
/// pool default constructor
SwTOXMark::SwTOXMark()
: SfxPoolItem( RES_TXTATR_TOXMARK )
- , SwModify( 0 )
+ , SwModify( nullptr )
,
- m_pTextAttr( 0 ), m_nLevel( 0 ),
+ m_pTextAttr( nullptr ), m_nLevel( 0 ),
m_bAutoGenerated(false),
m_bMainEntry(false)
{
@@ -108,7 +108,7 @@ SwTOXMark::SwTOXMark( const SwTOXType* pTyp )
: SfxPoolItem( RES_TXTATR_TOXMARK )
, SwModify( const_cast<SwTOXType*>(pTyp) )
,
- m_pTextAttr( 0 ), m_nLevel( 0 ),
+ m_pTextAttr( nullptr ), m_nLevel( 0 ),
m_bAutoGenerated(false),
m_bMainEntry(false)
{
@@ -122,7 +122,7 @@ SwTOXMark::SwTOXMark( const SwTOXMark& rCopy )
m_aTextReading( rCopy.m_aTextReading ),
m_aPrimaryKeyReading( rCopy.m_aPrimaryKeyReading ),
m_aSecondaryKeyReading( rCopy.m_aSecondaryKeyReading ),
- m_pTextAttr( 0 ), m_nLevel( rCopy.m_nLevel ),
+ m_pTextAttr( nullptr ), m_nLevel( rCopy.m_nLevel ),
m_bAutoGenerated( rCopy.m_bAutoGenerated),
m_bMainEntry(rCopy.m_bMainEntry)
{
@@ -155,7 +155,7 @@ void SwTOXMark::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew)
NotifyClients(pOld, pNew);
if (pOld && (RES_REMOVE_UNO_OBJECT == pOld->Which()))
{ // invalidate cached uno object
- SetXTOXMark(css::uno::Reference<css::text::XDocumentIndexMark>(0));
+ SetXTOXMark(css::uno::Reference<css::text::XDocumentIndexMark>(nullptr));
}
}
@@ -199,7 +199,7 @@ void SwTOXMark::InsertTOXMarks( SwTOXMarks& aMarks, const SwTOXType& rType )
// Manage types of TOX
SwTOXType::SwTOXType( TOXTypes eTyp, const OUString& rName )
- : SwModify(0),
+ : SwModify(nullptr),
m_aName(rName),
m_eType(eTyp)
{
@@ -369,7 +369,7 @@ void SwForm::AdjustTabStops( SwDoc& rDoc ) // #i21237#
for ( sal_uInt16 nLevel = 1; nLevel < nFormMax; ++nLevel )
{
SwTextFormatColl* pColl = rDoc.FindTextFormatCollByName( GetTemplate(nLevel) );
- if( pColl == NULL )
+ if( pColl == nullptr )
{
// Paragraph Style for this level has not been created.
// --> No need to propagate default values
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index c943f61912f0..4c3e07b3e728 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -131,7 +131,7 @@ SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwContentNode* pNd,
const SwTextTOXMark* pMark,
const SwTOXInternational* pInter,
const lang::Locale* pLocale )
- : pTOXNd( 0 ), pTextMark( pMark ), pTOXIntl( pInter ),
+ : pTOXNd( nullptr ), pTextMark( pMark ), pTOXIntl( pInter ),
nPos( 0 ), nCntPos( 0 ), nType( static_cast<sal_uInt16>(nTyp) ), bValidText( false )
{
if ( pLocale )
@@ -158,7 +158,7 @@ SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwContentNode* pNd,
{
// Then get the 'anchor' (body) position
Point aPt;
- const SwContentFrm* pFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+ const SwContentFrm* pFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, nullptr, false );
if( pFrm )
{
SwPosition aPos( *pNd );
@@ -405,7 +405,7 @@ SwTOXCustom::SwTOXCustom(const TextAndReading& rKey,
sal_uInt16 nLevel,
const SwTOXInternational& rIntl,
const lang::Locale& rLocale )
- : SwTOXSortTabBase( TOX_SORT_CUSTOM, 0, 0, &rIntl, &rLocale ),
+ : SwTOXSortTabBase( TOX_SORT_CUSTOM, nullptr, nullptr, &rIntl, &rLocale ),
m_aKey(rKey), nLev(nLevel)
{
}
@@ -482,7 +482,7 @@ sal_uInt16 SwTOXContent::GetLevel() const
// Watch out for OLE/graphics when sorting!
// The position must not come from the document, but from the "anchor"!
SwTOXPara::SwTOXPara( const SwContentNode& rNd, SwTOXElement eT, sal_uInt16 nLevel, const OUString& sSeqName )
- : SwTOXSortTabBase( TOX_SORT_PARA, &rNd, 0, 0 ),
+ : SwTOXSortTabBase( TOX_SORT_PARA, &rNd, nullptr, nullptr ),
eType( eT ),
m_nLevel(nLevel),
nStartIndex(0),
@@ -594,7 +594,7 @@ OUString SwTOXPara::GetURL() const
case nsSwTOXElement::TOX_OLE: pStr = "ole"; break;
case nsSwTOXElement::TOX_GRAPHIC: pStr = "graphic"; break;
case nsSwTOXElement::TOX_FRAME: pStr = "frame"; break;
- default: pStr = 0;
+ default: pStr = nullptr;
}
if( pStr )
aText += OUString::createFromAscii( pStr );
@@ -614,7 +614,7 @@ OUString SwTOXPara::GetURL() const
// Table
SwTOXTable::SwTOXTable( const SwContentNode& rNd )
- : SwTOXSortTabBase( TOX_SORT_TABLE, &rNd, 0, 0 ),
+ : SwTOXSortTabBase( TOX_SORT_TABLE, &rNd, nullptr, nullptr ),
nLevel(FORM_ALPHA_DELIMITTER)
{
}
@@ -660,7 +660,7 @@ OUString SwTOXTable::GetURL() const
SwTOXAuthority::SwTOXAuthority( const SwContentNode& rNd,
SwFormatField& rField, const SwTOXInternational& rIntl ) :
- SwTOXSortTabBase( TOX_SORT_AUTHORITY, &rNd, 0, &rIntl ),
+ SwTOXSortTabBase( TOX_SORT_AUTHORITY, &rNd, nullptr, &rIntl ),
m_rField(rField)
{
if(rField.GetTextField())