sw/source/ui/frmdlg/column.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
New commits: commit 375a0c6901d48a51ee8f4418afa85c2f191bbae4 Author: Mike Kaganski <mike.kagan...@collabora.com> AuthorDate: Mon Jun 28 23:12:24 2021 +0200 Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com> CommitDate: Tue Jun 29 10:31:22 2021 +0200 tdf#143107 related: ensure correct order of which ids ... discovered after 8aaa28ed43978a9a4a20d62368410a57ec05c23f Change-Id: I1a14d227414210393c00c395486ede6daa438218 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118053 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> (cherry picked from commit 7c95c16deba975b0b282ccea1fbfcfadd7aa28b3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118057 Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 7a2baccac79d..d3d849eb10c0 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -98,10 +98,9 @@ SwColumnDlg::SwColumnDlg(weld::Window* pParent, SwWrtShell& rSh) m_nSelectionWidth = aRect.Width(); SfxItemSet* pColPgSet = nullptr; - static sal_uInt16 const aSectIds[] = { RES_COL, RES_COL, - RES_FRM_SIZE, RES_FRM_SIZE, - RES_COLUMNBALANCE, RES_FRAMEDIR, - 0 }; + static svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, + RES_COL, RES_COL, + RES_COLUMNBALANCE, RES_FRAMEDIR> const aSectIds; const SwSection* pCurrSection = m_rWrtShell.GetCurrSection(); const sal_uInt16 nFullSectCnt = m_rWrtShell.GetFullSelectedSectionCount(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits