From 44f2556c13b128374c1f350977cc893e8c1a1e80 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 5 Jun 2014 13:49:14 +0100
Subject: 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 <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
---
 sw/source/ui/fmtui/tmpdlg.cxx | 7 +++++++
 1 file changed, 7 insertions(+)

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
-- 
cgit v1.2.3