diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-11-08 14:53:42 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-08 17:18:29 +0000 |
| commit | b376eacdfae11f5d39eb7011efe67390d9f495e7 (patch) | |
| tree | 007ff21462fbbfd42beede45b3143b7e87b32542 /sw/inc/anchoredobject.hxx | |
| parent | 050d2ceb534f17f3e865f5f8118bb95a4749de9c (diff) | |
Access by AnchoredObject of a deleted SwLayoutFrm
as demonstrated by abi10075-1.doc
just register the AnchoredObjects in the SwLayoutFrm and
inform them when the SwLayoutFrm goes away.
This crash was triggered by "1e113cb7604e1509e7d598a9be329f1f7b6e9322" import
different first page header/footer from doc. But that commit is blameless.
Change-Id: Ia079cc635a81dff1ccbf740641f441aa784328a4
Diffstat (limited to 'sw/inc/anchoredobject.hxx')
| -rw-r--r-- | sw/inc/anchoredobject.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx index 7e304fdac829..da66dcafe814 100644 --- a/sw/inc/anchoredobject.hxx +++ b/sw/inc/anchoredobject.hxx @@ -269,15 +269,12 @@ class SW_DLLPUBLIC SwAnchoredObject // accessors to data of position calculation: // frame vertical position is orient at - inline const SwLayoutFrm* GetVertPosOrientFrm() const + const SwLayoutFrm* GetVertPosOrientFrm() const { return mpVertPosOrientFrm; } // method to clear member <mpVertPosOrientFrm> - inline void ClearVertPosOrientFrm() - { - mpVertPosOrientFrm = 0L; - } + void ClearVertPosOrientFrm(); /** check anchor character rectangle and top of line |