diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-04-23 20:57:38 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-04-24 12:22:01 +0200 |
| commit | 4e353190b68f3a89c43b3861444dd2dd6b02a6e0 (patch) | |
| tree | 9d554866f2adc625efd15d0df0510de5bace8963 | |
| parent | d194074aa34e3724dd9b93fbc81bf2ba793cd37a (diff) | |
tdf#90820: Revert "Hack to make an in-destruction SwFlyInCntFrm ...
... no longer claim to be one"
This reverts commit e49ca69747e9e905dbb00bbd5a7ea85331607a04.
The problem is that superclass dtor does not dispose the accessible object
for the SwFlyInCntFrm because in ~SwFlyFrm the IsAccessibleFrm() and
IsFlyInCntFrm() return false.
Change-Id: Id7018d50f30da5f8e2f0df307453a55a5f2cff69
| -rw-r--r-- | sw/source/core/layout/flyincnt.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx index 71f235f04716..333ed61b4d2a 100644 --- a/sw/source/core/layout/flyincnt.cxx +++ b/sw/source/core/layout/flyincnt.cxx @@ -48,10 +48,6 @@ SwFlyInCntFrm::~SwFlyInCntFrm() SwRect aTmp( GetObjRectWithSpaces() ); SwFlyInCntFrm::NotifyBackground( FindPageFrm(), aTmp, PREP_FLY_LEAVE ); } - - // Hack to make sure code called from base ~SwFlyFrm does not interpret this - // as a SwFlyFrm (which it no longer is by then): - mnFrmType = FRM_UNUSED; } // #i28701# |