[Libreoffice-commits] core.git: Branch 'libreoffice-6-3-0' - 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 45e5be4d0cbd7a31fa9b32c729611b4afca7bcba
Author:     Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Wed Jul 17 13:57:58 2019 +0300
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Mon Jul 29 11:06:33 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>
    (cherry picked from commit 1f6c4328bfa00da5cf351dd050a80b75e0f1acde)
    Reviewed-on: https://gerrit.libreoffice.org/75945
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    (cherry picked from commit 95308943748bd650ee52e6e7570090f9c6a940b1)
    Reviewed-on: https://gerrit.libreoffice.org/76089
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Bartosz Kosiorek <gang65 at poczta.onet.pl>
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index 2905170627a4..60a97f87c996 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -488,9 +488,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();
@@ -527,8 +528,6 @@ void SvxBulletAndPositionDlg::InitControls()
             }
             nHighestLevel = i;
         }
-        else
-            aNumFmtArr[i] = nullptr;
 
         nMask <<= 1;
     }