diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-10-06 16:17:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-10-10 11:33:38 +0200 |
| commit | dbd49cf90b175a3c3d7a4f25ad366f9bc4c716db (patch) | |
| tree | 1c9ee40dc72d468f4b35dd83f62966844aabcf62 /sw/source/core/docnode/node.cxx | |
| parent | b972aa8727da6eb2d5d9740b18450d8706df0874 (diff) | |
use SfxItemSetFixed in sw
Change-Id: I69e188d7599b7fc439f613cec0a0967ccb748b7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123313
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/docnode/node.cxx')
| -rw-r--r-- | sw/source/core/docnode/node.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 7d7ff10ed73d..7c0403239130 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -154,10 +154,10 @@ static bool Put( std::shared_ptr<const SfxItemSet>& rpAttrSet, const SwContentNo SwAttrSet aNewSet( static_cast<const SwAttrSet&>(*rpAttrSet) ); // #i76273# Robust - std::optional<SfxItemSet> pStyleNames; + std::optional<SfxItemSetFixed<RES_FRMATR_STYLE_NAME, RES_FRMATR_CONDITIONAL_STYLE_NAME>> pStyleNames; if ( SfxItemState::SET == rSet.GetItemState( RES_FRMATR_STYLE_NAME, false ) ) { - pStyleNames.emplace( *aNewSet.GetPool(), svl::Items<RES_FRMATR_STYLE_NAME, RES_FRMATR_CONDITIONAL_STYLE_NAME> ); + pStyleNames.emplace( *aNewSet.GetPool() ); pStyleNames->Put( aNewSet ); } @@ -201,10 +201,10 @@ static bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet, SwAttrSet aNewSet( static_cast<const SwAttrSet&>(*rpAttrSet) ); // #i76273# Robust - std::optional<SfxItemSet> pStyleNames; + std::optional<SfxItemSetFixed<RES_FRMATR_STYLE_NAME, RES_FRMATR_CONDITIONAL_STYLE_NAME>> pStyleNames; if ( SfxItemState::SET == rSet.GetItemState( RES_FRMATR_STYLE_NAME, false ) ) { - pStyleNames.emplace( *aNewSet.GetPool(), svl::Items<RES_FRMATR_STYLE_NAME, RES_FRMATR_CONDITIONAL_STYLE_NAME> ); + pStyleNames.emplace( *aNewSet.GetPool() ); pStyleNames->Put( aNewSet ); } |