sw/source/ui/frmdlg/frmdlg.cxx | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 276db30733eb7e6e6c558e5f2b775e49b8fcfe31
Author: Heiko Tietze <heiko.tie...@documentfoundation.org>
AuthorDate: Fri Sep 12 09:57:18 2025 +0200
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Fri Sep 12 15:35:07 2025 +0200
Resolves tdf#168059 - Reinstate tab order at the image/frames dialog
Change-Id: I40dd3f59ccef90a33dc5d48568c132d76ec4fdf4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190856
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 739174f148b9..862233bdc4bd 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -85,14 +85,11 @@ SwFrameDlg::SwFrameDlg(const SfxViewFrame& rViewFrame,
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, TabResId(RID_TAB_COLUMNS.aLabel),
SwColumnPage::Create,
- RID_M + RID_TAB_COLUMNS.sIconName);
- }
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
// add Area and Transparence TabPages
+ AddTabPage(u"borders"_ustr, TabResId(RID_TAB_BORDER.aLabel),
RID_SVXPAGE_BORDER,
+ RID_M + RID_TAB_BORDER.sIconName);
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);
@@ -100,11 +97,13 @@ SwFrameDlg::SwFrameDlg(const SfxViewFrame& rViewFrame,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TRANSPARENCE),
pFact->GetTabPageRangesFunc(RID_SVXPAGE_TRANSPARENCE),
RID_M + RID_TAB_TRANSPARENCE.sIconName);
-
+ if (m_sDlgType == "FrameDialog")
+ {
+ AddTabPage(u"columns"_ustr, TabResId(RID_TAB_COLUMNS.aLabel),
SwColumnPage::Create,
+ RID_M + RID_TAB_COLUMNS.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)
{
