diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2019-07-02 08:54:02 -0800 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-07-08 16:46:21 +0200 |
| commit | 3597e95c6ec921fff04fc6387ff9427be54302bc (patch) | |
| tree | 7801c67652966698a9cd93b53f9d6d851bf6c11e | |
| parent | d726d525924a1869fd0f0e65504de6596eb40e35 (diff) | |
tdf#125863 Rework tdf#107593 so header footer delete doesn't crash
Header footer delete from the last page when last page is unneeded
(stack level 24 SwRootFrame::RemoveSuperfluous /// remove pages that are
not needed at all) causes SwFrameMenuButtonBase::dispose() which sets
m_pFrame to nullptr which causes crash when IsEmptyHeaderFooter calls
GetPageFrame(). Doing ToggleHeaderFooterEdit() when header or footer
deletion is accepted in SwWrtShell::ChangeHeaderOrFooter avoids the
crash. SwHeaderFooterWin is also disposed which would make the
GrabFocusToDocument crash if it got that far so use the shell window
which is still valid here to GrabFocusToDocument.
Change-Id: Iaced23e6716442671c5ea29b79be178f4fc836d3
Reviewed-on: https://gerrit.libreoffice.org/75010
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 151eae314358f9ee0df017cb89fbc8c87c969cdb)
Reviewed-on: https://gerrit.libreoffice.org/75206
Tested-by: Jenkins
| -rw-r--r-- | sw/source/uibase/docvw/HeaderFooterWin.cxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/wrtsh/wrtsh1.cxx | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index 9e66daab2a24..f645ca6028f7 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -434,9 +434,8 @@ void SwHeaderFooterWin::ExecuteCommand(const OString& rIdent) else if (rIdent == "delete") { rSh.ChangeHeaderOrFooter( rStyleName, m_bIsHeader, false, true ); - if ( IsEmptyHeaderFooter() ) - rSh.ToggleHeaderFooterEdit(); - GrabFocusToDocument(); + // warning: "this" may be disposed now + rSh.GetWin()->GrabFocusToDocument(); } else if (rIdent == "insert_pagenumber") { diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 233947209bbe..5be78634068c 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -1795,6 +1795,8 @@ void SwWrtShell::ChangeHeaderOrFooter( bExecute = nResult == RET_YES; StartAllAction(); + if (nResult == RET_YES) + ToggleHeaderFooterEdit(); } if( bExecute ) { |