diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-06-08 18:30:38 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-06-08 18:30:38 +0200 |
| commit | 45a7f5b62d0b1b21763c1c94255ef2309ea4280b (patch) | |
| tree | c2b1d417022897e3efae1e7f82fb9b01225965f4 /sd | |
| parent | bd5a895c2b79b6c3a7655136a80e257656f605e4 (diff) | |
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
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/stlsheet.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
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 }; |