sw/source/core/view/viewsh.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 68e47d3c7c2de280b3353cfbe86e1a03bb723bfa
Author: heiko tietze <tietze.he...@gmail.com>
AuthorDate: Tue Mar 19 10:37:05 2019 +0100
Commit: Jim Raykowski <rayk...@gmail.com>
CommitDate: Tue Mar 19 18:27:00 2019 +0100
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 <rayk...@gmail.com>
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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
