diff options
authorMichael Stahl <>2017-04-28 13:26:01 +0200
committerMarkus Mohrhard <>2017-05-02 18:57:01 +0200
commit6d5b1ba501771cfa693b46d82ec88333302f02bb (patch)
parent67fe6ae146385d880c47c25a289e9a6b54333b1c (diff)
tdf#107474 sw: fix crash when deleting header with active SdrObject
The problem is that the SdrView's text edit mode remains active when the header is deleted, which deletes the active SdrObject that is anchored in the header. Then the next call to SdrBeginTextEdit() will call SdrEndTextEdit() but the mxTextEditObj WeakReference is null then and so the cleanup code that resets the SdrOutliner's UndoManager is not called, but then the SdrOutliner is deleted. What's really horrible about this is that while text editing is active, both SdrObjEditView and ImpEditEngine consider themselves the exclusive owner of SwDoc's UndoManager. (regression from 12a4200e8ff7f045efcc7e9d15a24b15b248c437 and d7b7c9fdfe63deec26c420efc3ff1fd73c21bb27) Change-Id: I17c5165a03d2de1eaba8a335dfbfded56573f8a2 (cherry picked from commit 7f207fca577ef820be2aec0a442df7e8ab6e14a6) Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <> (cherry picked from commit e07c2c3861f47946ed72fc9b67aafeaa8598468d) Reviewed-on: Reviewed-by: Christian Lohmaier <> Reviewed-by: Markus Mohrhard <> Tested-by: Markus Mohrhard <>
1 files changed, 5 insertions, 0 deletions
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 7695865d8e16..1f8ae7ba9023 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1765,6 +1765,11 @@ void SwWrtShell::SetReadonlyOption(bool bSet)
void SwWrtShell::ChangeHeaderOrFooter(
const OUString& rStyleName, bool bHeader, bool bOn, bool bShowWarning)
+ SdrView *const pSdrView = GetDrawView();
+ if (pSdrView && pSdrView->IsTextEdit())
+ { // tdf#107474 deleting header may delete active drawing object
+ pSdrView->SdrEndTextEdit(true);
+ }
StartUndo( UNDO_HEADER_FOOTER ); // #i7983#