diff options
| author | Arnaud Versini <arnaud.versini@libreoffice.org> | 2013-11-19 12:36:33 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-20 09:45:21 -0600 |
| commit | 394a1ee9a0f5438bda41cbf4ecf065b9b278b4c4 (patch) | |
| tree | 298315471e894f3136467ab820c654e5c9c1dd9c | |
| parent | b533869803537ca8f95fb3d7543ccaf067fdbbe0 (diff) | |
Writer : Fix fdo#71694 by clearing old anchor frame before setting new
Needed as otherwise AnchoredObjects can be in more than one SwLayoutFrm.
See also 7eae50f9ff5877ef880be9a85d3f7e52b1fec49f ( Access by AnchoredObject of a deleted SwLayoutFrm ).
Change-Id: I54582d6f9fb8b6f853352af27706faabe610874b
Reviewed-on: https://gerrit.libreoffice.org/6720
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 7726339a648ac94bb7c365950f23dabec5aa52e7)
Reviewed-on: https://gerrit.libreoffice.org/6732
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sw/source/core/layout/anchoredobject.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index 77cf548f6428..9e6dc5e351d4 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -246,8 +246,9 @@ void SwAnchoredObject::ResetLastCharRectHeight() // ============================================================================= void SwAnchoredObject::SetVertPosOrientFrm( const SwLayoutFrm& _rVertPosOrientFrm ) { - mpVertPosOrientFrm = &_rVertPosOrientFrm; + ClearVertPosOrientFrm(); + mpVertPosOrientFrm = &_rVertPosOrientFrm; const_cast<SwLayoutFrm*>(mpVertPosOrientFrm)->SetVertPosOrientFrmFor(this); // #i28701# - take over functionality of deleted method |