sc/source/ui/attrdlg/attrdlg.cxx | 45 ++-
sc/source/ui/miscdlgs/textdlgs.cxx | 32 +-
sc/uiconfig/scalc/ui/chardialog.ui | 211 --------------
sc/uiconfig/scalc/ui/formatcellsdialog.ui | 427 ------------------------------
sc/uiconfig/scalc/ui/paradialog.ui | 211 --------------
5 files changed, 51 insertions(+), 875 deletions(-)
New commits:
commit ea8342a9a51e170365dc01520adbf439e0f32de0
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Tue Jul 8 13:52:32 2025 +0200
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Wed Aug 6 07:28:09 2025 +0200
Related tdf#167446 - UI-less tab style (Calc formatting)
Change-Id: I733a120a82e1090d3ec323c355e0d10d5347febb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187537
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index ef6fecddd0b2..75e751ad31f5 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -31,33 +31,46 @@
#include <editeng/flstitem.hxx>
#include <osl/diagnose.h>
+#include <vcl/tabs.hrc>
+
ScAttrDlg::ScAttrDlg(weld::Window* pParent, const SfxItemSet* pCellAttrs)
: SfxTabDialogController(pParent,
u"modules/scalc/ui/formatcellsdialog.ui"_ustr,
u"FormatCellsDialog"_ustr, pCellAttrs)
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ),
"GetTabPageCreatorFunc fail!");
- AddTabPage( u"numbers"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_NUMBERFORMAT ), nullptr );
- OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ),
"GetTabPageCreatorFunc fail!");
- AddTabPage( u"font"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_CHAR_NAME ), nullptr );
- OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ),
"GetTabPageCreatorFunc fail!");
- AddTabPage( u"fonteffects"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_CHAR_EFFECTS ), nullptr );
- OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ),
"GetTabPageCreatorFunc fail!");
- AddTabPage( u"alignment"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_ALIGNMENT ), nullptr );
+ OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_NUMBERFORMAT),
"GetTabPageCreatorFunc fail!");
+ AddTabPage(u"numbers"_ustr, TabResId(RID_TAB_NUMBERS.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_NUMBERFORMAT),
+ RID_M + RID_TAB_NUMBERS.sIconName);
+ OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME),
"GetTabPageCreatorFunc fail!");
+ AddTabPage(u"font"_ustr, TabResId(RID_TAB_FONT.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME),
+ RID_M + RID_TAB_FONT.sIconName);
+ OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS),
"GetTabPageCreatorFunc fail!");
+ AddTabPage(u"fonteffects"_ustr, TabResId(RID_TAB_FONTEFFECTS.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS),
+ RID_M + RID_TAB_FONTEFFECTS.sIconName);
+ OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGNMENT),
"GetTabPageCreatorFunc fail!");
+ AddTabPage(u"alignment"_ustr, TabResId(RID_TAB_ALIGNMENT.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGNMENT),
+ RID_M + RID_TAB_ALIGNMENT.sIconName);
if (SvtCJKOptions::IsAsianTypographyEnabled())
{
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN),
"GetTabPageCreatorFunc fail!");
- AddTabPage( u"asiantypography"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), nullptr );
+ AddTabPage(u"asiantypography"_ustr, TabResId(RID_TAB_ASIANTYPO.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN),
+ RID_M + RID_TAB_ASIANTYPO.sIconName);
}
- else
- RemoveTabPage( u"asiantypography"_ustr );
- OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ),
"GetTabPageCreatorFunc fail!");
- AddTabPage( u"borders"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BORDER ), nullptr );
- OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ),
"GetTabPageCreatorFunc fail!");
- AddTabPage( u"background"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BKG ), nullptr );
- AddTabPage( u"cellprotection"_ustr , ScTabPageProtection::Create,
nullptr );
+ OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BORDER),
"GetTabPageCreatorFunc fail!");
+ AddTabPage(u"borders"_ustr, TabResId(RID_TAB_BORDER.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BORDER), RID_M +
RID_TAB_BORDER.sIconName);
+ OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG),
"GetTabPageCreatorFunc fail!");
+ AddTabPage(u"background"_ustr, TabResId(RID_TAB_BACKGROUND.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), RID_M +
RID_TAB_BACKGROUND.sIconName);
+ AddTabPage(u"cellprotection"_ustr, TabResId(RID_TAB_PROTECTION.aLabel),
+ ScTabPageProtection::Create, RID_M +
RID_TAB_PROTECTION.sIconName);
}
ScAttrDlg::~ScAttrDlg()
diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx
b/sc/source/ui/miscdlgs/textdlgs.cxx
index 94933ca144ca..1e9219234641 100644
--- a/sc/source/ui/miscdlgs/textdlgs.cxx
+++ b/sc/source/ui/miscdlgs/textdlgs.cxx
@@ -30,19 +30,23 @@
#include <svl/intitem.hxx>
#include <svx/flagsdef.hxx>
+#include <vcl/tabs.hrc>
+
ScCharDlg::ScCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const
SfxObjectShell* pDocShell, bool bDrawText)
: SfxTabDialogController(pParent, u"modules/scalc/ui/chardialog.ui"_ustr,
u"CharDialog"_ustr, pAttr)
, m_rDocShell(*pDocShell)
, m_bDrawText(bDrawText)
{
- AddTabPage(u"font"_ustr, RID_SVXPAGE_CHAR_NAME);
- AddTabPage(u"fonteffects"_ustr, RID_SVXPAGE_CHAR_EFFECTS);
- AddTabPage(u"position"_ustr, RID_SVXPAGE_CHAR_POSITION);
+ AddTabPage(u"font"_ustr, TabResId(RID_TAB_FONT.aLabel),
RID_SVXPAGE_CHAR_NAME,
+ RID_L + RID_TAB_FONT.sIconName);
+ AddTabPage(u"fonteffects"_ustr, TabResId(RID_TAB_FONTEFFECTS.aLabel),
RID_SVXPAGE_CHAR_EFFECTS,
+ RID_L + RID_TAB_FONTEFFECTS.sIconName);
+ AddTabPage(u"position"_ustr, TabResId(RID_TAB_POSITION.aLabel),
RID_SVXPAGE_CHAR_POSITION,
+ RID_L + RID_TAB_POSITION.sIconName);
if (bDrawText)
- AddTabPage(u"background"_ustr, RID_SVXPAGE_BKG);
- else
- RemoveTabPage(u"background"_ustr);
+ AddTabPage(u"background"_ustr, TabResId(RID_TAB_HIGHLIGHTING.aLabel),
RID_SVXPAGE_BKG,
+ RID_L + RID_TAB_HIGHLIGHTING.sIconName);
}
void ScCharDlg::PageCreated(const OUString& rId, SfxTabPage &rPage)
@@ -73,13 +77,15 @@ void ScCharDlg::PageCreated(const OUString& rId, SfxTabPage
&rPage)
ScParagraphDlg::ScParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr)
: SfxTabDialogController(pParent, u"modules/scalc/ui/paradialog.ui"_ustr,
u"ParagraphDialog"_ustr, pAttr)
{
- AddTabPage(u"indents"_ustr, RID_SVXPAGE_STD_PARAGRAPH);
- AddTabPage(u"alignment"_ustr, RID_SVXPAGE_ALIGN_PARAGRAPH);
- if (SvtCJKOptions::IsAsianTypographyEnabled() )
- AddTabPage(u"asiantypo"_ustr, RID_SVXPAGE_PARA_ASIAN);
- else
- RemoveTabPage(u"asiantypo"_ustr);
- AddTabPage(u"tabs"_ustr, RID_SVXPAGE_TABULATOR);
+ AddTabPage(u"indents"_ustr, TabResId(RID_TAB_INDENTS.aLabel),
RID_SVXPAGE_STD_PARAGRAPH,
+ RID_L + RID_TAB_INDENTS.sIconName);
+ AddTabPage(u"alignment"_ustr, TabResId(RID_TAB_ALIGNMENT.aLabel),
RID_SVXPAGE_ALIGN_PARAGRAPH,
+ RID_L + RID_TAB_ALIGNMENT.sIconName);
+ if (SvtCJKOptions::IsAsianTypographyEnabled())
+ AddTabPage(u"asiantypo"_ustr, TabResId(RID_TAB_ASIANTYPO.aLabel),
RID_SVXPAGE_PARA_ASIAN,
+ RID_L + RID_TAB_ASIANTYPO.sIconName);
+ AddTabPage(u"tabs"_ustr, TabResId(RID_TAB_TABS.aLabel),
RID_SVXPAGE_TABULATOR,
+ RID_L + RID_TAB_TABS.sIconName);
}
void ScParagraphDlg::PageCreated(const OUString& rId, SfxTabPage &rPage)
diff --git a/sc/uiconfig/scalc/ui/chardialog.ui
b/sc/uiconfig/scalc/ui/chardialog.ui
index 053faf19696d..e15f1204761c 100644
--- a/sc/uiconfig/scalc/ui/chardialog.ui
+++ b/sc/uiconfig/scalc/ui/chardialog.ui
@@ -90,218 +90,9 @@
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="scrollable">True</property>
<property name="tab-pos">left</property>
+ <property name="scrollable">True</property>
<property name="group-name">icons</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="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/32/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="chardialog|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>
- </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="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/32/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="chardialog|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">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="position">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imPosition">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="icon-name">cmd/32/fontwork.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbPosition"/>
- </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="lbPosition">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="chardialog|position">Position</property>
- <property name="mnemonic-widget">position</property>
- <accessibility>
- <relation type="label-for" target="imPosition"/>
- </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/32/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="chardialog|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">3</property>
- <property name="tab-fill">False</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/formatcellsdialog.ui
b/sc/uiconfig/scalc/ui/formatcellsdialog.ui
index 57e93f8e014d..1a4aa2cb7bc8 100644
--- a/sc/uiconfig/scalc/ui/formatcellsdialog.ui
+++ b/sc/uiconfig/scalc/ui/formatcellsdialog.ui
@@ -92,433 +92,8 @@
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</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="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="formatcellsdialog|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>
- </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="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="formatcellsdialog|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">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="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="formatcellsdialog|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">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="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="formatcellsdialog|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">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="asiantypography">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imAsiantypography">
- <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="lbAsiantypography"/>
- </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="lbAsiantypography">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="formatcellsdialog|asiantypography">Asian Typography</property>
- <property name="mnemonic-widget">asiantypography</property>
- <accessibility>
- <relation type="label-for" target="imAsiantypography"/>
- </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="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="formatcellsdialog|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">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="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="formatcellsdialog|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">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="cellprotection">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imCellprotection">
- <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="lbCellprotection"/>
- </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="lbCellprotection">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="formatcellsdialog|cellprotection">Cell Protection</property>
- <property name="mnemonic-widget">cellprotection</property>
- <accessibility>
- <relation type="label-for" target="imCellprotection"/>
- </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>
+ <property name="scrollable">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/paradialog.ui
b/sc/uiconfig/scalc/ui/paradialog.ui
index 3b868936a3e0..06960516abbe 100644
--- a/sc/uiconfig/scalc/ui/paradialog.ui
+++ b/sc/uiconfig/scalc/ui/paradialog.ui
@@ -90,218 +90,9 @@
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="scrollable">True</property>
<property name="tab-pos">left</property>
+ <property name="scrollable">True</property>
<property name="group-name">icons</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="indents">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imParaIndent">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property
name="icon-name">cmd/32/paraspaceincrease.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbParaIndent"/>
- </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="lbParaIndent">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="paradialog|labelTP_PARA_STD">Indents & Spacing</property>
- <property name="mnemonic-widget">indents</property>
- <accessibility>
- <relation type="label-for" target="imParaIndent"/>
- </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="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/32/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="paradialog|labelTP_PARA_ALIGN">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">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="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/32/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="paradialog|labelTP_PARA_ASIAN">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">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="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/32/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="paradialog|labelTP_TABULATOR">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">3</property>
- <property name="tab-fill">False</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
