diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-11-10 21:56:47 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-11-11 00:07:53 +0100 |
| commit | 0b0d80bd30f918d8c8f3eb6926ced2a562ec912a (patch) | |
| tree | 6c50ba83a9cb52c4a5daabc3ba23f6f720018316 | |
| parent | 6849dfca92506a112a89f1839b268a3a119be50b (diff) | |
remove IsInDocDTOR() as a public member
Change-Id: Ic4d29d6904d5631dbf2f755886ac9122c303553f
| -rw-r--r-- | sw/inc/calbck.hxx | 1 | ||||
| -rw-r--r-- | sw/source/core/attr/calbck.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/table/swtable.cxx | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index ecf400b9de49..b56575d14589 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -194,7 +194,6 @@ public: void SetInSwFntCache( bool bNew ) { m_bInSwFntCache = bNew; } void SetInDocDTOR() { m_bInDocDTOR = true; } bool IsModifyLocked() const { return m_bModifyLocked; } - bool IsInDocDTOR() const { return m_bInDocDTOR; } bool IsInCache() const { return m_bInCache; } bool IsInSwFntCache() const { return m_bInSwFntCache; } diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx index 0ba6a74558e2..fb6654eb8df3 100644 --- a/sw/source/core/attr/calbck.cxx +++ b/sw/source/core/attr/calbck.cxx @@ -89,7 +89,7 @@ SwModify::~SwModify() if( m_pWriterListeners ) { // there are depending objects - if( IsInDocDTOR() ) + if( m_bInDocDTOR ) { // If the document gets destroyed anyway, just tell clients to // forget me so that they don't try to get removed from my list diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index f27f315c1a61..8cb9d0eb1e72 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -2171,7 +2171,7 @@ void ChgNumToText( SwTableBox& rBox, sal_uLong nFormat ) // for detection of modifications (mainly TableBoxAttribute) void SwTableBoxFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) { - if( !IsModifyLocked() && !IsInDocDTOR() ) + if( !IsModifyLocked() && GetDoc() && !GetDoc()->IsInDtor()) { const SwTableBoxNumFormat *pNewFormat = nullptr; const SwTableBoxFormula *pNewFormula = nullptr; |