[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sw/source

[Mike Kaganski (via logerrit)]

 sw/source/ui/frmdlg/column.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 9f3367a92c65fd9612e3dc73675e52593bfac0ce
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon Jun 28 23:12:24 2021 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Wed Jun 30 12:21:28 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.kaganski at collabora.com>
    (cherry picked from commit 7c95c16deba975b0b282ccea1fbfcfadd7aa28b3)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118106
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 4adf7cb34447..97db736aeee6 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();