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

[Gülşah Köse (via logerrit)]

 sd/source/ui/dlg/BulletAndPositionDlg.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 1f6c4328bfa00da5cf351dd050a80b75e0f1acde
Author:     Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Wed Jul 17 13:57:58 2019 +0300
Commit:     Gülşah Köse <gulsah.kose at collabora.com>
CommitDate: Fri Jul 19 12:13:30 2019 +0200

    tdf#126334 Fix number format array  in init controls.
    
    Customization changings need only selected number format object but
    Position changings on bullet need all existing number format array.
    After merge the customization and position keeping all numbering format
    objects (10 item) make sense.
    
    Change-Id: Iade1e154243deaed43b9d243f2ebd0c5298b42a4
    Reviewed-on: https://gerrit.libreoffice.org/75784
    Tested-by: Jenkins
    Reviewed-by: Gülşah Köse <gulsah.kose at collabora.com>

diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index 659833829517..38c7b7e00094 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -469,9 +469,10 @@ void SvxBulletAndPositionDlg::InitControls()
     bool bBullRelSize = pActNum->IsFeatureSupported(SvxNumRuleFlags::BULLET_REL_SIZE);
     for (sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
     {
+        aNumFmtArr[i] = &pActNum->GetLevel(i);
+
         if (nActNumLvl & nMask)
         {
-            aNumFmtArr[i] = &pActNum->GetLevel(i);
             bShowBullet &= aNumFmtArr[i]->GetNumberingType() == SVX_NUM_CHAR_SPECIAL;
             bShowBitmap &= (aNumFmtArr[i]->GetNumberingType() & (~LINK_TOKEN)) == SVX_NUM_BITMAP;
             eFirstAdjust = aNumFmtArr[i]->GetNumAdjust();
@@ -508,8 +509,6 @@ void SvxBulletAndPositionDlg::InitControls()
             }
             nHighestLevel = i;
         }
-        else
-            aNumFmtArr[i] = nullptr;
 
         nMask <<= 1;
     }