include/vcl/tabs.hrc | 35 +
sw/source/ui/chrdlg/chardlg.cxx | 21 -
sw/source/ui/chrdlg/pardlg.cxx | 91 ++--
sw/source/ui/dialog/uiregionsw.cxx | 63 +--
sw/source/ui/envelp/label1.cxx | 27 -
sw/source/ui/fldui/fldtdlg.cxx | 41 -
sw/source/ui/frmdlg/frmdlg.cxx | 40 +
sw/source/ui/index/cnttab.cxx | 16
sw/source/ui/misc/num.cxx | 20
sw/source/ui/table/tabledlg.cxx | 17
sw/uiconfig/swriter/ui/bulletsandnumbering.ui | 337 ----------------
sw/uiconfig/swriter/ui/characterproperties.ui | 317 ---------------
sw/uiconfig/swriter/ui/fielddialog.ui | 317 ---------------
sw/uiconfig/swriter/ui/formatsectiondialog.ui | 211 ----------
sw/uiconfig/swriter/ui/framedialog.ui | 479 -----------------------
sw/uiconfig/swriter/ui/insertsectiondialog.ui | 267 -------------
sw/uiconfig/swriter/ui/labeldialog.ui | 269 -------------
sw/uiconfig/swriter/ui/objectdialog.ui | 427 --------------------
sw/uiconfig/swriter/ui/paradialog.ui | 534 --------------------------
sw/uiconfig/swriter/ui/picturedialog.ui | 533 -------------------------
sw/uiconfig/swriter/ui/tableproperties.ui | 263 ------------
sw/uiconfig/swriter/ui/tocdialog.ui | 261 ------------
22 files changed, 232 insertions(+), 4354 deletions(-)
New commits:
commit 83ccb2bba3fdbdd0b0ec3c2ca6609b5a11c36aee
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Thu Jul 10 12:35:42 2025 +0200
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Tue Aug 5 13:08:41 2025 +0200
Related tdf#167446 - UI-less tab style (Writer formatting)
Change-Id: Ia1e40180255e4cff4f3121d0fba304cdf033c28c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187621
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/include/vcl/tabs.hrc b/include/vcl/tabs.hrc
index eb392ff4e50f..3949fdae0006 100644
--- a/include/vcl/tabs.hrc
+++ b/include/vcl/tabs.hrc
@@ -41,9 +41,9 @@ inline constexpr TabData RID_TAB_POSITION{
NC_("RID_TAB_POSITION", "Position"),
inline constexpr TabData RID_TAB_HIGHLIGHTING{ NC_("RID_TAB_HIGHLIGHTING",
"Highlighting"), u"backcolor.png"_ustr };
inline constexpr TabData RID_TAB_COLORPALETTE{ NC_("RID_TAB_COLORPALETTE",
"Color Palette"), u"colorsettings.png"_ustr };
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
& Spacing"), u"paraspaceincrease.png"_ustr };
+inline constexpr TabData RID_TAB_INDENTS{ NC_("RID_TAB_INDENTS", "Indents &
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_ORGANIZER{ NC_("RID_TAB_ORGANIZER",
"General"), 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 };
@@ -65,9 +65,33 @@ inline constexpr TabData RID_TAB_CUSTOMIZE{
NC_("RID_TAB_CUSTOMIZE", "Customize"
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_OPTIONS{ NC_("RID_TAB_FRAME_OPTIONS",
"Options"), u"calloutshapes.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 };
+// section
+inline constexpr TabData RID_TAB_SECTION{ NC_("RID_TAB_SECTION", "Section"),
u"protectfields.png"_ustr };
+inline constexpr TabData RID_TAB_FOOTENDNOTES{ NC_("RID_TAB_FOOTENDNOTES",
"Footnotes/Endnotes"), u"footnotedialog.png"_ustr };
+inline constexpr TabData RID_TAB_INDENTSONLY{ NC_("RID_TAB_INDENTS",
"Indents"), u"paraspaceincrease.png"_ustr };
+// ToC
+inline constexpr TabData RID_TAB_TOCTYPE{ NC_("RID_TAB_TOCTYPE", "Type"),
u"insertindexesentry.png"_ustr };
+inline constexpr TabData RID_TAB_TOCENTRIES{ NC_("RID_TAB_TOCENTRIES",
"Entries"), u"updatecurindex.png"_ustr };
+inline constexpr TabData RID_TAB_STYLES{ NC_("RID_TAB_STYLES", "Styles"),
u"editstyle.png"_ustr };
+// table
+inline constexpr TabData RID_TAB_TABLE{ NC_("RID_TAB_TABLE", "Table"),
u"tabledialog.png"_ustr };
+// field
+inline constexpr TabData RID_TAB_DOCUMENT{ NC_("RID_TAB_DOCUMENT",
"Document"), u"insertreferencefield.png"_ustr };
+inline constexpr TabData RID_TAB_CROSSREF{ NC_("RID_TAB_CROSSREF",
"Cross-references"), u"insertbookmark.png"_ustr };
+inline constexpr TabData RID_TAB_FUNCTIONS{ NC_("RID_TAB_FUNCTIONS",
"Functions"), u"insertplugin.png"_ustr };
+inline constexpr TabData RID_TAB_DOCINFO{ NC_("RID_TAB_DOCINFO",
"DocInformation"), u"insertdoc.png"_ustr };
+inline constexpr TabData RID_TAB_VARIABLES{ NC_("RID_TAB_VARIABLES",
"Variables"), u"insertpagenumberfield.png"_ustr };
+inline constexpr TabData RID_TAB_DATABASE{ NC_("RID_TAB_DATABASE",
"Database"), u"insertexternaldatasource.png"_ustr };
+// label / business card
+inline constexpr TabData RID_TAB_LABEL{ NC_("RID_TAB_LABEL", "Labels"),
u"label.png"_ustr };
+inline constexpr TabData RID_TAB_PRIVATE{ NC_("RID_TAB_PRIVATE", "Private"),
u"symbolshapes.moon.png"_ustr };
+inline constexpr TabData RID_TAB_BUSINESS{ NC_("RID_TAB_BUSINESS",
"Business"), u"symbolshapes.sun.png"_ustr };
+inline constexpr TabData RID_TAB_FORMAT{ NC_("RID_TAB_FORMAT", "Format"),
u"pagemargin.png"_ustr };
+inline constexpr TabData RID_TAB_LABEL_OPTIONS{ NC_("RID_TAB_LABEL_OPTIONS",
"Options"), u"printlayout.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 };
@@ -77,6 +101,11 @@ inline constexpr TabData RID_TAB_CONNECTOR{
NC_("RID_TAB_CONNECTOR", "Connector"
// 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 };
+// picture/frame formatting
+inline constexpr TabData RID_TAB_POSSIZE{ NC_("RID_TAB_POSSIZE", "Position and
Size"), u"transformdialog.png"_ustr };
+inline constexpr TabData RID_TAB_HYPERLINK{ NC_("RID_TAB_HYPERLINK",
"Hyperlink"), u"inserthyperlink.png"_ustr };
+inline constexpr TabData RID_TAB_CROP{ NC_("RID_TAB_CROP", "Crop"),
u"crop.png"_ustr };
+inline constexpr TabData RID_TAB_ROTATION{ NC_("RID_TAB_ROTATION",
"Rotation"), u"toggleobjectrotatemode.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/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index f5deab08353f..d23784fae59d 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -34,6 +34,8 @@
#include <svx/flagsdef.hxx>
#include <svx/dialogs.hrc>
+#include <vcl/tabs.hrc>
+
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::uno;
using namespace ::sfx2;
@@ -49,13 +51,18 @@ SwCharDlg::SwCharDlg(weld::Window* pParent, SwView& rView,
const SfxItemSet& rCo
{
m_xDialog->set_title(m_xDialog->get_title() +
SwResId(STR_TEXTCOLL_HEADER) + *pStr + ")");
}
- SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- AddTabPage(u"font"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), nullptr);
- AddTabPage(u"fonteffects"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), nullptr);
- AddTabPage(u"position"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_CHAR_POSITION ), nullptr );
- AddTabPage(u"asianlayout"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_CHAR_TWOLINES ), nullptr );
- AddTabPage(u"background"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BKG ), nullptr );
- AddTabPage(u"borders"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BORDER ), nullptr );
+ 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"position"_ustr, TabResId(RID_TAB_POSITION.aLabel),
RID_SVXPAGE_CHAR_POSITION,
+ RID_M + RID_TAB_POSITION.sIconName);
+ AddTabPage(u"asianlayout"_ustr, TabResId(RID_TAB_ASIANLAYOUT.aLabel),
RID_SVXPAGE_CHAR_TWOLINES,
+ RID_M + RID_TAB_ASIANLAYOUT.sIconName);
+ AddTabPage(u"background"_ustr, TabResId(RID_TAB_BACKGROUND.aLabel),
RID_SVXPAGE_BKG,
+ RID_M + RID_TAB_BACKGROUND.sIconName);
+ AddTabPage(u"borders"_ustr, TabResId(RID_TAB_BORDER.aLabel),
RID_SVXPAGE_BORDER,
+ RID_M + RID_TAB_BORDER.sIconName);
if (m_nDialogMode == SwCharDlgMode::Draw || m_nDialogMode ==
SwCharDlgMode::Ann)
{
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index d64d5dc6106b..4692ba8bcb61 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -39,6 +39,8 @@
#include <osl/diagnose.h>
#include <officecfg/Office/Common.hxx>
+#include <vcl/tabs.hrc>
+
SwParaDlg::SwParaDlg(weld::Window *pParent,
SwView& rVw,
const SfxItemSet& rCoreSet,
@@ -65,77 +67,80 @@ SwParaDlg::SwParaDlg(weld::Window *pParent,
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH),
"GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH),
"GetTabPageRangesFunc fail!");
- AddTabPage(u"indents"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH),
- pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH));
+ AddTabPage(u"indents"_ustr, TabResId(RID_TAB_INDENTS.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH),
+ pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH),
+ RID_M + RID_TAB_INDENTS.sIconName);
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH),
"GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH),
"GetTabPageRangesFunc fail!");
- AddTabPage(u"alignment"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH),
- pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH));
+ AddTabPage(u"alignment"_ustr, TabResId(RID_TAB_ALIGNMENT.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH),
+ pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH),
+ RID_M + RID_TAB_ALIGNMENT.sIconName);
if (!m_bDrawParaDlg && (!bHtmlMode ||
officecfg::Office::Common::Filter::HTML::Export::PrintLayout::get()))
{
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH),
"GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH),
"GetTabPageRangesFunc fail!");
- AddTabPage(u"textflow"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH),
-
pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH));
-
+ AddTabPage(u"textflow"_ustr, TabResId(RID_TAB_TEXTFLOW.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH),
+ pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH),
+ RID_M + RID_TAB_TEXTFLOW.sIconName);
}
- else
- RemoveTabPage(u"textflow"_ustr);
if(!bHtmlMode && SvtCJKOptions::IsAsianTypographyEnabled())
{
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN),
"GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN),
"GetTabPageRangesFunc fail!");
- 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),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN),
+ pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN),
+ RID_M + RID_TAB_ASIANTYPO.sIconName);
}
- else
- RemoveTabPage(u"asiantypo"_ustr);
- if(bHtmlMode)
- RemoveTabPage(u"tabs"_ustr);
- else
+ if (!m_bDrawParaDlg)
{
- OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR),
"GetTabPageCreatorFunc fail!");
- OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR),
"GetTabPageRangesFunc fail!");
- AddTabPage( u"tabs"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR),
pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) );
+ if(!(nDialogMode & DLG_ENVELOP))
+ AddTabPage(u"outline"_ustr, TabResId(RID_TAB_OUTLINELIST.aLabel),
+ SwParagraphNumTabPage::Create,
SwParagraphNumTabPage::GetRanges,
+ RID_M + RID_TAB_OUTLINELIST.sIconName);
}
- // remove unwanted tabs for draw text box paragraph properties
- if (m_bDrawParaDlg)
+ if(!bHtmlMode)
{
- RemoveTabPage(u"outline"_ustr);
- RemoveTabPage(u"dropcaps"_ustr);
- RemoveTabPage(u"borders"_ustr);
- RemoveTabPage(u"area"_ustr);
- RemoveTabPage(u"transparence"_ustr);
+ OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR),
"GetTabPageCreatorFunc fail!");
+ OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR),
"GetTabPageRangesFunc fail!");
+ AddTabPage(u"tabs"_ustr, TabResId(RID_TAB_TABS.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR),
+ pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR),
+ RID_M + RID_TAB_TABS.sIconName);
}
- else
+
+ if (!m_bDrawParaDlg)
{
- if(!(nDialogMode & DLG_ENVELOP))
- AddTabPage(u"outline"_ustr, SwParagraphNumTabPage::Create,
SwParagraphNumTabPage::GetRanges);
- else
- RemoveTabPage(u"outline"_ustr);
+ AddTabPage(u"dropcaps"_ustr, TabResId(RID_TAB_DROPCAPS.aLabel),
SwDropCapsPage::Create,
+ SwDropCapsPage::GetRanges, RID_M +
RID_TAB_DROPCAPS.sIconName);
- AddTabPage(u"dropcaps"_ustr, SwDropCapsPage::Create,
SwDropCapsPage::GetRanges);
+ OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ),
"GetTabPageCreatorFunc fail!");
+ OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ),
"GetTabPageRangesFunc fail!");
+ AddTabPage(u"borders"_ustr, TabResId(RID_TAB_BORDER.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BORDER),
+ pFact->GetTabPageRangesFunc(RID_SVXPAGE_BORDER),
+ RID_M + RID_TAB_BORDER.sIconName);
if(!bHtmlMode || (nHtmlMode &
(HTMLMODE_SOME_STYLES|HTMLMODE_FULL_STYLES)))
{
// add Area and Transparence TabPages
- AddTabPage(u"area"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_AREA ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_AREA ));
- AddTabPage(u"transparence"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_TRANSPARENCE ), pFact->GetTabPageRangesFunc(
RID_SVXPAGE_TRANSPARENCE ) );
- }
- else
- {
- RemoveTabPage(u"area"_ustr);
- RemoveTabPage(u"transparence"_ustr);
+ AddTabPage(u"area"_ustr, TabResId(RID_TAB_AREA.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_AREA),
+ pFact->GetTabPageRangesFunc(RID_SVXPAGE_AREA),
+ RID_M + RID_TAB_AREA.sIconName);
+ AddTabPage(u"transparence"_ustr,
TabResId(RID_TAB_TRANSPARENCE.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TRANSPARENCE),
+ pFact->GetTabPageRangesFunc(RID_SVXPAGE_TRANSPARENCE),
+ RID_M + RID_TAB_TRANSPARENCE.sIconName);
}
-
- OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ),
"GetTabPageCreatorFunc fail!");
- OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ),
"GetTabPageRangesFunc fail!");
- AddTabPage(u"borders"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
}
if (!sDefPage.isEmpty())
diff --git a/sw/source/ui/dialog/uiregionsw.cxx
b/sw/source/ui/dialog/uiregionsw.cxx
index 7fd3a57a6da4..8451e13a5f66 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -63,6 +63,8 @@
#include <memory>
#include <string_view>
+#include <vcl/tabs.hrc>
+
using namespace ::com::sun::star;
namespace {
@@ -1384,23 +1386,25 @@ SwInsertSectionTabDialog::SwInsertSectionTabDialog(
u"InsertSectionDialog"_ustr,&rSet)
, m_rWrtSh(rSh)
{
- SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- AddTabPage(u"section"_ustr, SwInsertSectionTabPage::Create, nullptr);
- AddTabPage(u"columns"_ustr, SwColumnPage::Create, nullptr);
- AddTabPage(u"background"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), nullptr);
- AddTabPage(u"notes"_ustr, SwSectionFootnoteEndTabPage::Create, nullptr);
- AddTabPage(u"indents"_ustr, SwSectionIndentTabPage::Create, nullptr);
-
tools::Long nHtmlMode = SvxHtmlOptions::GetExportMode();
+ bool bWeb = dynamic_cast<SwWebDocShell*>(rSh.GetView().GetDocShell()) !=
nullptr;
+ const bool bColumn = bWeb ? false : HTML_CFG_NS40 != nHtmlMode &&
HTML_CFG_WRITER != nHtmlMode;
+
+ SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
+ AddTabPage(u"section"_ustr, TabResId(RID_TAB_SECTION.aLabel),
SwInsertSectionTabPage::Create,
+ RID_L + RID_TAB_SECTION.sIconName);
+ if (!bWeb && !bColumn)
+ AddTabPage(u"columns"_ustr, TabResId(RID_TAB_COLUMNS.aLabel),
SwColumnPage::Create,
+ RID_L + RID_TAB_COLUMNS.sIconName);
+ if (!bWeb)
+ AddTabPage(u"indents"_ustr, TabResId(RID_TAB_INDENTSONLY.aLabel),
+ SwSectionIndentTabPage::Create, RID_L +
RID_TAB_INDENTSONLY.sIconName);
+ AddTabPage(u"background"_ustr, TabResId(RID_TAB_BACKGROUND.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), RID_L +
RID_TAB_BACKGROUND.sIconName);
+ if (!bWeb)
+ AddTabPage(u"notes"_ustr, TabResId(RID_TAB_FOOTENDNOTES.aLabel),
+ SwSectionFootnoteEndTabPage::Create, RID_L +
RID_TAB_FOOTENDNOTES.sIconName);
- bool bWeb = dynamic_cast<SwWebDocShell*>( rSh.GetView().GetDocShell() )
!= nullptr ;
- if(bWeb)
- {
- RemoveTabPage(u"notes"_ustr);
- RemoveTabPage(u"indents"_ustr);
- if( HTML_CFG_NS40 != nHtmlMode && HTML_CFG_WRITER != nHtmlMode)
- RemoveTabPage(u"columns"_ustr);
- }
SetCurPageId(u"section"_ustr);
}
@@ -2034,21 +2038,22 @@ SwSectionPropertyTabDialog::SwSectionPropertyTabDialog(
u"FormatSectionDialog"_ustr, &rSet)
, m_rWrtSh(rSh)
{
- SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- AddTabPage(u"columns"_ustr, SwColumnPage::Create, nullptr);
- AddTabPage(u"background"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), nullptr);
- AddTabPage(u"notes"_ustr, SwSectionFootnoteEndTabPage::Create, nullptr);
- AddTabPage(u"indents"_ustr, SwSectionIndentTabPage::Create, nullptr);
-
tools::Long nHtmlMode = SvxHtmlOptions::GetExportMode();
- bool bWeb = dynamic_cast<SwWebDocShell*>( rSh.GetView().GetDocShell() )
!= nullptr ;
- if(bWeb)
- {
- RemoveTabPage(u"notes"_ustr);
- RemoveTabPage(u"indents"_ustr);
- if( HTML_CFG_NS40 != nHtmlMode && HTML_CFG_WRITER != nHtmlMode)
- RemoveTabPage(u"columns"_ustr);
- }
+ bool bWeb = dynamic_cast<SwWebDocShell*>(rSh.GetView().GetDocShell()) !=
nullptr;
+ const bool bColumn = bWeb ? false : HTML_CFG_NS40 != nHtmlMode &&
HTML_CFG_WRITER != nHtmlMode;
+
+ SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
+ if (!bWeb && !bColumn)
+ AddTabPage(u"columns"_ustr, TabResId(RID_TAB_COLUMNS.aLabel),
SwColumnPage::Create,
+ RID_L + RID_TAB_COLUMNS.sIconName);
+ if (!bWeb)
+ AddTabPage(u"indents"_ustr, TabResId(RID_TAB_INDENTSONLY.aLabel),
+ SwSectionIndentTabPage::Create, RID_L +
RID_TAB_INDENTSONLY.sIconName);
+ AddTabPage(u"background"_ustr, TabResId(RID_TAB_BACKGROUND.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), RID_L +
RID_TAB_BACKGROUND.sIconName);
+ if (!bWeb)
+ AddTabPage(u"notes"_ustr, TabResId(RID_TAB_FOOTENDNOTES.aLabel),
+ SwSectionFootnoteEndTabPage::Create, RID_L +
RID_TAB_FOOTENDNOTES.sIconName);
}
SwSectionPropertyTabDialog::~SwSectionPropertyTabDialog()
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index c1c442b6211d..fc498c70cd9e 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -35,6 +35,8 @@
#include <strings.hrc>
#include <envimg.hxx>
+#include <vcl/tabs.hrc>
+
void SwLabRec::SetFromItem( const SwLabItem& rItem )
{
m_nHDist = rItem.m_lHDist;
@@ -132,22 +134,21 @@ SwLabDlg::SwLabDlg(weld::Window* pParent, const
SfxItemSet& rSet,
if (m_xExampleSet)
m_xExampleSet->Put(aItem);
- AddTabPage(u"format"_ustr, SwLabFormatPage::Create, nullptr);
- AddTabPage(u"options"_ustr, SwLabPrtPage::Create, nullptr);
- AddTabPage(u"labels"_ustr, SwLabPage::Create, nullptr);
- m_sBusinessCardDlg = SwResId(STR_BUSINESS_CARDS);
-
- if (m_bLabel)
+ AddTabPage(u"labels"_ustr, TabResId(RID_TAB_LABEL.aLabel),
SwLabPage::Create,
+ RID_L + RID_TAB_LABEL.sIconName);
+ if (!m_bLabel)
{
- RemoveTabPage(u"business"_ustr);
- RemoveTabPage(u"private"_ustr);
- }
- else
- {
- AddTabPage(u"business"_ustr, SwBusinessDataPage::Create, nullptr );
- AddTabPage(u"private"_ustr, SwPrivateDataPage::Create, nullptr);
+ AddTabPage(u"private"_ustr, TabResId(RID_TAB_PRIVATE.aLabel),
SwPrivateDataPage::Create,
+ RID_L + RID_TAB_PRIVATE.sIconName);
+ AddTabPage(u"business"_ustr, TabResId(RID_TAB_BUSINESS.aLabel),
SwBusinessDataPage::Create,
+ RID_L + RID_TAB_BUSINESS.sIconName);
m_xDialog->set_title(m_sBusinessCardDlg);
}
+ AddTabPage(u"format"_ustr, TabResId(RID_TAB_FORMAT.aLabel),
SwLabFormatPage::Create,
+ RID_L + RID_TAB_FORMAT.sIconName);
+ AddTabPage(u"options"_ustr, TabResId(RID_TAB_LABEL_OPTIONS.aLabel),
SwLabPrtPage::Create,
+ RID_L + RID_TAB_LABEL_OPTIONS.sIconName);
+ m_sBusinessCardDlg = SwResId(STR_BUSINESS_CARDS);
}
SwLabDlg::~SwLabDlg()
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 6b2b401e4e82..3d0bc7d7c8a9 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -47,6 +47,8 @@
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/frame/XModel.hpp>
+#include <vcl/tabs.hrc>
+
// carrier of the dialog
SwFieldDlg::SwFieldDlg(SfxBindings* pB, SwChildWinWrapper* /*pCW*/,
weld::Window *pParent)
: SfxTabDialogController(pParent,
u"modules/swriter/ui/fielddialog.ui"_ustr, u"FieldDialog"_ustr)
@@ -54,25 +56,32 @@ SwFieldDlg::SwFieldDlg(SfxBindings* pB, SwChildWinWrapper*
/*pCW*/, weld::Window
, m_bDataBaseMode(false)
, m_bClosing(false)
{
- bool bHtmlMode =
(::GetHtmlMode(static_cast<SwDocShell*>(SfxObjectShell::Current())) &
HTMLMODE_ON) != 0;
+ bool bHtmlMode
+ = (::GetHtmlMode(static_cast<SwDocShell*>(SfxObjectShell::Current()))
& HTMLMODE_ON) != 0;
GetCancelButton().connect_clicked(LINK(this, SwFieldDlg, CancelHdl));
GetOKButton().connect_clicked(LINK(this, SwFieldDlg, OKHdl));
- AddTabPage(u"document"_ustr, SwFieldDokPage::Create, nullptr);
- AddTabPage(u"variables"_ustr, SwFieldVarPage::Create, nullptr);
- AddTabPage(u"docinfo"_ustr, SwFieldDokInfPage::Create, nullptr);
-
+ AddTabPage(u"document"_ustr, TabResId(RID_TAB_DOCUMENT.aLabel),
SwFieldDokPage::Create,
+ RID_M + RID_TAB_DOCUMENT.sIconName);
if (!bHtmlMode)
{
- AddTabPage(u"ref"_ustr, SwFieldRefPage::Create, nullptr);
- AddTabPage(u"functions"_ustr, SwFieldFuncPage::Create, nullptr);
+ AddTabPage(u"ref"_ustr, TabResId(RID_TAB_CROSSREF.aLabel),
SwFieldRefPage::Create,
+ RID_M + RID_TAB_CROSSREF.sIconName);
+ AddTabPage(u"functions"_ustr, TabResId(RID_TAB_FUNCTIONS.aLabel),
SwFieldFuncPage::Create,
+ RID_M + RID_TAB_FUNCTIONS.sIconName);
+ }
+ AddTabPage(u"docinfo"_ustr, TabResId(RID_TAB_DOCINFO.aLabel),
SwFieldDokInfPage::Create,
+ RID_M + RID_TAB_DOCINFO.sIconName);
+ AddTabPage(u"variables"_ustr, TabResId(RID_TAB_VARIABLES.aLabel),
SwFieldVarPage::Create,
+ RID_M + RID_TAB_VARIABLES.sIconName);
+ if (!bHtmlMode && !comphelper::LibreOfficeKit::isActive())
+ {
utl::OConfigurationTreeRoot aCfgRoot
= utl::OConfigurationTreeRoot::createWithComponentContext(
::comphelper::getProcessComponentContext(),
-
u"/org.openoffice.Office.DataAccess/Policies/Features/Writer"_ustr,
- -1,
+
u"/org.openoffice.Office.DataAccess/Policies/Features/Writer"_ustr, -1,
utl::OConfigurationTreeRoot::CM_READONLY);
#if HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS
@@ -80,20 +89,10 @@ SwFieldDlg::SwFieldDlg(SfxBindings* pB, SwChildWinWrapper*
/*pCW*/, weld::Window
aCfgRoot.getNodeValue(u"DatabaseFields"_ustr) >>= bDatabaseFields;
if (bDatabaseFields)
- AddTabPage(u"database"_ustr, SwFieldDBPage::Create, nullptr);
- else
+ AddTabPage(u"database"_ustr, TabResId(RID_TAB_DATABASE.aLabel),
SwFieldDBPage::Create,
+ RID_M + RID_TAB_DATABASE.sIconName);
#endif
- RemoveTabPage(u"database"_ustr);
}
- else
- {
- RemoveTabPage(u"ref"_ustr);
- RemoveTabPage(u"functions"_ustr);
- RemoveTabPage(u"database"_ustr);
- }
-
- if (comphelper::LibreOfficeKit::isActive())
- RemoveTabPage(u"database"_ustr);
}
SwFieldDlg::~SwFieldDlg()
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 3cab9392c430..739174f148b9 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -40,6 +40,8 @@
#include <svx/drawitem.hxx>
#include <comphelper/lok.hxx>
+#include <vcl/tabs.hrc>
+
// the dialog's carrier
SwFrameDlg::SwFrameDlg(const SfxViewFrame& rViewFrame,
weld::Window* pParent,
@@ -68,27 +70,41 @@ SwFrameDlg::SwFrameDlg(const SfxViewFrame& rViewFrame,
m_xDialog->set_title(m_xDialog->get_title() +
SwResId(STR_FRMUI_COLL_HEADER) + *pStr + ")");
}
- AddTabPage(u"type"_ustr, SwFramePage::Create, nullptr);
- AddTabPage(u"options"_ustr, SwFrameAddPage::Create, nullptr);
- AddTabPage(u"wrap"_ustr, SwWrapTabPage::Create, nullptr);
- AddTabPage(u"hyperlink"_ustr, SwFrameURLPage::Create, nullptr);
+ AddTabPage(u"type"_ustr, TabResId(RID_TAB_POSSIZE.aLabel),
SwFramePage::Create,
+ RID_M + RID_TAB_POSSIZE.sIconName);
+ AddTabPage(u"options"_ustr, TabResId(RID_TAB_FRAME_OPTIONS.aLabel),
SwFrameAddPage::Create,
+ RID_M + RID_TAB_FRAME_OPTIONS.sIconName);
+ AddTabPage(u"wrap"_ustr, TabResId(RID_TAB_FRAME_WRAP.aLabel),
SwWrapTabPage::Create,
+ RID_M + RID_TAB_FRAME_WRAP.sIconName);
+ AddTabPage(u"hyperlink"_ustr, TabResId(RID_TAB_HYPERLINK.aLabel),
SwFrameURLPage::Create,
+ RID_M + RID_TAB_HYPERLINK.sIconName);
if (m_sDlgType == "PictureDialog")
{
- AddTabPage(u"picture"_ustr, SwGrfExtPage::Create, nullptr);
- AddTabPage(u"crop"_ustr, RID_SVXPAGE_GRFCROP);
+ AddTabPage(u"picture"_ustr, TabResId(RID_TAB_ROTATION.aLabel),
SwGrfExtPage::Create,
+ RID_M + RID_TAB_ROTATION.sIconName);
+ AddTabPage(u"crop"_ustr, TabResId(RID_TAB_CROP.aLabel),
RID_SVXPAGE_GRFCROP,
+ RID_M + RID_TAB_CROP.sIconName);
}
if (m_sDlgType == "FrameDialog")
{
- AddTabPage(u"columns"_ustr, SwColumnPage::Create, nullptr);
+ AddTabPage(u"columns"_ustr, TabResId(RID_TAB_COLUMNS.aLabel),
SwColumnPage::Create,
+ RID_M + RID_TAB_COLUMNS.sIconName);
}
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
// add Area and Transparence TabPages
- AddTabPage(u"area"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ),
pFact->GetTabPageRangesFunc( RID_SVXPAGE_AREA ));
- AddTabPage(u"transparence"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_TRANSPARENCE ), pFact->GetTabPageRangesFunc(
RID_SVXPAGE_TRANSPARENCE ) );
-
- AddTabPage(u"macro"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), nullptr);
- AddTabPage(u"borders"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BORDER ), nullptr);
+ AddTabPage(u"area"_ustr, TabResId(RID_TAB_AREA.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_AREA),
+ pFact->GetTabPageRangesFunc(RID_SVXPAGE_AREA), RID_M +
RID_TAB_AREA.sIconName);
+ AddTabPage(u"transparence"_ustr, TabResId(RID_TAB_TRANSPARENCE.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TRANSPARENCE),
+ pFact->GetTabPageRangesFunc(RID_SVXPAGE_TRANSPARENCE),
+ RID_M + RID_TAB_TRANSPARENCE.sIconName);
+
+ AddTabPage(u"macro"_ustr, TabResId(RID_TAB_MACRO.aLabel),
RID_SVXPAGE_MACROASSIGN,
+ RID_M + RID_TAB_MACRO.sIconName);
+ AddTabPage(u"borders"_ustr, TabResId(RID_TAB_BORDER.aLabel),
RID_SVXPAGE_BORDER,
+ RID_M + RID_TAB_BORDER.sIconName);
if(bHTMLMode)
{
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index b16793612366..337df748ed2c 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -72,6 +72,7 @@
#include <vector>
#include <numeric>
+#include <vcl/tabs.hrc>
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
@@ -272,11 +273,16 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(weld::Widget*
pParent, const SfxItemSet
}
}
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- AddTabPage(u"index"_ustr, SwTOXSelectTabPage::Create, nullptr);
- AddTabPage(u"styles"_ustr, SwTOXStylesTabPage::Create, nullptr);
- AddTabPage(u"columns"_ustr, SwColumnPage::Create, nullptr);
- AddTabPage(u"background"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), nullptr);
- AddTabPage(u"entries"_ustr, SwTOXEntryTabPage::Create, nullptr);
+ AddTabPage(u"index"_ustr, TabResId(RID_TAB_TOCTYPE.aLabel),
SwTOXSelectTabPage::Create,
+ RID_L + RID_TAB_TOCTYPE.sIconName);
+ AddTabPage(u"entries"_ustr, TabResId(RID_TAB_TOCENTRIES.aLabel),
SwTOXEntryTabPage::Create,
+ RID_L + RID_TAB_TOCENTRIES.sIconName);
+ AddTabPage(u"styles"_ustr, TabResId(RID_TAB_STYLES.aLabel),
SwTOXStylesTabPage::Create,
+ RID_L + RID_TAB_STYLES.sIconName);
+ AddTabPage(u"columns"_ustr, TabResId(RID_TAB_COLUMNS.aLabel),
SwColumnPage::Create,
+ RID_L + RID_TAB_COLUMNS.sIconName);
+ AddTabPage(u"background"_ustr, TabResId(RID_TAB_BACKGROUND.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), RID_L +
RID_TAB_BACKGROUND.sIconName);
if (!pCurTOX)
SetCurPageId(u"index"_ustr);
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index ffb2f9f243a6..78bc532fe860 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -39,6 +39,8 @@
#include <comphelper/lok.hxx>
#include <osl/diagnose.h>
+#include <vcl/tabs.hrc>
+
static bool bLastRelative = false;
//See cui/uiconfig/ui/numberingpositionpage.ui for effectively a duplicate
@@ -872,12 +874,18 @@
SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(weld::Window* pParent,
pButton->set_sensitive(m_rWrtSh.GetNumRuleAtCurrCursorPos() != nullptr);
weld::Button& pCancelButton = GetCancelButton();
pCancelButton.connect_clicked(LINK(this, SwSvxNumBulletTabDialog,
CancelHdl));
- AddTabPage(u"singlenum"_ustr, RID_SVXPAGE_PICK_SINGLE_NUM );
- AddTabPage(u"bullets"_ustr, RID_SVXPAGE_PICK_BULLET );
- AddTabPage(u"outlinenum"_ustr, RID_SVXPAGE_PICK_NUM );
- AddTabPage(u"graphics"_ustr, RID_SVXPAGE_PICK_BMP );
- AddTabPage(u"customize"_ustr, RID_SVXPAGE_NUM_OPTIONS );
- AddTabPage(u"position"_ustr, RID_SVXPAGE_NUM_POSITION );
+ AddTabPage(u"singlenum"_ustr, TabResId(RID_TAB_UNOORDERED.aLabel),
RID_SVXPAGE_PICK_SINGLE_NUM,
+ RID_M + RID_TAB_UNOORDERED.sIconName);
+ AddTabPage(u"bullets"_ustr, TabResId(RID_TAB_ORDERED.aLabel),
RID_SVXPAGE_PICK_BULLET,
+ RID_M + RID_TAB_ORDERED.sIconName);
+ AddTabPage(u"outlinenum"_ustr, TabResId(RID_TAB_OUTLINE.aLabel),
RID_SVXPAGE_PICK_NUM,
+ RID_M + RID_TAB_OUTLINE.sIconName);
+ AddTabPage(u"graphics"_ustr, TabResId(RID_TAB_IMAGE.aLabel),
RID_SVXPAGE_PICK_BMP,
+ RID_M + RID_TAB_IMAGE.sIconName);
+ AddTabPage(u"position"_ustr, TabResId(RID_TAB_LIST_POSITION.aLabel),
RID_SVXPAGE_NUM_POSITION,
+ RID_M + RID_TAB_LIST_POSITION.sIconName);
+ AddTabPage(u"customize"_ustr, TabResId(RID_TAB_CUSTOMIZE.aLabel),
RID_SVXPAGE_NUM_OPTIONS,
+ RID_M + RID_TAB_CUSTOMIZE.sIconName);
}
SwSvxNumBulletTabDialog::~SwSvxNumBulletTabDialog()
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index b6e04623d8e0..27556a2dfe96 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -62,6 +62,8 @@
#include <com/sun/star/text/HoriOrientation.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
+#include <vcl/tabs.hrc>
+
using namespace ::com::sun::star;
SwFormatTablePage::SwFormatTablePage(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rSet)
@@ -1223,11 +1225,16 @@ SwTableTabDlg::SwTableTabDlg(weld::Window* pParent,
const SfxItemSet* pItemSet,
, m_pShell(pSh)
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- AddTabPage(u"table"_ustr, &SwFormatTablePage::Create, nullptr);
- AddTabPage(u"textflow"_ustr, &SwTextFlowPage::Create, nullptr);
- AddTabPage(u"columns"_ustr, &SwTableColumnPage::Create, nullptr);
- AddTabPage(u"background"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), nullptr);
- AddTabPage(u"borders"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BORDER), nullptr);
+ AddTabPage(u"table"_ustr, TabResId(RID_TAB_TABLE.aLabel),
&SwFormatTablePage::Create,
+ RID_L + RID_TAB_TABLE.sIconName);
+ AddTabPage(u"textflow"_ustr, TabResId(RID_TAB_TEXTFLOW.aLabel),
&SwTextFlowPage::Create,
+ RID_L + RID_TAB_TEXTFLOW.sIconName);
+ AddTabPage(u"columns"_ustr, TabResId(RID_TAB_COLUMNS.aLabel),
&SwTableColumnPage::Create,
+ RID_L + RID_TAB_COLUMNS.sIconName);
+ AddTabPage(u"borders"_ustr, TabResId(RID_TAB_BORDER.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BORDER), RID_L +
RID_TAB_BORDER.sIconName);
+ AddTabPage(u"background"_ustr, TabResId(RID_TAB_BACKGROUND.aLabel),
+ pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), RID_L +
RID_TAB_BACKGROUND.sIconName);
}
void SwTableTabDlg::PageCreated(const OUString& rId, SfxTabPage& rPage)
diff --git a/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
b/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
index e8789272125e..f21b1252f586 100644
--- a/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
+++ b/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
@@ -116,343 +116,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>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkBox" id="bullets">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imBullets">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property
name="icon-name">cmd/lc_defaultbullet.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbBullets"/>
- </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="lbBullets">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="tooltip-text" translatable="yes"
context="bulletsandnumbering|bullets">Select a bullet type for an unordered
list.</property>
- <property name="label" translatable="yes"
context="bulletsandnumbering|bullets">Unordered</property>
- <property name="mnemonic-widget">bullets</property>
- <accessibility>
- <relation type="label-for" target="imBullets"/>
- </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>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkBox" id="singlenum">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imSinglenum">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property
name="icon-name">cmd/lc_defaultnumbering.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbSinglenum"/>
- </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="lbSinglenum">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="tooltip-text" translatable="yes"
context="bulletsandnumbering|singlenum">Select a numbering scheme for an
ordered list.</property>
- <property name="label" translatable="yes"
context="bulletsandnumbering|singlenum">Ordered</property>
- <property name="mnemonic-widget">singlenum</property>
- <accessibility>
- <relation type="label-for" target="imSinglenum"/>
- </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>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkBox" id="outlinenum">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imOutlinenum">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="icon-name">cmd/lc_setoutline.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbOutlinenum"/>
- </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="lbOutlinenum">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="tooltip-text" translatable="yes"
context="bulletsandnumbering|outlinenum">Select an outline format for an
ordered list.</property>
- <property name="label" translatable="yes"
context="bulletsandnumbering|outlinenum">Outline</property>
- <property name="mnemonic-widget">outlinenum</property>
- <accessibility>
- <relation type="label-for" target="imOutlinenum"/>
- </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>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkBox" id="graphics">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imGraphics">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property
name="icon-name">cmd/lc_imagebutton.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbGraphics"/>
- </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="lbGraphics">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="tooltip-text" translatable="yes"
context="bulletsandnumbering|graphics">Select a graphic bullet symbol for an
unordered list.</property>
- <property name="label" translatable="yes"
context="bulletsandnumbering|graphics">Image</property>
- <property name="mnemonic-widget">graphics</property>
- <accessibility>
- <relation type="label-for" target="imGraphics"/>
- </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>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">4</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/lc_hangingindent.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="tooltip-text" translatable="yes"
context="bulletsandnumbering|position">Modify indent, spacing, and alignment
options for ordered and unordered lists.</property>
- <property name="label" translatable="yes"
context="bulletsandnumbering|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">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>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">5</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkBox" id="customize">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imCustomize">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property
name="icon-name">cmd/lc_developmenttoolsdockingwindow.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbCustomize"/>
- </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="lbCustomize">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="tooltip-text" translatable="yes"
context="bulletsandnumbering|customize">Design your own bullet or numbering
scheme.</property>
- <property name="label" translatable="yes"
context="bulletsandnumbering|customize">Customize</property>
- <property name="mnemonic-widget">customize</property>
- <accessibility>
- <relation type="label-for" target="imCustomize"/>
- </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>
+ <property name="scrollable">True</property>
</object>
<packing>
<property name="expand">True</property>
diff --git a/sw/uiconfig/swriter/ui/characterproperties.ui
b/sw/uiconfig/swriter/ui/characterproperties.ui
index 6a8ce9101407..19d100a4e0d3 100644
--- a/sw/uiconfig/swriter/ui/characterproperties.ui
+++ b/sw/uiconfig/swriter/ui/characterproperties.ui
@@ -115,323 +115,6 @@
<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="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="characterproperties|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/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="characterproperties|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/lc_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="characterproperties|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="asianlayout">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imAsianlayout">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property
name="icon-name">cmd/lc_textdirectiontoptobottom.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbAsianlayout"/>
- </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="lbAsianlayout">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="characterproperties|asianlayout">Asian Layout</property>
- <property name="mnemonic-widget">asianlayout</property>
- <accessibility>
- <relation type="label-for" target="imAsianlayout"/>
- </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="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="characterproperties|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">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="characterproperties|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>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/fielddialog.ui
b/sw/uiconfig/swriter/ui/fielddialog.ui
index bf38eadb16fb..690b3b8ac672 100644
--- a/sw/uiconfig/swriter/ui/fielddialog.ui
+++ b/sw/uiconfig/swriter/ui/fielddialog.ui
@@ -102,323 +102,6 @@
<property name="hexpand">True</property>
<property name="vexpand">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="document">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imDocument">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property
name="icon-name">cmd/lc_insertreferencefield.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbDocument"/>
- </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="lbDocument">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="fielddialog|document">Document</property>
- <property name="mnemonic-widget">document</property>
- <accessibility>
- <relation type="label-for" target="imDocument"/>
- </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="ref">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imRef">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property
name="icon-name">cmd/lc_insertbookmark.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbRef"/>
- </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="lbRef">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="fielddialog|ref">Cross-references</property>
- <property name="mnemonic-widget">ref</property>
- <accessibility>
- <relation type="label-for" target="imRef"/>
- </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="functions">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imFunctions">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property
name="icon-name">cmd/lc_insertplugin.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbFunctions"/>
- </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="lbFunctions">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="fielddialog|functions">Functions</property>
- <property name="mnemonic-widget">functions</property>
- <accessibility>
- <relation type="label-for" target="imFunctions"/>
- </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="docinfo">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imDocinfo">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="icon-name">cmd/lc_insertdoc.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbDocinfo"/>
- </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="lbDocinfo">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="fielddialog|docinfo">DocInformation</property>
- <property name="mnemonic-widget">docinfo</property>
- <accessibility>
- <relation type="label-for" target="imDocinfo"/>
- </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="variables">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imVariables">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property
name="icon-name">cmd/lc_insertpagenumberfield.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbVariables"/>
- </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="lbVariables">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="fielddialog|variables">Variables</property>
- <property name="mnemonic-widget">variables</property>
- <accessibility>
- <relation type="label-for" target="imVariables"/>
- </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="database">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imDatabase">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property
name="icon-name">cmd/lc_insertexternaldatasource.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbDatabase"/>
- </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="lbDatabase">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="fielddialog|database">Database</property>
- <property name="mnemonic-widget">database</property>
- <accessibility>
- <relation type="label-for" target="imDatabase"/>
- </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>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/formatsectiondialog.ui
b/sw/uiconfig/swriter/ui/formatsectiondialog.ui
index c7a95b3cb9fa..5c6d6145dfe0 100644
--- a/sw/uiconfig/swriter/ui/formatsectiondialog.ui
+++ b/sw/uiconfig/swriter/ui/formatsectiondialog.ui
@@ -93,218 +93,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="columns">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imColumns">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property
name="icon-name">cmd/32/pagecolumntype.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbColumns"/>
- </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="lbColumns">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="formatsectiondialog|columns">Columns</property>
- <property name="mnemonic-widget">columns</property>
- <accessibility>
- <relation type="label-for" target="imColumns"/>
- </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="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/32/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="formatsectiondialog|indents">Indents</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">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="background">
- <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/32/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="formatsectiondialog|background">Background</property>
- <property name="mnemonic-widget">background</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="notes">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imNotes">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property
name="icon-name">cmd/32/footnotedialog.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbNotes"/>
- </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="lbNotes">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="formatsectiondialog|notes">Footnotes/Endnotes</property>
- <property name="mnemonic-widget">notes</property>
- <accessibility>
- <relation type="label-for" target="imNotes"/>
- </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/sw/uiconfig/swriter/ui/framedialog.ui
b/sw/uiconfig/swriter/ui/framedialog.ui
index 7ec7c2653646..23a41a2d7ade 100644
--- a/sw/uiconfig/swriter/ui/framedialog.ui
+++ b/sw/uiconfig/swriter/ui/framedialog.ui
@@ -94,485 +94,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="type">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imType">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property
name="icon-name">cmd/lc_transformdialog.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbType"/>
- </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="lbType">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="framedialog|type">Position and Size</property>
- <property name="mnemonic-widget">type</property>
- <accessibility>
- <relation type="label-for" target="imType"/>
- </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="options">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imOptions">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property
name="icon-name">cmd/lc_calloutshapes.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbOptions"/>
- </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="lbOptions">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="framedialog|options">Options</property>
- <property name="mnemonic-widget">options</property>
- <accessibility>
- <relation type="label-for" target="imOptions"/>
- </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="wrap">
- <property name="can-focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkImage" id="imWrap">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property
name="icon-name">cmd/lc_wrapcontour.png</property>
- <accessibility>
- <relation type="labelled-by" target="lbWrap"/>
- </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="lbWrap">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="framedialog|wrap">Wrap</property>
- <property name="mnemonic-widget">wrap</property>
- <accessibility>
- <relation type="label-for" target="imWrap"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
-e
... etc. - the rest is truncated
