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

[Stephan Bergmann]

 sd/source/core/stlsheet.cxx |   17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 45a7f5b62d0b1b21763c1c94255ef2309ea4280b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jun 8 18:30:38 2017 +0200

    Keep WID ranges sorted, and join adjacent ones
    
    ...to stop CppunitTest_sd_dialogs_test failing with
    
    > cppunittester: /data/sbergman/lo-san/core/svl/source/items/itemset.cxx:678: void SfxItemSet::MergeRange(sal_uInt16, sal_uInt16): Assertion `!pRange[2] || (pRange[2] - pRange[1]) > 1' failed.
    
    (and whyever that only started to hit now)
    
    Change-Id: Iadb5538b8b10182ddf5dbe02d34d7c73c7d62a14

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 5c88bba0505f..74fe9937bde8 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -228,16 +228,13 @@ SfxItemSet& SdStyleSheet::GetItemSet()
                                         SDRATTR_SHADOW_FIRST,           SDRATTR_SHADOW_LAST,
                                         SDRATTR_TEXT_MINFRAMEHEIGHT,    SDRATTR_TEXT_CONTOURFRAME,
 
-                                        SDRATTR_TEXT_WORDWRAP,          SDRATTR_TEXT_WORDWRAP,
-
-                                        SDRATTR_EDGE_FIRST,             SDRATTR_EDGE_LAST,
-                                        SDRATTR_MEASURE_FIRST,          SDRATTR_MEASURE_LAST,
-
-                                        EE_PARA_START,                  EE_CHAR_END,
+                                        SDRATTR_XMLATTRIBUTES,          SDRATTR_TEXT_WORDWRAP,
 
-                                        SDRATTR_XMLATTRIBUTES,          SDRATTR_TEXT_USEFIXEDCELLHEIGHT,
+                                        SDRATTR_EDGE_FIRST,             SDRATTR_MEASURE_LAST,
 
                                         SDRATTR_3D_FIRST, SDRATTR_3D_LAST,
+
+                                        EE_PARA_START,                  EE_CHAR_END,
                                         0, 0 };
 
             pSet = new SfxItemSet(GetPool().GetPool(), nWhichPairTable);
@@ -257,12 +254,12 @@ SfxItemSet& SdStyleSheet::GetItemSet()
                                         SDRATTR_SHADOW_FIRST,           SDRATTR_SHADOW_LAST,
                                         SDRATTR_TEXT_MINFRAMEHEIGHT,    SDRATTR_TEXT_CONTOURFRAME,
 
+                                        SDRATTR_XMLATTRIBUTES,          SDRATTR_XMLATTRIBUTES,
                                         SDRATTR_TEXT_WORDWRAP,          SDRATTR_TEXT_WORDWRAP,
 
-                                        EE_PARA_START,                  EE_CHAR_END,
-
                                         SDRATTR_TABLE_FIRST,            SDRATTR_TABLE_LAST,
-                                        SDRATTR_XMLATTRIBUTES,          SDRATTR_XMLATTRIBUTES,
+
+                                        EE_PARA_START,                  EE_CHAR_END,
 
                                         0, 0 };