summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2015-03-24 22:50:34 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2015-03-25 10:25:08 +0100
commitabb863a3320d07b0b1616f81e4c2e2ec082245b7 (patch)
tree1ef51ae4ee99575272ddb800c95336f6f4d3c3c2
parentb4531de9387f551d9c6876f5bfe26bdb7c080a15 (diff)
rename IsLastDepend HasOnlyOneListener
Change-Id: Ibb2a3ee596402661f2c593754061deb8c54a2f76
-rw-r--r--sw/inc/calbck.hxx2
-rw-r--r--sw/source/core/doc/tblrwcl.cxx2
-rw-r--r--sw/source/core/fields/ddefld.cxx2
-rw-r--r--sw/source/core/fields/ddetbl.cxx2
-rw-r--r--sw/source/core/layout/colfrm.cxx2
-rw-r--r--sw/source/core/txtnode/atrfld.cxx2
6 files changed, 6 insertions, 6 deletions
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 04cd54b1f890..e64d7ca32ee6 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -208,7 +208,7 @@ public:
bool IsInSwFntCache() const { return m_bInSwFntCache; }
void CheckCaching( const sal_uInt16 nWhich );
- bool IsLastDepend() { return m_pWriterListeners && m_pWriterListeners->IsLast(); }
+ bool HasOnlyOneListener() { return m_pWriterListeners && m_pWriterListeners->IsLast(); }
};
// SwDepend
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 1e3eaac8c775..ceef57491677 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -4449,7 +4449,7 @@ void SwShareBoxFmts::ChangeFrmFmt( SwTableBox* pBox, SwTableLine* pLn,
pOld->Add( &aCl );
pLn->ChgFrmFmt( static_cast<SwTableLineFmt*>(&rFmt) );
}
- if( pOld && pOld->IsLastDepend() )
+ if( pOld && pOld->HasOnlyOneListener() )
{
RemoveFormat( *pOld );
delete pOld;
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index dd89ca6da4af..025ecc3deb82 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -378,7 +378,7 @@ SwDDEField::SwDDEField( SwDDEFieldType* pInitType )
SwDDEField::~SwDDEField()
{
- if( GetTyp()->IsLastDepend() )
+ if( GetTyp()->HasOnlyOneListener() )
static_cast<SwDDEFieldType*>(GetTyp())->Disconnect();
}
diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index 277438e0686a..268f248b1140 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -71,7 +71,7 @@ SwDDETable::~SwDDETable()
pFldTyp->DecRefCnt();
// If it is the last dependent of the "deleted field" than delete it finally
- if( pFldTyp->IsDeleted() && pFldTyp->IsLastDepend() )
+ if( pFldTyp->IsDeleted() && pFldTyp->HasOnlyOneListener() )
{
pFldTyp->Remove( &aDepend );
delete pFldTyp;
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index e139895fca66..c012feac54f0 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -45,7 +45,7 @@ SwColumnFrm::~SwColumnFrm()
{
SwFrmFmt *pFmt = GetFmt();
SwDoc *pDoc;
- if ( !(pDoc = pFmt->GetDoc())->IsInDtor() && pFmt->IsLastDepend() )
+ if ( !(pDoc = pFmt->GetDoc())->IsInDtor() && pFmt->HasOnlyOneListener() )
{
//I'm the only one, delete the format.
//Get default format before, so the base class can cope with it.
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index 34aee5e32c23..b3a3b31bd936 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -123,7 +123,7 @@ SwFmtFld::~SwFmtFld()
delete mpField;
// bei einige FeldTypen muessen wir den FeldTypen noch loeschen
- if( pType && pType->IsLastDepend() )
+ if( pType && pType->HasOnlyOneListener() )
{
bool bDel = false;
switch( pType->Which() )