summaryrefslogtreecommitdiff
path: root/sw/source/filter/html
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/html')
-rw-r--r--sw/source/filter/html/SwAppletImpl.cxx2
-rw-r--r--sw/source/filter/html/css1atr.cxx17
-rw-r--r--sw/source/filter/html/htmlatr.cxx6
-rw-r--r--sw/source/filter/html/htmlctxt.cxx4
-rw-r--r--sw/source/filter/html/htmldrawreader.cxx2
-rw-r--r--sw/source/filter/html/htmlfldw.cxx5
-rw-r--r--sw/source/filter/html/htmlflywriter.cxx4
-rw-r--r--sw/source/filter/html/htmlforw.cxx4
-rw-r--r--sw/source/filter/html/htmlgrin.cxx2
-rw-r--r--sw/source/filter/html/htmlplug.cxx4
-rw-r--r--sw/source/filter/html/htmlsect.cxx6
-rw-r--r--sw/source/filter/html/htmltab.cxx8
-rw-r--r--sw/source/filter/html/swhtml.cxx4
13 files changed, 32 insertions, 36 deletions
diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx
index 11fba7e16641..8d3a8858c9da 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.cxx
@@ -106,7 +106,7 @@ SwHtmlOptType SwApplet_Impl::GetOptionType( const OUString& rName, bool bApplet
return nType;
}
SwApplet_Impl::SwApplet_Impl( SfxItemPool& rPool ) :
- aItemSet( rPool, RES_FRMATR_BEGIN, RES_FRMATR_END-1 )
+ aItemSet( rPool, svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} )
{
}
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index bb80e234df7d..8505dc0a4bf6 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -1224,14 +1224,13 @@ bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet,
//sequence of (start, end) property ranges we want to
//query
SfxItemSet aTstItemSet( *pDCCharFormat->GetAttrSet().GetPool(),
- RES_CHRATR_FONT, RES_CHRATR_FONT,
+ svl::Items<RES_CHRATR_FONT, RES_CHRATR_FONT,
RES_CHRATR_POSTURE, RES_CHRATR_POSTURE,
RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT,
RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_FONT,
RES_CHRATR_CJK_POSTURE, RES_CHRATR_CJK_WEIGHT,
RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONT,
- RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT,
- 0 );
+ RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT>{} );
aTstItemSet.Set( pDCCharFormat->GetAttrSet() );
return HasScriptDependentItems( aTstItemSet, false );
}
@@ -1275,11 +1274,10 @@ static bool OutCSS1Rule( SwHTMLWriter& rHTMLWrt, const OUString& rSelector,
//sequence of (start, end) property ranges we want to
//query
SfxItemSet aScriptItemSet( *rItemSet.GetPool(),
- RES_CHRATR_FONT, RES_CHRATR_FONTSIZE,
+ svl::Items<RES_CHRATR_FONT, RES_CHRATR_FONTSIZE,
RES_CHRATR_LANGUAGE, RES_CHRATR_POSTURE,
RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT,
- RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT,
- 0 );
+ RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT>{} );
aScriptItemSet.Put( rItemSet );
OUString aNewSelector( aSelector );
@@ -1378,11 +1376,10 @@ static void OutCSS1DropCapRule(
}
SfxItemSet aScriptItemSet( rHTMLWrt.pDoc->GetAttrPool(),
- RES_CHRATR_FONT, RES_CHRATR_FONTSIZE,
+ svl::Items<RES_CHRATR_FONT, RES_CHRATR_FONTSIZE,
RES_CHRATR_LANGUAGE, RES_CHRATR_POSTURE,
RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT,
- RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT,
- 0 );
+ RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT>{} );
if( pDCCharFormat )
aScriptItemSet.Set( pDCCharFormat->GetAttrSet() );
@@ -1697,7 +1694,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
// Export the distance-Attributes as normally
const SwFrameFormat &rMaster = rPageDesc.GetMaster();
SfxItemSet aItemSet( *rMaster.GetAttrSet().GetPool(),
- RES_LR_SPACE, RES_UL_SPACE );
+ svl::Items<RES_LR_SPACE, RES_UL_SPACE>{} );
aItemSet.Set( rMaster.GetAttrSet() );
if( pRefPageDesc )
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 1eef03d8a148..0a61af5dbc77 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -590,7 +590,7 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
if (!rInfo.pItemSet.get())
{
- rInfo.pItemSet.reset(new SfxItemSet(*rFormat.GetAttrSet().GetPool(), RES_UL_SPACE, RES_UL_SPACE));
+ rInfo.pItemSet.reset(new SfxItemSet(*rFormat.GetAttrSet().GetPool(), svl::Items<RES_UL_SPACE, RES_UL_SPACE>{}));
}
rInfo.pItemSet->Put( aULSpaceItem );
}
@@ -1835,8 +1835,8 @@ void HTMLEndPosLst::Insert( const SwDrawFrameFormat& rFormat, sal_Int32 nPos,
// insert them as hints. Because of the amount of Hints the styles
// are not considered!
const SfxItemSet& rFormatItemSet = rFormat.GetAttrSet();
- SfxItemSet aItemSet( *rFormatItemSet.GetPool(), RES_CHRATR_BEGIN,
- RES_CHRATR_END );
+ SfxItemSet aItemSet( *rFormatItemSet.GetPool(), svl::Items<RES_CHRATR_BEGIN,
+ RES_CHRATR_END>{} );
SwHTMLWriter::GetEEAttrsFromDrwObj( aItemSet, pTextObj, true );
bool bOutStylesOld = bOutStyles;
bOutStyles = false;
diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index c575f209e6bb..0646803f9c92 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -409,7 +409,7 @@ bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet,
if( SwCSS1Parser::MayBePositioned( rPropInfo ) )
{
SfxItemSet aFrameItemSet( m_xDoc->GetAttrPool(),
- RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
+ svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs(aFrameItemSet );
@@ -704,7 +704,7 @@ SfxItemSet *HTMLAttrContext::GetFrameItemSet( SwDoc *pCreateDoc )
{
if( !pFrameItemSet && pCreateDoc )
pFrameItemSet = o3tl::make_unique<SfxItemSet>( pCreateDoc->GetAttrPool(),
- RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
+ svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} );
return pFrameItemSet.get();
}
diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx
index f2800093088c..7654a703bdf5 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -83,7 +83,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
pNewDrawObj->SetLayer( m_xDoc->getIDocumentDrawModelAccess().GetInvisibleHeavenId() );
SfxItemSet aFrameSet( m_xDoc->GetAttrPool(),
- RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
+ svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs( aFrameSet );
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 2f1f82609c8c..601d1113fcb1 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -327,11 +327,10 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField,
//sequence of (start, end) property ranges we want to
//query
SfxItemSet aScriptItemSet( rWrt.pDoc->GetAttrPool(),
- RES_CHRATR_FONT, RES_CHRATR_FONTSIZE,
+ svl::Items<RES_CHRATR_FONT, RES_CHRATR_FONTSIZE,
RES_CHRATR_POSTURE, RES_CHRATR_POSTURE,
RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT,
- RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT,
- 0 );
+ RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT>{} );
rTextNd.GetAttr( aScriptItemSet, nFieldPos, nFieldPos+1 );
sal_uInt16 aWesternWhichIds[4] =
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index 69320ce63047..9a736f05822a 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -1829,8 +1829,8 @@ static Writer& OutHTML_FrameFormatAsMarquee( Writer& rWrt, const SwFrameFormat&
// get the edit engine attributes of the object as SW attributes and
// sort them as Hints
const SfxItemSet& rFormatItemSet = rFrameFormat.GetAttrSet();
- SfxItemSet aItemSet( *rFormatItemSet.GetPool(), RES_CHRATR_BEGIN,
- RES_CHRATR_END );
+ SfxItemSet aItemSet( *rFormatItemSet.GetPool(), svl::Items<RES_CHRATR_BEGIN,
+ RES_CHRATR_END>{} );
SwHTMLWriter::GetEEAttrsFromDrwObj( aItemSet, &rSdrObj, true );
bool bCfgOutStylesOld = rHTMLWrt.m_bCfgOutStyles;
rHTMLWrt.m_bCfgOutStyles = false;
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 6ec96beded12..a963de30fb44 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -1041,8 +1041,8 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
bool bEdit = TAG_TEXTAREA == eTag || TYPE_FILE == eType ||
TYPE_TEXT == eType;
- SfxItemSet aItemSet( rHTMLWrt.pDoc->GetAttrPool(), RES_CHRATR_BEGIN,
- RES_CHRATR_END );
+ SfxItemSet aItemSet( rHTMLWrt.pDoc->GetAttrPool(), svl::Items<RES_CHRATR_BEGIN,
+ RES_CHRATR_END>{} );
if( xPropSetInfo->hasPropertyByName( "BackgroundColor" ) )
{
aTmp = xPropSet->getPropertyValue( "BackgroundColor" );
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 12f035d83b76..b9a0cf6e26b5 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -487,7 +487,7 @@ IMAGE_SETEVENT:
ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
SfxItemSet aFrameSet( m_xDoc->GetAttrPool(),
- RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
+ svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs( aFrameSet );
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 136a8550fd56..98f48eccc608 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -430,7 +430,7 @@ void SwHTMLParser::InsertEmbed()
}
SfxItemSet aFrameSet( m_xDoc->GetAttrPool(),
- RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
+ svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs( aFrameSet );
@@ -922,7 +922,7 @@ void SwHTMLParser::InsertFloatingFrame()
// den Itemset holen
SfxItemSet aFrameSet( m_xDoc->GetAttrPool(),
- RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
+ svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs( aFrameSet );
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index b1151ca37313..38333bbf487c 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -309,7 +309,7 @@ void SwHTMLParser::NewDivision( HtmlTokenId nToken )
}
SfxItemSet aFrameItemSet( m_xDoc->GetAttrPool(),
- RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
+ svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs(aFrameItemSet );
@@ -613,7 +613,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
if( bInCntnr || SwCSS1Parser::MayBePositioned( aPropInfo, true ) )
{
SfxItemSet aFrameItemSet( m_xDoc->GetAttrPool(),
- RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
+ svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs(aFrameItemSet );
@@ -685,7 +685,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
SwSectionData aSection( CONTENT_SECTION, aName );
SfxItemSet aFrameItemSet( m_xDoc->GetAttrPool(),
- RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
+ svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs(aFrameItemSet );
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 2f1daece276a..a8550415f72f 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -1426,7 +1426,7 @@ void HTMLTable::FixFrameFormat( SwTableBox *pBox,
bool bLock = pFrameFormat->GetDoc()->GetNumberFormatter()
->IsTextFormat( nNumFormat );
SfxItemSet aItemSet( *pFrameFormat->GetAttrSet().GetPool(),
- RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
+ svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_VALUE>{} );
SvxAdjust eAdjust = SvxAdjust::End;
SwContentNode *pCNd = nullptr;
if( !bLock )
@@ -2819,8 +2819,8 @@ SvxBrushItem* SwHTMLParser::CreateBrushItem( const Color *pColor,
if( !rStyle.isEmpty() || !rId.isEmpty() || !rClass.isEmpty() )
{
- SfxItemSet aItemSet( m_xDoc->GetAttrPool(), RES_BACKGROUND,
- RES_BACKGROUND );
+ SfxItemSet aItemSet( m_xDoc->GetAttrPool(), svl::Items<RES_BACKGROUND,
+ RES_BACKGROUND>{} );
SvxCSS1PropertyInfo aPropInfo;
if( !rClass.isEmpty() )
@@ -3524,7 +3524,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
// the table should be put in a text frame
SfxItemSet aFrameSet( m_xDoc->GetAttrPool(),
- RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
+ svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} );
if( !pCurTable->IsNewDoc() )
Reader::ResetFrameFormatAttrs( aFrameSet );
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 199e80dd6c09..3b4e77d6b937 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -2853,7 +2853,7 @@ void SwHTMLParser::SetAttr_( bool bChkEnd, bool bBeforeTable,
case RES_BACKGROUND:
{
const SvxBrushItem& rBrush = static_cast< SvxBrushItem& >(*pAttr->pItem);
- SfxItemSet aNewSet(m_xDoc->GetAttrPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
+ SfxItemSet aNewSet(m_xDoc->GetAttrPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{});
setSvxBrushItemAsFillAttributesToTargetSet(rBrush, aNewSet);
m_xDoc->getIDocumentContentOperations().InsertItemSet(*pAttrPam, aNewSet, SetAttrMode::DONTREPLACE);
@@ -4835,7 +4835,7 @@ void SwHTMLParser::InsertSpacer()
// den Itemset holen
SfxItemSet aFrameSet( m_xDoc->GetAttrPool(),
- RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
+ svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs( aFrameSet );
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 17:47:35 +0000