• Stephan Bergmann's avatar
    Make SfxItemSet ranges correct by construction · 13bb5a4b
    Stephan Bergmann yazdı
    This is a follow-up to 45a7f5b6 "Keep WID ranges
    sorted, and join adjacent ones".  While SfxItemSet::MergeRange relies on the
    m_pWhichRanges being sorted (and, under DBG_UTIL, asserts if they are not), the
    various SfxItemSet constructors curiously only check (via assert or DBG_ASSERT)
    that each individual range has an upper bound not smaller than its lower bound.
    Arguably, all SfxItemSet instances should fulfill the stronger guarantees
    required and checked by MergeRange.
    
    And in many cases the ranges are statically known, so that the checking can
    happen at compile time.  Therefore, replace the two SfxItemSet ctors taking
    explicit ranges with two other ctors that actually do proper checking.  The
    (templated) overload taking an svl::Items struct should be used in all cases
    where the range values are statically known at compile time, while the overload
    taking a std::initializer_list<Pair> is for the remaining cases (that can only
    do runtime checking via assert).  Most of those latter cases are simple cases
    with a single range covering a single item, but a few are more complex.
    
    (At least some of the uses of the existing SfxItemSet overload taking a
    
      const sal_uInt16* pWhichPairTable
    
    can probably also be strengthened, but that is left for another day.)
    
    This commit is the first in a series of two.  Apart from the manual changes to
    compilerplugins/clang/store/sfxitemsetrewrite.cxx, include/svl/itemset.hxx, and
    svl/source/items/itemset.cxx, it only consists of automatic rewriting of the
    relevant SfxItemSet ctor calls (plus a few required manual fixes, see next).
    But it does not yet check that the individual ranges are properly sorted (see
    the TODO in svl::detail::validGap).  That check will be enabled, and the ensuing
    manual fixes will be made in a follow-up commit, to reduce the likelyhood of
    accidents.
    
    There were three cases of necessary manual intervention:
    
    * sw/source/core/unocore/unostyle.cxx uses eAtr of enum type RES_FRMATR in
    braced-init-list syntax now, so needs explicit narrowing conversion to
    sal_uInt16.
    
    * In sw/source/uibase/uiview/formatclipboard.cxx, the trailiing comma in the
    definition of macro FORMAT_PAINTBRUSH_FRAME_IDS needed to be removed manually.
    
    * In svx/source/svdraw/svdoashp.cxx, svx/source/svdraw/svdotext.cxx,
    sw/source/uibase/app/docstyle.cxx, sw/source/uibase/shells/frmsh.cxx,
    sw/source/uibase/shells/grfsh.cxx, and sw/source/uibase/shells/textsh1.cxx,
    some comments had to be put back (see "TODO: the replaced range can contain
    relevant comments" in compilerplugins/clang/store/sfxitemsetrewrite.cxx).
    
    A few uses of the variadic form erroneously used nullptr instead of 0 for
    termination.  But this should have been harmless even if promoted std::nullptr_t
    is larger than promoted sal_uInt16, assuming that the part of the nullptr value
    that was interpreted as sal_uInt16/promoted int was all-zero bits.  Similarly,
    some uses made the harmless error of using 0L instead of 0.
    
    Change-Id: I2afea97282803cb311b9321a99bb627520ef5e35
    Reviewed-on: https://gerrit.libreoffice.org/38861Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
    Tested-by: 's avatarStephan Bergmann <sbergman@redhat.com>
    13bb5a4b
Adı
Son kayıt (commit)
Son güncelleme
..
images Loading commit data...
inc Loading commit data...
qa Loading commit data...
source Loading commit data...
uiconfig/dbreport Loading commit data...
util Loading commit data...
AllLangResTarget_rpt.mk Loading commit data...
AllLangResTarget_rptui.mk Loading commit data...
CppunitTest_reportdesign_dialogs_test.mk Loading commit data...
JunitTest_reportdesign_complex.mk Loading commit data...
Library_rpt.mk Loading commit data...
Library_rptui.mk Loading commit data...
Library_rptxml.mk Loading commit data...
Makefile Loading commit data...
Module_reportdesign.mk Loading commit data...
README Loading commit data...
UIConfig_dbreport.mk Loading commit data...