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

Jan-Marek Glogowski glogow at fbihome.de
Sat Aug 15 14:13:30 PDT 2015


 editeng/source/editeng/eerdll.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 2238bb47f5fce8449760e71525153967b4ce873c
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Wed Aug 5 14:13:54 2015 +0000

    tdf#93052 Fix abundance of calc annotation styles
    
    This is a regression introduced by fixing tdf#47018, which
    changed the default NumRule and pushed a lot of SVX_MAX_NUM
    to the SvxNumRule constructors.
    
    The changed NumRule default seems not needed to fix the crash;
    at least it still doesn't crash as described in the old bug
    report after reverting this part of the change.
    
    Change-Id: I908eeb4a827799419d3f28584fdcbc9272cbc76d
    Reviewed-on: https://gerrit.libreoffice.org/17527
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 9250e23..13704f8 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -101,8 +101,7 @@ SfxPoolItem** GlobalEditData::GetDefItems()
         ppDefItems = new SfxPoolItem*[EDITITEMCOUNT];
 
         // Paragraph attributes:
-        SvxNumRule aDefaultNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::BULLET_COLOR | SvxNumRuleFlags::CHAR_TEXT_DISTANCE,
-                                    SVX_MAX_NUM, false );
+        SvxNumRule aDefaultNumRule( SvxNumRuleFlags::NONE, SVX_MAX_NUM, false );
 
         ppDefItems[0]  = new SvxFrameDirectionItem( FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR );
         ppDefItems[1]  = new SvXMLAttrContainerItem( EE_PARA_XMLATTRIBS );


More information about the Libreoffice-commits mailing list