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

[Dr. David Alan Gilbert (via logerrit)]

 filter/source/msfilter/svdfppt.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit f52932218c5365cbe1635f88d310d9e1189ed182
Author:     Dr. David Alan Gilbert <dave at treblig.org>
AuthorDate: Sat Sep 12 20:31:46 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 14 10:09:29 2020 +0200

    tdf#49856 Fix level 0 bullet/style on ppt import
    
    Long ago, styles were read in starting in slot 1 and
    slot 0 was backfilled using the last read rule.
    That changed in 8a64144fddde61dd050da4cb93b4a7242a495bb2 when
    stuff started at 0; unfortunately the back filling at 0
    code was left in, overwritting level 0.
    
    Remove it, fixing cases which used level 0; in particular
    a shift-tab to go up a level ended up with the wrong
    style.
    
    Fixes: 8a64144fddde61dd050da4cb93b4a7242a495bb2
    Change-Id: Ic29f3fca9f1c809de69a1d83fca017bdafdd2447
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102542
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index a8e2905ce70d..4e2811d04772 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -4387,8 +4387,6 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
             {
                 for ( ;nDepth < nLevels; nDepth++ )
                     aRule.SetLevel( nDepth, aNumberFormat );
-                if ( eNumRuleType == SvxNumRuleType::PRESENTATION_NUMBERING )
-                    aRule.SetLevel( 0, aNumberFormat );
             }
         }
         mpNumBulletItem[ i ] = new SvxNumBulletItem( aRule, EE_PARA_NUMBULLET );