diff options
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/editdoc.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/editobj.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit2.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit4.cxx | 6 | ||||
-rw-r--r-- | editeng/source/items/textitem.cxx | 2 | ||||
-rw-r--r-- | editeng/source/uno/unofdesc.cxx | 4 | ||||
-rw-r--r-- | editeng/source/uno/unoipset.cxx | 2 | ||||
-rw-r--r-- | editeng/source/uno/unotext.cxx | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 67ab2af678b9..28c2641d43c4 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -1860,7 +1860,7 @@ void ContentNode::dumpAsXml(struct _xmlTextWriter* pWriter) const ContentAttribs::ContentAttribs( SfxItemPool& rPool ) : pStyle(nullptr) -, aAttribSet( rPool, EE_PARA_START, EE_CHAR_END ) +, aAttribSet( rPool, svl::Items<EE_PARA_START, EE_CHAR_END>{} ) { } @@ -2105,7 +2105,7 @@ void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent, S void EditDoc::CreateDefFont( bool bUseStyles ) { - SfxItemSet aTmpSet( GetItemPool(), EE_PARA_START, EE_CHAR_END ); + SfxItemSet aTmpSet( GetItemPool(), svl::Items<EE_PARA_START, EE_CHAR_END>{} ); CreateFont( aDefFont, aTmpSet ); aDefFont.SetVertical( IsVertical() ); aDefFont.SetOrientation( IsVertical() ? (IsTopToBottom() ? 2700 : 900) : 0 ); diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index ed1fdb06136e..8eee9ea854ef 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -115,7 +115,7 @@ const XParaPortion& XParaPortionList::operator [](size_t i) const ContentInfo::ContentInfo( SfxItemPool& rPool ) : eFamily(SfxStyleFamily::Para), - aParaAttribs(rPool, EE_PARA_START, EE_CHAR_END) + aParaAttribs(rPool, svl::Items<EE_PARA_START, EE_CHAR_END>{}) { } @@ -124,7 +124,7 @@ ContentInfo::ContentInfo( const ContentInfo& rCopyFrom, SfxItemPool& rPoolToUse maText(rCopyFrom.maText), aStyle(rCopyFrom.aStyle), eFamily(rCopyFrom.eFamily), - aParaAttribs(rPoolToUse, EE_PARA_START, EE_CHAR_END) + aParaAttribs(rPoolToUse, svl::Items<EE_PARA_START, EE_CHAR_END>{}) { // this should ensure that the Items end up in the correct Pool! aParaAttribs.Set( rCopyFrom.GetParaAttribs() ); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 048f330e18c8..bd56b86f1ae5 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -699,7 +699,7 @@ const SfxItemSet& ImpEditEngine::GetEmptyItemSet() { if ( !pEmptyItemSet ) { - pEmptyItemSet = o3tl::make_unique<SfxItemSet>( aEditDoc.GetItemPool(), EE_ITEMS_START, EE_ITEMS_END ); + pEmptyItemSet = o3tl::make_unique<SfxItemSet>( aEditDoc.GetItemPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{} ); for ( sal_uInt16 nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++) { pEmptyItemSet->ClearItem( nWhich ); diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 2e2232c08870..b7c33d0e7588 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -2154,7 +2154,7 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView, if(aCurrentNewPortion->sText != aCurrentOldPortion->sText) { //change text and apply language - SfxItemSet aSet( aEditDoc.GetItemPool(), nLangWhichId, nLangWhichId); + SfxItemSet aSet( aEditDoc.GetItemPool(), {{nLangWhichId, nLangWhichId}}); aSet.Put(SvxLanguageItem(aCurrentNewPortion->eLanguage, nLangWhichId)); SetAttribs( *aCurrentOldPosition, aSet ); ImpInsertText( *aCurrentOldPosition, aCurrentNewPortion->sText ); @@ -2162,7 +2162,7 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView, else if(aCurrentNewPortion->eLanguage != aCurrentOldPortion->eLanguage) { //apply language - SfxItemSet aSet( aEditDoc.GetItemPool(), nLangWhichId, nLangWhichId); + SfxItemSet aSet( aEditDoc.GetItemPool(), {{nLangWhichId, nLangWhichId}}); aSet.Put(SvxLanguageItem(aCurrentNewPortion->eLanguage, nLangWhichId)); SetAttribs( *aCurrentOldPosition, aSet ); } @@ -2199,7 +2199,7 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView, case SvtScriptType::COMPLEX : nLangWhichId = EE_CHAR_LANGUAGE_CTL; break; default: break; } - SfxItemSet aSet( aEditDoc.GetItemPool(), nLangWhichId, nLangWhichId); + SfxItemSet aSet( aEditDoc.GetItemPool(), {{nLangWhichId, nLangWhichId}}); aSet.Put(SvxLanguageItem(aCurrentNewPortion->eLanguage, nLangWhichId)); SetAttribs( aCurrentPaM, aSet ); } diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index c6882ca85ca2..e40a630698d2 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -3260,7 +3260,7 @@ SfxPoolItem* SvxScriptTypeItem::Clone( SfxItemPool * ) const SvxScriptSetItem::SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool ) : SfxSetItem( nSlotId, o3tl::make_unique<SfxItemSet>( rPool, - SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONT )) + svl::Items<SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONT>{} )) { sal_uInt16 nLatin, nAsian, nComplex; GetWhichIds( nLatin, nAsian, nComplex ); diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx index 3d0b90ed3d02..7e136e4ae8c4 100644 --- a/editeng/source/uno/unofdesc.cxx +++ b/editeng/source/uno/unofdesc.cxx @@ -190,13 +190,13 @@ void SvxUnoFontDescriptor::setPropertyToDefault( SfxItemSet& rSet ) uno::Any SvxUnoFontDescriptor::getPropertyDefault( SfxItemPool* pPool ) { - SfxItemSet aSet( *pPool, EE_CHAR_FONTINFO, EE_CHAR_FONTINFO, + SfxItemSet aSet( *pPool, svl::Items<EE_CHAR_FONTINFO, EE_CHAR_FONTINFO, EE_CHAR_FONTHEIGHT, EE_CHAR_FONTHEIGHT, EE_CHAR_ITALIC, EE_CHAR_ITALIC, EE_CHAR_UNDERLINE, EE_CHAR_UNDERLINE, EE_CHAR_WEIGHT, EE_CHAR_WEIGHT, EE_CHAR_STRIKEOUT, EE_CHAR_STRIKEOUT, - EE_CHAR_WLM, EE_CHAR_WLM, 0 ); + EE_CHAR_WLM, EE_CHAR_WLM>{} ); uno::Any aAny; diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 0eebf97ee0c9..cc2a5c6c1861 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -203,7 +203,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* if( eMapUnit == MapUnit::Map100thMM ) nMemberId &= (~CONVERT_TWIPS); uno::Any aVal; - SfxItemSet aSet( mrItemPool, pMap->nWID, pMap->nWID); + SfxItemSet aSet( mrItemPool, {{pMap->nWID, pMap->nWID}}); if( (pMap->nWID < OWN_ATTR_VALUE_START) || (pMap->nWID > OWN_ATTR_VALUE_END ) ) { diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 155d93412bac..d3b27a366914 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -1273,7 +1273,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aProp // Get Default from ItemPool if(SfxItemPool::IsWhich(pMap->nWID)) { - SfxItemSet aSet( *pPool, pMap->nWID, pMap->nWID); + SfxItemSet aSet( *pPool, {{pMap->nWID, pMap->nWID}}); aSet.Put(pPool->GetDefaultItem(pMap->nWID)); return SvxItemPropertySet::getPropertyValue(pMap, aSet, true, false ); } |