include/sfx2/tabdlg.hxx                    |    6 
 include/vcl/tabs.hrc                       |   34 +
 sc/source/ui/styleui/styledlg.cxx          |   94 +-
 sc/uiconfig/scalc/ui/drawtemplatedialog.ui |  803 -------------------------
 sc/uiconfig/scalc/ui/pagetemplatedialog.ui |  371 -----------
 sc/uiconfig/scalc/ui/paratemplatedialog.ui |  479 ---------------
 sd/source/ui/dlg/tabtempl.cxx              |   51 +
 sd/uiconfig/simpress/ui/templatedialog.ui  |  857 ---------------------------
 sfx2/source/dialog/styledlg.cxx            |    5 
 sfx2/source/dialog/tabdlg.cxx              |   11 
 svtools/source/dialogs/PlaceEditDialog.cxx |   14 
 sw/source/ui/fmtui/tmpdlg.cxx              |  166 +++--
 sw/uiconfig/swriter/ui/templatedialog1.ui  |  375 -----------
 sw/uiconfig/swriter/ui/templatedialog16.ui |  382 ------------
 sw/uiconfig/swriter/ui/templatedialog2.ui  |  913 -----------------------------
 sw/uiconfig/swriter/ui/templatedialog4.ui  |  479 ---------------
 sw/uiconfig/swriter/ui/templatedialog8.ui  |  545 -----------------
 17 files changed, 254 insertions(+), 5331 deletions(-)

New commits:
commit 187d7a2cc0990df7db109a64a05016530349d0a1
Author:     Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Thu Jul 10 11:23:31 2025 +0200
Commit:     Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Sat Aug 2 09:16:27 2025 +0200

    Related tdf#167446 - UI-less tab style (Style dialogs)
    
    Change-Id: I316dfc539913d1bcad3bf28163134aa31a875c9a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187613
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>

diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 886e9a6ae5ef..beaf3059fbbd 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -132,6 +132,12 @@ public:
                                    CreateTabPage pCreateFunc,      // != 0
                                    const OUString* pIconName = nullptr);
 
+    void                AddTabPage(const OUString& rName,          // Name of 
the label for the new page to create
+                                   const OUString& rLabel,         // UI Label 
for the new page to create
+                                   CreateTabPage pCreateFunc,      // != 0
+                                   GetTabPageRanges pRangesFunc,
+                                   const OUString& rIconName);
+
     void                AddTabPage(const OUString& rName,
                                    const OUString& rLabel,
                                    CreateTabPage pCreateFunc,
diff --git a/include/vcl/tabs.hrc b/include/vcl/tabs.hrc
index 4575ef2c4692..eb392ff4e50f 100644
--- a/include/vcl/tabs.hrc
+++ b/include/vcl/tabs.hrc
@@ -43,6 +43,40 @@ inline constexpr TabData RID_TAB_COLORPALETTE{ 
NC_("RID_TAB_COLORPALETTE", "Colo
 inline constexpr TabData RID_TAB_NUMBERS{ NC_("RID_TAB_NUMBERS", "Numbers"), 
u"numberformatdecimal.png"_ustr };
 inline constexpr TabData RID_TAB_INDENTS{ NC_("RID_TAB_INDENTS", "Indents 
&amp; Spacing"), u"paraspaceincrease.png"_ustr };
 inline constexpr TabData RID_TAB_TABS{ NC_("RID_TAB_TABS", "Tabs"), 
u"hangingindent.png"_ustr };
+inline constexpr TabData RID_TAB_ORGANIZER{ NC_("RID_TAB_ORGANIZER", 
"Organizer"), u"browseview.png"_ustr };
+inline constexpr TabData RID_TAB_BACKGROUND{ NC_("RID_TAB_BACKGROUND", 
"Background"), u"backgroundcolor.png"_ustr };
+inline constexpr TabData RID_TAB_TEXTFLOW{ NC_("RID_TAB_TEXTFLOW", "Text 
Flow"), u"hyphenate.png"_ustr };
+inline constexpr TabData RID_TAB_ASIANLAYOUT{ NC_("RID_TAB_ASIANLAYOUT", 
"Asian Layout"), u"textdirectiontoptobottom.png"_ustr };
+inline constexpr TabData RID_TAB_OUTLINELIST{ NC_("RID_TAB_OUTLINELIST", 
"Outline & List"), u"setoutline.png"_ustr };
+inline constexpr TabData RID_TAB_DROPCAPS{ NC_("RID_TAB_DROPCAPS", "Drop 
Caps"), u"smallcaps.png"_ustr };
+inline constexpr TabData RID_TAB_CONDITION{ NC_("RID_TAB_CONDITION", 
"Condition"), u"developmenttoolsdockingwindow.png"_ustr };
+inline constexpr TabData RID_TAB_HEADER{ NC_("RID_TAB_HEADER", "Header"), 
u"insertheader.png"_ustr };
+inline constexpr TabData RID_TAB_FOOTER{ NC_("RID_TAB_FOOTER", "Footer"), 
u"insertfooter.png"_ustr };
+inline constexpr TabData RID_TAB_PAGE{ NC_("RID_TAB_PAGE", "Page"), 
u"attributepagesize.png"_ustr };
+inline constexpr TabData RID_TAB_COLUMNS{ NC_("RID_TAB_COLUMNS", "Columns"), 
u"pagecolumntype.png"_ustr };
+inline constexpr TabData RID_TAB_FOOTNOTES{ NC_("RID_TAB_FOOTNOTES", 
"Footnote"), u"footnotedialog.png"_ustr };
+inline constexpr TabData RID_TAB_TEXTGRID{ NC_("RID_TAB_TEXTGRID", "Text 
Grid"), u"gridvisible.png"_ustr };
+//  list
+inline constexpr TabData RID_TAB_UNOORDERED{ NC_("RID_TAB_UNOORDERED", 
"Unordered"), u"defaultbullet.png"_ustr };
+inline constexpr TabData RID_TAB_ORDERED{ NC_("RID_TAB_ORDERED", "Ordered"), 
u"defaultnumbering.png"_ustr };
+inline constexpr TabData RID_TAB_OUTLINE{ NC_("RID_TAB_OUTLINE", "Outline"), 
u"setoutline.png"_ustr };
+inline constexpr TabData RID_TAB_IMAGE{ NC_("RID_TAB_IMAGE", "Image"), 
u"imagebutton.png"_ustr };
+inline constexpr TabData RID_TAB_CUSTOMIZE{ NC_("RID_TAB_CUSTOMIZE", 
"Customize"), u"developmenttoolsdockingwindow.png"_ustr };
+inline constexpr TabData RID_TAB_LIST_POSITION{ NC_("RID_TAB_LIST_POSITION", 
"Position"), u"hangingindent.png"_ustr };
+// frame
+inline constexpr TabData RID_TAB_FRAME_TYPE{ NC_("RID_TAB_FRAME_TYPE", 
"Type"), u"toggleanchortype.png"_ustr };
+inline constexpr TabData RID_TAB_FRAME_OPTIONS{ NC_("RID_TAB_FRAME_OPTIONS", 
"Options"), u"inserthyperlink.png"_ustr };
+inline constexpr TabData RID_TAB_FRAME_WRAP{ NC_("RID_TAB_FRAME_WRAP", 
"Wrap"), u"wrapcontour.png"_ustr };
+inline constexpr TabData RID_TAB_MACRO{ NC_("RID_TAB_MACRO", "Macro"), 
u"choosemacro.png"_ustr };
+// draw
+inline constexpr TabData RID_TAB_SHADOW{ NC_("RID_TAB_SHADOW", "Shadowing"), 
u"fillshadow.png"_ustr };
+inline constexpr TabData RID_TAB_TEXT{ NC_("RID_TAB_TEXT", "Text"), 
u"text_marquee.png"_ustr };
+inline constexpr TabData RID_TAB_TEXTANIMATION{ NC_("RID_TAB_TEXTANIMATION", 
"Text Animation"), u"animationeffects.png"_ustr };
+inline constexpr TabData RID_TAB_DIMENSIONING{ NC_("RID_TAB_DIMENSIONING", 
"Dimensioning"), u"measureline.png"_ustr };
+inline constexpr TabData RID_TAB_CONNECTOR{ NC_("RID_TAB_CONNECTOR", 
"Connector"), u"connectorcurve.png"_ustr };
+// calc
+inline constexpr TabData RID_TAB_SHEET{ NC_("RID_TAB_SHEET", "Sheet"), 
u"printersetup.png"_ustr };
+inline constexpr TabData RID_TAB_PROTECTION{ NC_("RID_TAB_PROTECTION", "Cell 
Protection"), u"protect.png"_ustr };
 
 inline constexpr TabData RID_TAB_CHART_OPTIONS{ NC_("RID_TAB_CHART_OPTIONS", 
"Options"), u"diagramtype.png"_ustr };
 inline constexpr TabData RID_TAB_CHART_ERROR_X{ NC_("RID_TAB_CHART_ERROR_X", 
"X Error Bars"), u"arrowshapes.png"_ustr };
diff --git a/sc/source/ui/styleui/styledlg.cxx 
b/sc/source/ui/styleui/styledlg.cxx
index 0d3332ef6fe4..5253a040edd8 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -39,6 +39,8 @@
 #include <editeng/flstitem.hxx>
 #include <svx/flagsdef.hxx>
 
+#include <vcl/tabs.hrc>
+
 ScStyleDlg::ScStyleDlg(weld::Window* pParent,
                        SfxStyleSheetBase& rStyleBase,
                        bool bPage)
@@ -52,31 +54,43 @@ ScStyleDlg::ScStyleDlg(weld::Window* pParent,
                         rStyleBase )
     , m_bPage(bPage)
 {
-    SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
     if (m_bPage) // page styles
     {
-        AddTabPage(u"page"_ustr, pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_PAGE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ) );
-        AddTabPage(u"borders"_ustr, pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
-        AddTabPage(u"background"_ustr, pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_BKG ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BKG ) );
-        AddTabPage(u"header"_ustr, &ScHeaderPage::Create,      
&ScHeaderPage::GetRanges );
-        AddTabPage(u"footer"_ustr, &ScFooterPage::Create,      
&ScFooterPage::GetRanges );
-        AddTabPage(u"sheet"_ustr, &ScTablePage::Create,     
&ScTablePage::GetRanges );
+        AddTabPage(u"page"_ustr, TabResId(RID_TAB_PAGE.aLabel), 
RID_SVXPAGE_PAGE,
+                   RID_M + RID_TAB_PAGE.sIconName);
+        AddTabPage(u"borders"_ustr, TabResId(RID_TAB_BORDER.aLabel), 
RID_SVXPAGE_BORDER,
+                   RID_M + RID_TAB_BORDER.sIconName);
+        AddTabPage(u"background"_ustr, TabResId(RID_TAB_BACKGROUND.aLabel), 
RID_SVXPAGE_BKG,
+                   RID_M + RID_TAB_BACKGROUND.sIconName);
+        AddTabPage(u"header"_ustr, TabResId(RID_TAB_HEADER.aLabel), 
&ScHeaderPage::Create,
+                   &ScHeaderPage::GetRanges, RID_M + RID_TAB_HEADER.sIconName);
+        AddTabPage(u"footer"_ustr, TabResId(RID_TAB_FOOTER.aLabel), 
&ScFooterPage::Create,
+                   &ScFooterPage::GetRanges, RID_M + RID_TAB_FOOTER.sIconName);
+        AddTabPage(u"sheet"_ustr, TabResId(RID_TAB_SHEET.aLabel), 
&ScTablePage::Create,
+                   &ScTablePage::GetRanges, RID_M + RID_TAB_SHEET.sIconName);
     }
     else // cell format styles
     {
-        AddTabPage(u"numbers"_ustr, pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_NUMBERFORMAT ), pFact->GetTabPageRangesFunc( 
RID_SVXPAGE_NUMBERFORMAT ));
-        AddTabPage(u"font"_ustr, pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ));
-        AddTabPage(u"fonteffects"_ustr, pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( 
RID_SVXPAGE_CHAR_EFFECTS ));
-        AddTabPage(u"alignment"_ustr, pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_ALIGNMENT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT ));
-        if ( SvtCJKOptions::IsAsianTypographyEnabled() )
+        AddTabPage(u"numbers"_ustr, TabResId(RID_TAB_NUMBERS.aLabel), 
RID_SVXPAGE_NUMBERFORMAT,
+                   RID_M + RID_TAB_NUMBERS.sIconName);
+        AddTabPage(u"font"_ustr, TabResId(RID_TAB_FONT.aLabel), 
RID_SVXPAGE_CHAR_NAME,
+                   RID_M + RID_TAB_FONT.sIconName);
+        AddTabPage(u"fonteffects"_ustr, TabResId(RID_TAB_FONTEFFECTS.aLabel),
+                   RID_SVXPAGE_CHAR_EFFECTS, RID_M + 
RID_TAB_FONTEFFECTS.sIconName);
+        AddTabPage(u"alignment"_ustr, TabResId(RID_TAB_ALIGNMENT.aLabel), 
RID_SVXPAGE_ALIGNMENT,
+                   RID_M + RID_TAB_ALIGNMENT.sIconName);
+        if (SvtCJKOptions::IsAsianTypographyEnabled())
         {
-            AddTabPage(u"asiantypo"_ustr, 
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN),       
pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN));
+            AddTabPage(u"asiantypo"_ustr, TabResId(RID_TAB_ASIANTYPO.aLabel),
+                       RID_SVXPAGE_PARA_ASIAN, RID_M + 
RID_TAB_ASIANTYPO.sIconName);
         }
-        else
-            RemoveTabPage(u"asiantypo"_ustr);
-        AddTabPage(u"borders"_ustr, pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ));
-        AddTabPage(u"background"_ustr, pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_BKG ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BKG ));
-        AddTabPage(u"protection"_ustr, &ScTabPageProtection::Create,    
&ScTabPageProtection::GetRanges);
+        AddTabPage(u"borders"_ustr, TabResId(RID_TAB_BORDER.aLabel), 
RID_SVXPAGE_BORDER,
+                   RID_M + RID_TAB_BORDER.sIconName);
+        AddTabPage(u"background"_ustr, TabResId(RID_TAB_BACKGROUND.aLabel), 
RID_SVXPAGE_BKG,
+                   RID_M + RID_TAB_BACKGROUND.sIconName);
+        AddTabPage(u"protection"_ustr, TabResId(RID_TAB_PROTECTION.aLabel),
+                   &ScTabPageProtection::Create, 
&ScTabPageProtection::GetRanges,
+                   RID_M + RID_TAB_PROTECTION.sIconName);
     }
 }
 
@@ -143,23 +157,35 @@ ScDrawStyleDlg::ScDrawStyleDlg(weld::Window* pParent, 
SfxStyleSheetBase& rStyleB
     : SfxStyleDialogController(pParent, 
u"modules/scalc/ui/drawtemplatedialog.ui"_ustr, u"DrawTemplateDialog"_ustr, 
rStyleBase)
     , mpView(pView)
 {
-    AddTabPage(u"line"_ustr, RID_SVXPAGE_LINE);
-    AddTabPage(u"area"_ustr, RID_SVXPAGE_AREA);
-    AddTabPage(u"shadowing"_ustr, RID_SVXPAGE_SHADOW);
-    AddTabPage(u"transparency"_ustr, RID_SVXPAGE_TRANSPARENCE);
-    AddTabPage(u"font"_ustr, RID_SVXPAGE_CHAR_NAME);
-    AddTabPage(u"fonteffect"_ustr, RID_SVXPAGE_CHAR_EFFECTS);
-    AddTabPage(u"background"_ustr, RID_SVXPAGE_BKG);
-    AddTabPage(u"indents"_ustr, RID_SVXPAGE_STD_PARAGRAPH);
-    AddTabPage(u"text"_ustr, RID_SVXPAGE_TEXTATTR);
-    AddTabPage(u"animation"_ustr, RID_SVXPAGE_TEXTANIMATION);
-    AddTabPage(u"dimensioning"_ustr, RID_SVXPAGE_MEASURE);
-    AddTabPage(u"alignment"_ustr, RID_SVXPAGE_ALIGN_PARAGRAPH);
-    AddTabPage(u"tabs"_ustr, RID_SVXPAGE_TABULATOR);
+    AddTabPage(u"line"_ustr, TabResId(RID_TAB_LINE.aLabel), RID_SVXPAGE_LINE,
+               RID_M + RID_TAB_LINE.sIconName);
+    AddTabPage(u"area"_ustr, TabResId(RID_TAB_AREA.aLabel), RID_SVXPAGE_AREA,
+               RID_M + RID_TAB_AREA.sIconName);
+    AddTabPage(u"shadowing"_ustr, TabResId(RID_TAB_SHADOW.aLabel), 
RID_SVXPAGE_SHADOW,
+               RID_M + RID_TAB_SHADOW.sIconName);
+    AddTabPage(u"transparency"_ustr, TabResId(RID_TAB_TRANSPARENCE.aLabel),
+               RID_SVXPAGE_TRANSPARENCE, RID_M + 
RID_TAB_TRANSPARENCE.sIconName);
+    AddTabPage(u"font"_ustr, TabResId(RID_TAB_FONT.aLabel), 
RID_SVXPAGE_CHAR_NAME,
+               RID_M + RID_TAB_FONT.sIconName);
+    AddTabPage(u"fonteffect"_ustr, TabResId(RID_TAB_FONTEFFECTS.aLabel), 
RID_SVXPAGE_CHAR_EFFECTS,
+               RID_M + RID_TAB_FONTEFFECTS.sIconName);
+    AddTabPage(u"indents"_ustr, TabResId(RID_TAB_INDENTS.aLabel), 
RID_SVXPAGE_STD_PARAGRAPH,
+               RID_M + RID_TAB_INDENTS.sIconName);
+    AddTabPage(u"text"_ustr, TabResId(RID_TAB_TEXT.aLabel), 
RID_SVXPAGE_TEXTATTR,
+               RID_M + RID_TAB_TEXT.sIconName);
+    AddTabPage(u"animation"_ustr, TabResId(RID_TAB_TEXTANIMATION.aLabel), 
RID_SVXPAGE_TEXTANIMATION,
+               RID_M + RID_TAB_TEXTANIMATION.sIconName);
+    AddTabPage(u"dimensioning"_ustr, TabResId(RID_TAB_DIMENSIONING.aLabel), 
RID_SVXPAGE_MEASURE,
+               RID_M + RID_TAB_DIMENSIONING.sIconName);
+    AddTabPage(u"alignment"_ustr, TabResId(RID_TAB_ALIGNMENT.aLabel), 
RID_SVXPAGE_ALIGN_PARAGRAPH,
+               RID_M + RID_TAB_ALIGNMENT.sIconName);
     if (SvtCJKOptions::IsAsianTypographyEnabled())
-        AddTabPage(u"asiantypo"_ustr, RID_SVXPAGE_PARA_ASIAN);
-    else
-        RemoveTabPage(u"asiantypo"_ustr);
+        AddTabPage(u"asiantypo"_ustr, TabResId(RID_TAB_ASIANTYPO.aLabel), 
RID_SVXPAGE_PARA_ASIAN,
+                   RID_M + RID_TAB_ASIANTYPO.sIconName);
+    AddTabPage(u"tabs"_ustr, TabResId(RID_TAB_TABS.aLabel), 
RID_SVXPAGE_TABULATOR,
+               RID_M + RID_TAB_TABS.sIconName);
+    AddTabPage(u"background"_ustr, TabResId(RID_TAB_HIGHLIGHTING.aLabel), 
RID_SVXPAGE_BKG,
+               RID_M + RID_TAB_HIGHLIGHTING.sIconName);
 }
 
 void ScDrawStyleDlg::PageCreated(const OUString& rPageId, SfxTabPage& rTabPage)
diff --git a/sc/uiconfig/scalc/ui/drawtemplatedialog.ui 
b/sc/uiconfig/scalc/ui/drawtemplatedialog.ui
index d32009a8f2cc..4ac757030d12 100644
--- a/sc/uiconfig/scalc/ui/drawtemplatedialog.ui
+++ b/sc/uiconfig/scalc/ui/drawtemplatedialog.ui
@@ -109,809 +109,6 @@
             <property name="tab-pos">left</property>
             <property name="scrollable">True</property>
             <property name="tab-pos">left</property>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="organizer">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imOrganizer">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_browseview.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbOrganizer"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbOrganizer">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="drawtemplatedialog|organizer">General</property>
-                    <property name="mnemonic-widget">organizer</property>
-                    <accessibility>
-                      <relation type="label-for" target="imOrganizer"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="line">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imLine">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_formatline.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbLine"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbLine">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="drawtemplatedialog|line">Line</property>
-                    <property name="mnemonic-widget">line</property>
-                    <accessibility>
-                      <relation type="label-for" target="imLine"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="area">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imArea">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_backgroundcolor.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbArea"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbArea">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="drawtemplatedialog|area">Area</property>
-                    <property name="mnemonic-widget">area</property>
-                    <accessibility>
-                      <relation type="label-for" target="imArea"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="shadowing">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imShadowing">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_fillshadow.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbShadowing"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbShadowing">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="drawtemplatedialog|shadowing">Shadowing</property>
-                    <property name="mnemonic-widget">shadowing</property>
-                    <accessibility>
-                      <relation type="label-for" target="imShadowing"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">3</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="transparency">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imTransparency">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_graftransparence.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbTransparency"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbTransparency">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="drawtemplatedialog|transparency">Transparency</property>
-                    <property name="mnemonic-widget">transparency</property>
-                    <accessibility>
-                      <relation type="label-for" target="imTransparency"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">4</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">5</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="font">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imFont">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_fontdialog.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbFont"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbFont">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="drawtemplatedialog|font">Font</property>
-                    <property name="mnemonic-widget">font</property>
-                    <accessibility>
-                      <relation type="label-for" target="imFont"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">5</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">6</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="fonteffect">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imFonteffect">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_color.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbFonteffect"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbFonteffect">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="drawtemplatedialog|fonteffect">Font Effects</property>
-                    <property name="mnemonic-widget">fonteffect</property>
-                    <accessibility>
-                      <relation type="label-for" target="imFonteffect"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">6</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">7</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="indents">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imIndents">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_paraspaceincrease.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbIndents"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbIndents">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="drawtemplatedialog|indents">Indents &amp; Spacing</property>
-                    <property name="mnemonic-widget">indents</property>
-                    <accessibility>
-                      <relation type="label-for" target="imIndents"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">7</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">8</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="text">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imText">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_text_marquee.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbText"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbText">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="drawtemplatedialog|text">Text</property>
-                    <property name="mnemonic-widget">text</property>
-                    <accessibility>
-                      <relation type="label-for" target="imText"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">8</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">9</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="animation">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imAnimation">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_animationeffects.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbAnimation"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbAnimation">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="drawtemplatedialog|animation">Text Animation</property>
-                    <property name="mnemonic-widget">animation</property>
-                    <accessibility>
-                      <relation type="label-for" target="imAnimation"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">9</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">10</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="dimensioning">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imDimensioning">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_measureline.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbDimensioning"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbDimensioning">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="drawtemplatedialog|dimensioning">Dimensioning</property>
-                    <property name="mnemonic-widget">dimensioning</property>
-                    <accessibility>
-                      <relation type="label-for" target="imDimensioning"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">10</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">11</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="alignment">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imAlignment">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_alignblock.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbAlignment"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbAlignment">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="drawtemplatedialog|alignment">Alignment</property>
-                    <property name="mnemonic-widget">alignment</property>
-                    <accessibility>
-                      <relation type="label-for" target="imAlignment"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">11</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">12</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="asiantypo">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imAsiantypo">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_defaultcharstyle.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbAsiantypo"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbAsiantypo">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="drawtemplatedialog|asiantypo">Asian Typography</property>
-                    <property name="mnemonic-widget">asiantypo</property>
-                    <accessibility>
-                      <relation type="label-for" target="imAsiantypo"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">12</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">13</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="tabs">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imTabs">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_hangingindent.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbTabs"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbTabs">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="drawtemplatedialog|tabs">Tabs</property>
-                    <property name="mnemonic-widget">tabs</property>
-                    <accessibility>
-                      <relation type="label-for" target="imTabs"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">13</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">14</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="background">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imBackground">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_backcolor.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbBackground"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbBackground">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="drawtemplatedialog|background">Highlighting</property>
-                    <property name="mnemonic-widget">background</property>
-                    <accessibility>
-                      <relation type="label-for" target="imBackground"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">14</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui 
b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
index 5d19567e6d7d..7a1014feeff1 100644
--- a/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
+++ b/sc/uiconfig/scalc/ui/pagetemplatedialog.ui
@@ -110,377 +110,6 @@
             <property name="tab-pos">left</property>
             <property name="tab-pos">left</property>
             <property name="enable-popup">True</property>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="organizer">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imOrganizer">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_browseview.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbOrganizer"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbOrganizer">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="pagetemplatedialog|organizer">General</property>
-                    <property name="mnemonic-widget">organizer</property>
-                    <accessibility>
-                      <relation type="label-for" target="imOrganizer"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="page">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imPage">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_attributepagesize.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbPage"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbPage">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="pagetemplatedialog|page">Page</property>
-                    <property name="mnemonic-widget">page</property>
-                    <accessibility>
-                      <relation type="label-for" target="imPage"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="borders">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imBorders">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_borderdialog.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbBorders"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbBorders">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="pagetemplatedialog|borders">Borders</property>
-                    <property name="mnemonic-widget">borders</property>
-                    <accessibility>
-                      <relation type="label-for" target="imBorders"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="background">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imBackground">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_backgroundcolor.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbBackground"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbBackground">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="pagetemplatedialog|background">Background</property>
-                    <property name="mnemonic-widget">background</property>
-                    <accessibility>
-                      <relation type="label-for" target="imBackground"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">3</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="header">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imHeader">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_insertheader.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbHeader"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbHeader">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="pagetemplatedialog|header">Header</property>
-                    <property name="mnemonic-widget">header</property>
-                    <accessibility>
-                      <relation type="label-for" target="imHeader"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">4</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">5</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="footer">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imFooter">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_insertfooter.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbFooter"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbFooter">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="pagetemplatedialog|footer">Footer</property>
-                    <property name="mnemonic-widget">footer</property>
-                    <accessibility>
-                      <relation type="label-for" target="imFooter"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">5</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">6</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="sheet">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imSheet">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_printersetup.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbSheet"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbSheet">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="pagetemplatedialog|sheet">Sheet</property>
-                    <property name="mnemonic-widget">sheet</property>
-                    <accessibility>
-                      <relation type="label-for" target="imSheet"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">6</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/paratemplatedialog.ui 
b/sc/uiconfig/scalc/ui/paratemplatedialog.ui
index 48c7e457b101..6056092f7ad9 100644
--- a/sc/uiconfig/scalc/ui/paratemplatedialog.ui
+++ b/sc/uiconfig/scalc/ui/paratemplatedialog.ui
@@ -109,485 +109,6 @@
             <property name="tab-pos">left</property>
             <property name="scrollable">True</property>
             <property name="tab-pos">left</property>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="organizer">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imOrganizer">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_browseview.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbOrganizer"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbOrganizer">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="paratemplatedialog|organizer">General</property>
-                    <property name="mnemonic-widget">organizer</property>
-                    <accessibility>
-                      <relation type="label-for" target="imOrganizer"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="numbers">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imNumbers">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_numberformatdecimal.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbNumbers"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbNumbers">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="paratemplatedialog|numbers">Numbers</property>
-                    <property name="mnemonic-widget">numbers</property>
-                    <accessibility>
-                      <relation type="label-for" target="imNumbers"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="font">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imFont">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_fontdialog.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbFont"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbFont">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="paratemplatedialog|font">Font</property>
-                    <property name="mnemonic-widget">font</property>
-                    <accessibility>
-                      <relation type="label-for" target="imFont"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="fonteffects">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imFonteffects">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_color.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbFonteffects"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbFonteffects">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="paratemplatedialog|fonteffects">Font Effects</property>
-                    <property name="mnemonic-widget">fonteffects</property>
-                    <accessibility>
-                      <relation type="label-for" target="imFonteffects"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">3</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="alignment">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imAlignment">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_alignblock.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbAlignment"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbAlignment">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="paratemplatedialog|alignment">Alignment</property>
-                    <property name="mnemonic-widget">alignment</property>
-                    <accessibility>
-                      <relation type="label-for" target="imAlignment"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">4</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">5</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="asiantypo">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imAsiantypo">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_defaultcharstyle.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbAsiantypo"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbAsiantypo">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="paratemplatedialog|asiantypo">Asian Typography</property>
-                    <property name="mnemonic-widget">asiantypo</property>
-                    <accessibility>
-                      <relation type="label-for" target="imAsiantypo"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">5</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">6</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="borders">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imBorders">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_borderdialog.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbBorders"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbBorders">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="paratemplatedialog|borders">Borders</property>
-                    <property name="mnemonic-widget">borders</property>
-                    <accessibility>
-                      <relation type="label-for" target="imBorders"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">6</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">7</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="background">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imBackground">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property 
name="icon-name">cmd/lc_backgroundcolor.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbBackground"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbBackground">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="paratemplatedialog|background">Background</property>
-                    <property name="mnemonic-widget">background</property>
-                    <accessibility>
-                      <relation type="label-for" target="imBackground"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">7</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkGrid">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">8</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="protection">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imProtection">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_protect.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbProtection"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbProtection">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="paratemplatedialog|protection">Cell Protection</property>
-                    <property name="mnemonic-widget">protection</property>
-                    <accessibility>
-                      <relation type="label-for" target="imProtection"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">8</property>
-                <property name="tab-fill">False</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx
index bc1338a1cc30..7699c36a67aa 100644
--- a/sd/source/ui/dlg/tabtempl.cxx
+++ b/sd/source/ui/dlg/tabtempl.cxx
@@ -33,6 +33,8 @@
 #include <tabtempl.hxx>
 #include <svx/flagsdef.hxx>
 
+#include <vcl/tabs.hrc>
+
 /**
  * Constructor of the Tab dialog: appends pages to the dialog
  */
@@ -55,24 +57,37 @@ SdTabTemplateDlg::SdTabTemplateDlg(weld::Window* pParent,
 {
     // fill Listbox and set Select-Handler
 
-    AddTabPage(u"line"_ustr, RID_SVXPAGE_LINE);
-    AddTabPage(u"area"_ustr, RID_SVXPAGE_AREA);
-    AddTabPage(u"shadowing"_ustr, RID_SVXPAGE_SHADOW);
-    AddTabPage(u"transparency"_ustr, RID_SVXPAGE_TRANSPARENCE);
-    AddTabPage(u"font"_ustr, RID_SVXPAGE_CHAR_NAME);
-    AddTabPage(u"fonteffect"_ustr, RID_SVXPAGE_CHAR_EFFECTS);
-    AddTabPage(u"background"_ustr, RID_SVXPAGE_BKG);
-    AddTabPage(u"indents"_ustr, RID_SVXPAGE_STD_PARAGRAPH);
-    AddTabPage(u"text"_ustr, RID_SVXPAGE_TEXTATTR);
-    AddTabPage(u"animation"_ustr, RID_SVXPAGE_TEXTANIMATION);
-    AddTabPage(u"dimensioning"_ustr, RID_SVXPAGE_MEASURE);
-    AddTabPage(u"connector"_ustr, RID_SVXPAGE_CONNECTION);
-    AddTabPage(u"alignment"_ustr, RID_SVXPAGE_ALIGN_PARAGRAPH);
-    AddTabPage(u"tabs"_ustr, RID_SVXPAGE_TABULATOR);
-    if( SvtCJKOptions::IsAsianTypographyEnabled() )
-        AddTabPage(u"asiantypo"_ustr, RID_SVXPAGE_PARA_ASIAN);
-    else
-        RemoveTabPage(u"asiantypo"_ustr);
+    AddTabPage(u"line"_ustr, TabResId(RID_TAB_LINE.aLabel), RID_SVXPAGE_LINE,
+               RID_M + RID_TAB_LINE.sIconName);
+    AddTabPage(u"area"_ustr, TabResId(RID_TAB_AREA.aLabel), RID_SVXPAGE_AREA,
+               RID_M + RID_TAB_AREA.sIconName);
+    AddTabPage(u"shadowing"_ustr, TabResId(RID_TAB_SHADOW.aLabel), 
RID_SVXPAGE_SHADOW,
+               RID_M + RID_TAB_SHADOW.sIconName);
+    AddTabPage(u"transparency"_ustr, TabResId(RID_TAB_TRANSPARENCE.aLabel),
+               RID_SVXPAGE_TRANSPARENCE, RID_M + 
RID_TAB_TRANSPARENCE.sIconName);
+    AddTabPage(u"font"_ustr, TabResId(RID_TAB_FONT.aLabel), 
RID_SVXPAGE_CHAR_NAME,
+               RID_M + RID_TAB_FONT.sIconName);
+    AddTabPage(u"fonteffect"_ustr, TabResId(RID_TAB_FONTEFFECTS.aLabel), 
RID_SVXPAGE_CHAR_EFFECTS,
+               RID_M + RID_TAB_FONTEFFECTS.sIconName);
+    AddTabPage(u"indents"_ustr, TabResId(RID_TAB_INDENTS.aLabel), 
RID_SVXPAGE_STD_PARAGRAPH,
+               RID_M + RID_TAB_INDENTS.sIconName);
+    AddTabPage(u"text"_ustr, TabResId(RID_TAB_TEXT.aLabel), 
RID_SVXPAGE_TEXTATTR,
+               RID_M + RID_TAB_TEXT.sIconName);
+    AddTabPage(u"animation"_ustr, TabResId(RID_TAB_TEXTANIMATION.aLabel), 
RID_SVXPAGE_TEXTANIMATION,
+               RID_M + RID_TAB_TEXTANIMATION.sIconName);
+    AddTabPage(u"dimensioning"_ustr, TabResId(RID_TAB_DIMENSIONING.aLabel), 
RID_SVXPAGE_MEASURE,
+               RID_M + RID_TAB_DIMENSIONING.sIconName);
+    AddTabPage(u"connector"_ustr, TabResId(RID_TAB_CONNECTOR.aLabel), 
RID_SVXPAGE_CONNECTION,
+               RID_M + RID_TAB_CONNECTOR.sIconName);
+    AddTabPage(u"alignment"_ustr, TabResId(RID_TAB_ALIGNMENT.aLabel), 
RID_SVXPAGE_ALIGN_PARAGRAPH,
+               RID_M + RID_TAB_ALIGNMENT.sIconName);
+    if (SvtCJKOptions::IsAsianTypographyEnabled())
+        AddTabPage(u"asiantypo"_ustr, TabResId(RID_TAB_ASIANTYPO.aLabel), 
RID_SVXPAGE_PARA_ASIAN,
+                   RID_M + RID_TAB_ASIANTYPO.sIconName);
+    AddTabPage(u"tabs"_ustr, TabResId(RID_TAB_TABS.aLabel), 
RID_SVXPAGE_TABULATOR,
+               RID_M + RID_TAB_TABS.sIconName);
+    AddTabPage(u"background"_ustr, TabResId(RID_TAB_HIGHLIGHTING.aLabel), 
RID_SVXPAGE_BKG,
+               RID_M + RID_TAB_HIGHLIGHTING.sIconName);
 }
 
 void SdTabTemplateDlg::PageCreated(const OUString& rId, SfxTabPage &rPage)
diff --git a/sd/uiconfig/simpress/ui/templatedialog.ui 
b/sd/uiconfig/simpress/ui/templatedialog.ui
index c3eb9e1216d8..807ca763c4e1 100644
--- a/sd/uiconfig/simpress/ui/templatedialog.ui
+++ b/sd/uiconfig/simpress/ui/templatedialog.ui
@@ -108,863 +108,6 @@
             <property name="vexpand">True</property>
             <property name="tab-pos">left</property>
             <property name="scrollable">True</property>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="organizer">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imOrganizer">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_browseview.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbOrganizer"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbOrganizer">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="templatedialog|organizer">General</property>
-                    <property name="mnemonic-widget">organizer</property>
-                    <accessibility>
-                      <relation type="label-for" target="imOrganizer"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkBox" id="line">
-                <property name="can-focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkImage" id="imLine">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">cmd/lc_formatline.png</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="lbLine"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lbLine">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" 
context="templatedialog|line">Line</property>
-                    <property name="mnemonic-widget">line</property>
-                    <accessibility>
-                      <relation type="label-for" target="imLine"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-e 
... etc. - the rest is truncated

Reply via email to