diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-06-05 13:49:14 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-06-05 22:05:56 +0000 |
| commit | 90ea159e62bc6c884906220d9a0a97f70ae9c7ad (patch) | |
| tree | 1cb25163d20c1ffcd2d6e485060fa197ff9e4d67 /sw | |
| parent | ec98e41a4ad88ce7c9a76f1e0a35157e10a48213 (diff) | |
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/9650
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index bc224b7878c0..7645249ec3f4 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 |