[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/ui/fmtui/tmpdlg.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 655377e90c57bb68e5000f06f76531baf9eeaa37
Author: Caolán McNamara <caolanm at 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

diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 0d346b2..b411bb2 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -296,6 +296,13 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
                 if(!aCJKOptions.IsAsianTypographyEnabled())
                     RemoveTabPage("textgrid");
             }
+            else
+            {
+                RemoveTabPage("borders");
+                RemoveTabPage("columns");
+                RemoveTabPage("footnotes");
+                RemoveTabPage("textgrid");
+            }
         }
         break;
         // numbering styles