[Libreoffice-commits] core.git: dbaccess/source

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/misc/UITools.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 94d5fd4a948cb9fbe4d5260db30d20bae1d3177f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jul 16 16:46:04 2021 +0100
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Jul 16 20:43:04 2021 +0200

    fix svl::detail::validRanges2(m_pWhichRanges) assert seen in dbaccess
    
    Change-Id: I4328d0eae0030d6455b80d8506496fe44cf02195
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119080
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 08b6bc5f2af0..c590bf993915 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -765,14 +765,14 @@ bool callColumnFormatDialog(weld::Widget* _pParent,
         { 0, false },
         { SID_ATTR_NUMBERFORMAT_VALUE,      true },
         { SID_ATTR_ALIGN_HOR_JUSTIFY,       true },
-        { SID_ATTR_NUMBERFORMAT_ONE_AREA,   true },
-        { SID_ATTR_NUMBERFORMAT_INFO,       true }
+        { SID_ATTR_NUMBERFORMAT_INFO,       true },
+        { SID_ATTR_NUMBERFORMAT_ONE_AREA,   true }
     };
     static const sal_uInt16 aAttrMap[] =
     {
         SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY,
-        SID_ATTR_NUMBERFORMAT_ONE_AREA, SID_ATTR_NUMBERFORMAT_ONE_AREA,
         SID_ATTR_NUMBERFORMAT_INFO, SID_ATTR_NUMBERFORMAT_INFO,
+        SID_ATTR_NUMBERFORMAT_ONE_AREA, SID_ATTR_NUMBERFORMAT_ONE_AREA,
         0
     };
 
@@ -781,8 +781,8 @@ bool callColumnFormatDialog(weld::Widget* _pParent,
         new SfxRangeItem(SBA_DEF_RANGEFORMAT, SBA_DEF_FMTVALUE, SBA_ATTR_ALIGN_HOR_JUSTIFY),
         new SfxUInt32Item(SBA_DEF_FMTVALUE),
         new SvxHorJustifyItem(SvxCellHorJustify::Standard, SBA_ATTR_ALIGN_HOR_JUSTIFY),
-        new SfxBoolItem(SID_ATTR_NUMBERFORMAT_ONE_AREA, false),
-        new SvxNumberInfoItem(SID_ATTR_NUMBERFORMAT_INFO)
+        new SvxNumberInfoItem(SID_ATTR_NUMBERFORMAT_INFO),
+        new SfxBoolItem(SID_ATTR_NUMBERFORMAT_ONE_AREA, false)
     };
 
     rtl::Reference<SfxItemPool> pPool(new SfxItemPool("GridBrowserProperties", SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, &pDefaults));