diff options
| author | heiko tietze <tietze.heiko@gmail.com> | 2019-03-19 10:37:05 +0100 |
|---|---|---|
| committer | Jim Raykowski <raykowj@gmail.com> | 2019-03-19 18:27:00 +0100 |
| commit | 68e47d3c7c2de280b3353cfbe86e1a03bb723bfa (patch) | |
| tree | 1094c9251db4cc2383f027c7c0becf94a18edda0 | |
| parent | 8ec7648f0d8580950c1bdd2fb9de92953cc90914 (diff) | |
tdf#118621 - Optional header/footer menu
Missing bits added to allow leaving the edit mode per escape
Change-Id: Ife6fd1b6106fafe5f16b36aea4c88127c16ccf23
Reviewed-on: https://gerrit.libreoffice.org/69408
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
| -rw-r--r-- | sw/source/core/view/viewsh.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 3d106bb195c4..65b45e90379d 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -122,8 +122,9 @@ void SwViewShell::ToggleHeaderFooterEdit() } // Avoid corner case - if ( !IsShowHeaderFooterSeparator( Header ) && - !IsShowHeaderFooterSeparator( Footer ) ) + if ( ( GetViewOptions()->IsUseHeaderFooterMenu() ) && + ( !IsShowHeaderFooterSeparator( Header ) && + !IsShowHeaderFooterSeparator( Footer ) ) ) { mbHeaderFooterEdit = false; } |