diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-06-19 09:32:45 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-06-19 09:38:05 +0200 |
commit | 1e3a00f0c772a76a1dd76b8272e2c35a1802d574 (patch) | |
tree | a1eadac1680f1e46c789964200aa8a61bb659189 /sd/source/ui/app | |
parent | 9fe114e78f1285397dcd2a0d2e3d6afc3024fa66 (diff) |
Make SfxItemSet ranges correct by construction: Fix static cases
...with the aid of an extended compilerplugins/clang/store/sfxitemsetrewrite.cxx
(which in turn needed a small addition to compilerplugins/clang/check.hxx).
Enable svl::detail::validGap check for the static case, but keep it disabled for
now for the dynamic case.
Change-Id: I4846ba8e99aff94a86518e2cb5044e575093386e
Diffstat (limited to 'sd/source/ui/app')
-rw-r--r-- | sd/source/ui/app/sdmod2.cxx | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 2bcf6455ea31..6d72d1fd32e5 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -441,21 +441,13 @@ std::unique_ptr<SfxItemSet> SdModule::CreateItemSet( sal_uInt16 nSlot ) SfxItemPool& rPool = GetPool(); rPool.SetDefaultMetric( MapUnit::Map100thMM ); - auto pRet = o3tl::make_unique<SfxItemSet>( rPool, - svl::Items<SID_ATTR_METRIC, SID_ATTR_METRIC, - SID_ATTR_DEFTABSTOP, SID_ATTR_DEFTABSTOP, - - ATTR_OPTIONS_LAYOUT, ATTR_OPTIONS_LAYOUT, - ATTR_OPTIONS_CONTENTS, ATTR_OPTIONS_CONTENTS, - ATTR_OPTIONS_MISC, ATTR_OPTIONS_MISC, - - ATTR_OPTIONS_SNAP, ATTR_OPTIONS_SNAP, - - ATTR_OPTIONS_SCALE_START, ATTR_OPTIONS_SCALE_END, - - ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT, - - SID_ATTR_GRID_OPTIONS, SID_ATTR_GRID_OPTIONS>{} ); + auto pRet = o3tl::make_unique<SfxItemSet>( + rPool, + svl::Items< + SID_ATTR_GRID_OPTIONS, SID_ATTR_GRID_OPTIONS, + SID_ATTR_METRIC, SID_ATTR_METRIC, + SID_ATTR_DEFTABSTOP, SID_ATTR_DEFTABSTOP, + ATTR_OPTIONS_LAYOUT, ATTR_OPTIONS_SCALE_END>{}); // TP_OPTIONS_LAYOUT: pRet->Put( SdOptionsLayoutItem( pOptions, pFrameView ) ); |