diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-04-24 11:37:44 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-04-24 12:22:03 +0200 |
commit | 479031567dbc489292eff483fafaae2ad192ff84 (patch) | |
tree | 6846e995061ccdf5994c9b71f7c05ba59960074f /sw | |
parent | f00be42dbf3f9238313a914818cbee9edf708ffa (diff) |
sw: revert type changes in SwFrm subclass destructors
These should be unnecessary now with DestroyImpl() and might break stuff.
Reverts commits 5a934b2c6085d4e397e1466f8cd6a813f3c2d9d6 and
db2c0dc78f11c2764f16e7ca4edaf2cdffc56c64.
Change-Id: Ida880dfed9fa6445b3530e2c4788fd4974c8f9c7
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/layout/fly.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/layout/pagechg.cxx | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 3cac9d76fc74..3d00dcfc6ec7 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -269,10 +269,6 @@ void SwFlyFrm::DestroyImpl() FinitDrawObj(); - // Hack to make sure code called from base ~SwLayoutFrm does not interpret - // this as a SwFlyFrm (which it no longer is by then): - mnFrmType = FRM_UNUSED; - SwLayoutFrm::DestroyImpl(); } diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index d49c1e4e4f67..9e0475c5971e 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -264,10 +264,6 @@ void SwPageFrm::DestroyImpl() } } - // Hack to make sure code called from base ~SwFtnBossFrm does not interpret - // this as a SwPageFrm (which it no longer is by then): - mnFrmType = FRM_UNUSED; - SwFtnBossFrm::DestroyImpl(); } |