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

[Stephan Bergmann]

 sd/source/core/stlsheet.cxx |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit b7ea55e6d7fbb14c931de1a32b8c872735aad1fd
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Aug 22 16:57:56 2017 +0200

    Join adjacent WID ranges
    
    ...after 5a64d8b20ed74559617d2f97c3f941842b6a9ea1 "drop unused
    SdrCustomShapeAdjustmentItem" brought SDRATTR_TEXT_CONTOURFRAME next to
    SDRATTR_XMLATTRIBUTES.  Stops CppunitTest_sd_dialogs_test from failing again,
    similar to previous 45a7f5b62d0b1b21763c1c94255ef2309ea4280b "Keep WID ranges
    sorted, and join adjacent ones".
    
    Change-Id: I0e93a64dd617a09872e19acd5597c5a4dd54b887

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 4275663e8ed3..6b26361b3549 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -218,9 +218,7 @@ SfxItemSet& SdStyleSheet::GetItemSet()
                                         XATTR_FILL_FIRST,              XATTR_FILL_LAST,
 
                                         SDRATTR_SHADOW_FIRST,           SDRATTR_SHADOW_LAST,
-                                        SDRATTR_TEXT_MINFRAMEHEIGHT,    SDRATTR_TEXT_CONTOURFRAME,
-
-                                        SDRATTR_XMLATTRIBUTES,          SDRATTR_TEXT_WORDWRAP,
+                                        SDRATTR_TEXT_MINFRAMEHEIGHT,    SDRATTR_TEXT_WORDWRAP,
 
                                         SDRATTR_EDGE_FIRST,             SDRATTR_MEASURE_LAST,
 
@@ -245,9 +243,7 @@ SfxItemSet& SdStyleSheet::GetItemSet()
                                         XATTR_FILL_FIRST,              XATTR_FILL_LAST,
 
                                         SDRATTR_SHADOW_FIRST,           SDRATTR_SHADOW_LAST,
-                                        SDRATTR_TEXT_MINFRAMEHEIGHT,    SDRATTR_TEXT_CONTOURFRAME,
-
-                                        SDRATTR_XMLATTRIBUTES,          SDRATTR_XMLATTRIBUTES,
+                                        SDRATTR_TEXT_MINFRAMEHEIGHT,    SDRATTR_XMLATTRIBUTES,
                                         SDRATTR_TEXT_WORDWRAP,          SDRATTR_TEXT_WORDWRAP,
 
                                         SDRATTR_TABLE_FIRST,            SDRATTR_TABLE_LAST,