summaryrefslogtreecommitdiff
path: root/sw/source/ui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-06-05 13:49:14 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-06-05 13:52:26 +0100
commit829aa9e03ae570e15af1f754b292709f38f643ea (patch)
treef17e4b57325f7e58a9664e251f6394bc9b3c708d /sw/source/ui
parentd1820ecefc5f28e854f9ff8ae1045732bbe23503 (diff)
Resolves: rhbz#1096747 crash/hang on format-page on html document
Change-Id: I9a989620375eb210e553b84b7a642a0360c8f03f (cherry picked from commit 655377e90c57bb68e5000f06f76531baf9eeaa37)
Diffstat (limited to 'sw/source/ui')
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index a6bed3525b99..823c376b1f8d 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -299,6 +299,13 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
if(!aCJKOptions.IsAsianTypographyEnabled())
RemoveTabPage("textgrid");
}
+ else
+ {
+ RemoveTabPage("borders");
+ RemoveTabPage("columns");
+ RemoveTabPage("footnotes");
+ RemoveTabPage("textgrid");
+ }
}
break;
// numbering styles