[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sd/source

[Noel Grandin]

 sd/source/filter/eppt/pptx-text.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ba0909f83e65ec953ba517f09c06053709fbb523
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Tue Oct 24 09:01:24 2017 +0200

    tdf#113227 FILESAVE: PPT: bullets disappear after RT
    
    regression from
    
            commit afa675469cd9894f41a6b9eeb2e7acc8245d256c
            use SvxExtNumType in SvxNumberType
    
    where I managed to put a "default: break" statement in the wrong place
    
    Change-Id: Ic821a03208a75363c538c4641077b084f1e2d242
    Reviewed-on: https://gerrit.libreoffice.org/43737
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit f99767d532dbe2741cb9cccf26db3547cc5e14df)
    Reviewed-on: https://gerrit.libreoffice.org/43743
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 0cdf747dce6e..f84f1550809a 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -1076,14 +1076,15 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider* pBuProv, sal_Int1
                                 default:
                                     break;
                             }
-                            break;
-                            default: break;
                         }
                         nParaFlags |= 0x2f;
                         nBulletFlags |= 6;
                         if ( mbIsBullet && bNumberingIsNumber )
                             nBulletFlags |= 1;
+                        break;
                     }
+                    default:
+                        break;
                 }
             }
         }