sw/source/ui/fmtui/tmpdlg.cxx | 7 +++++++ 1 file changed, 7 insertions(+)
New commits: commit 44f2556c13b128374c1f350977cc893e8c1a1e80 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jun 5 13:49:14 2014 +0100 Resolves: rhbz#1096747 crash/hang on format-page on html document Change-Id: I9a989620375eb210e553b84b7a642a0360c8f03f (cherry picked from commit 655377e90c57bb68e5000f06f76531baf9eeaa37) (cherry picked from commit 829aa9e03ae570e15af1f754b292709f38f643ea) Reviewed-on: https://gerrit.libreoffice.org/9651 Tested-by: Michael Stahl <mst...@redhat.com> Reviewed-by: Michael Stahl <mst...@redhat.com> Reviewed-by: Eike Rathke <er...@redhat.com> Tested-by: David Tardon <dtar...@redhat.com> Reviewed-by: David Tardon <dtar...@redhat.com> diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index bc224b7..7645249 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -290,6 +290,13 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, if(!aCJKOptions.IsAsianTypographyEnabled()) RemoveTabPage("textgrid"); } + else + { + RemoveTabPage("borders"); + RemoveTabPage("columns"); + RemoveTabPage("footnotes"); + RemoveTabPage("textgrid"); + } } break; // numbering styles
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits