summaryrefslogtreecommitdiff
path: root/sw/qa
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2021-07-19 11:04:45 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2021-07-19 16:33:01 +0200
commitb1668edf7fa3ad8c32bcc4d73821770f2df011ca (patch)
treecb93a00ca59f770e616668af15fdc6a50e1627a1 /sw/qa
parent5b3c530016927d3e91e3124e124f7b428ab285ac (diff)
Move svl::Items to include/svl/whichranges.hxx, and unify its usage
... in WhichRangesContainer and SfxItemSet ctors. Now it's not needed to explicitly use 'value' in WhichRangesContainer's ctor, or create an instance for use in SfxItemSet ctor (svl::Items is already defined as a template value of corresponding type). Instead of WhichRangesContainer Foo(svl::Items<1, 2>::value); SfxItemSet Bar(rItemPool, svl::Items<1, 2>{}); now use: WhichRangesContainer Foo(svl::Items<1, 2>); SfxItemSet Bar(rItemPool, svl::Items<1, 2>); Change-Id: I4681d952b6442732025e5a26768098878907a238 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119157 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/qa')
-rw-r--r--sw/qa/core/doc/doc.cxx3
-rw-r--r--sw/qa/core/uwriter.cxx2
-rw-r--r--sw/qa/extras/layout/layout.cxx12
-rw-r--r--sw/qa/extras/tiledrendering/tiledrendering.cxx16
-rw-r--r--sw/qa/extras/uiwriter/uiwriter.cxx16
-rw-r--r--sw/qa/extras/uiwriter/uiwriter2.cxx18
-rw-r--r--sw/qa/extras/uiwriter/uiwriter3.cxx12
-rw-r--r--sw/qa/extras/unowriter/unowriter.cxx4
-rw-r--r--sw/qa/extras/ww8export/ww8export.cxx2
-rw-r--r--sw/qa/uibase/dochdl/dochdl.cxx2
-rw-r--r--sw/qa/uibase/shells/shells.cxx4
11 files changed, 45 insertions, 46 deletions
diff --git a/sw/qa/core/doc/doc.cxx b/sw/qa/core/doc/doc.cxx
index faf6b822e7c1..7cf0be3c0bb3 100644
--- a/sw/qa/core/doc/doc.cxx
+++ b/sw/qa/core/doc/doc.cxx
@@ -103,8 +103,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreDocTest, testLocaleIndependentTemplate)
SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "locale-independent-template.odt");
SwDocShell* pDocShell = pDoc->GetDocShell();
SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
- SfxItemSet aSet(pWrtShell->GetAttrPool(),
- svl::Items<RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE>{});
+ SfxItemSet aSet(pWrtShell->GetAttrPool(), svl::Items<RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE>);
pWrtShell->GetCurAttr(aSet);
const SvxLanguageItem* pItem = aSet.GetItem(RES_CHRATR_LANGUAGE);
CPPUNIT_ASSERT(pItem);
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 4f9ffdb98c40..f676f96c7bde 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -986,7 +986,7 @@ void SwDocTest::testGraphicAnchorDeletion()
aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), RTL_CONSTASCII_LENGTH("graphic anchor>>"));
//Insert a graphic at X of >>X<< in paragraph 2
- SfxItemSet aFlySet(m_pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{});
+ SfxItemSet aFlySet(m_pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>);
SwFormatAnchor aAnchor(RndStdIds::FLY_AS_CHAR);
aAnchor.SetAnchor(aPaM.GetPoint());
aFlySet.Put(aAnchor);
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 4940a37e41c4..8dd576987d9a 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -226,7 +226,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInBody)
pWrtShell->SplitNode(false);
pWrtShell->Insert("baz");
SfxItemSet flySet(pDoc->GetAttrPool(),
- svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{});
+ svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>);
SwFormatAnchor anchor(RndStdIds::FLY_AT_CHAR);
pWrtShell->StartOfSection(false);
pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, /*bBasicCall=*/false);
@@ -557,7 +557,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInHeader)
pWrtShell->SplitNode(false);
pWrtShell->Insert("baz");
SfxItemSet flySet(pDoc->GetAttrPool(),
- svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{});
+ svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>);
SwFormatAnchor anchor(RndStdIds::FLY_AT_CHAR);
pWrtShell->StartOfSection(false);
pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, /*bBasicCall=*/false);
@@ -910,7 +910,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInFootnote)
CPPUNIT_ASSERT(pWrtShell->IsCursorInFootnote());
SfxItemSet flySet(pDoc->GetAttrPool(),
- svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{});
+ svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>);
SwFormatFrameSize size(SwFrameSize::Minimum, 1000, 1000);
flySet.Put(size); // set a size, else we get 1 char per line...
SwFormatAnchor anchor(RndStdIds::FLY_AT_CHAR);
@@ -1436,7 +1436,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInFlys)
pWrtShell->SplitNode(false);
pWrtShell->Insert("baz");
SfxItemSet flySet(pDoc->GetAttrPool(),
- svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{});
+ svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>);
SwFormatFrameSize size(SwFrameSize::Minimum, 1000, 1000);
flySet.Put(size); // set a size, else we get 1 char per line...
pWrtShell->StartOfSection(false);
@@ -1900,7 +1900,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysAtFlys)
pWrtShell->SplitNode(false);
pWrtShell->Insert("baz");
SfxItemSet flySet(pDoc->GetAttrPool(),
- svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{});
+ svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>);
SwFormatFrameSize size(SwFrameSize::Minimum, 1000, 1000);
flySet.Put(size); // set a size, else we get 1 char per line...
pWrtShell->StartOfSection(false);
@@ -3232,7 +3232,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf124770)
// Set font to italic 20pt Liberation Serif.
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
SfxItemSet aTextSet(pWrtShell->GetView().GetPool(),
- svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1>{});
+ svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1>);
SvxFontItem aFont(RES_CHRATR_FONT);
aFont.SetFamilyName("Liberation Serif");
aTextSet.Put(aFont);
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 54f4ecc7b9a9..91f6689f1d73 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -1527,7 +1527,7 @@ void SwTiledRenderingTest::testTrackChangesCallback()
CPPUNIT_ASSERT_EQUAL(-1, m_nTrackedChangeIndex);
pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, /*bBasicCall=*/false);
- SfxItemSet aSet(pWrtShell->GetDoc()->GetAttrPool(), svl::Items<FN_REDLINE_ACCEPT_DIRECT, FN_REDLINE_ACCEPT_DIRECT>{});
+ SfxItemSet aSet(pWrtShell->GetDoc()->GetAttrPool(), svl::Items<FN_REDLINE_ACCEPT_DIRECT, FN_REDLINE_ACCEPT_DIRECT>);
SfxVoidItem aItem(FN_REDLINE_ACCEPT_DIRECT);
aSet.Put(aItem);
pWrtShell->GetView().GetState(aSet);
@@ -1863,8 +1863,8 @@ namespace {
void checkUndoRepairStates(SwXTextDocument* pXTextDocument, SwView* pView1, SwView* pView2)
{
- SfxItemSet aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>{});
- SfxItemSet aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>{});
+ SfxItemSet aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>);
+ SfxItemSet aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>);
// first view, undo enabled
pView1->GetState(aItemSet1);
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aItemSet1.GetItemState(SID_UNDO));
@@ -1895,8 +1895,8 @@ void SwTiledRenderingTest::testDisableUndoRepair()
int nView2 = SfxLokHelper::getView();
{
- SfxItemSet aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>{});
- SfxItemSet aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>{});
+ SfxItemSet aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>);
+ SfxItemSet aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>);
pView1->GetState(aItemSet1);
CPPUNIT_ASSERT_EQUAL(SfxItemState::DISABLED, aItemSet1.GetItemState(SID_UNDO));
pView2->GetState(aItemSet2);
@@ -1916,8 +1916,8 @@ void SwTiledRenderingTest::testDisableUndoRepair()
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'u', 0);
Scheduler::ProcessEventsToIdle();
{
- SfxItemSet aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>{});
- SfxItemSet aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>{});
+ SfxItemSet aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>);
+ SfxItemSet aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>);
// second view, undo enabled
pView2->GetState(aItemSet2);
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aItemSet2.GetItemState(SID_UNDO));
@@ -2628,7 +2628,7 @@ void SwTiledRenderingTest::testAnchorTypes()
SwDoc* pDoc = pXTextDocument->GetDocShell()->GetDoc();
SwView* pView = pXTextDocument->GetDocShell()->GetView();
pView->GetViewFrame()->GetDispatcher()->Execute(FN_CNTNT_TO_NEXT_FRAME, SfxCallMode::SYNCHRON);
- SfxItemSet aSet(pDoc->GetAttrPool(), svl::Items<FN_TOOL_ANCHOR_PAGE, FN_TOOL_ANCHOR_PAGE>{});
+ SfxItemSet aSet(pDoc->GetAttrPool(), svl::Items<FN_TOOL_ANCHOR_PAGE, FN_TOOL_ANCHOR_PAGE>);
SfxBoolItem aItem(FN_TOOL_ANCHOR_PAGE);
aSet.Put(aItem);
auto pShell = dynamic_cast<SwBaseShell*>(pView->GetCurShell());
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index ea8e797b5737..f857b3f8da01 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1162,7 +1162,7 @@ void SwUiWriterTest::testCp1000071()
// Change the document layout to be 2 columns, and then undo.
pWrtShell->SelAll();
SwSectionData section(SectionType::Content, pWrtShell->GetUniqueSectionName());
- SfxItemSet set( pDoc->GetDocShell()->GetPool(), svl::Items<RES_COL, RES_COL>{} );
+ SfxItemSet set( pDoc->GetDocShell()->GetPool(), svl::Items<RES_COL, RES_COL> );
SwFormatCol col;
col.Init( 2, 0, 10000 );
set.Put( col );
@@ -2562,7 +2562,7 @@ void SwUiWriterTest::testTdf72788()
//Apply a *Bold* attribute to selection
SvxWeightItem aWeightItem(WEIGHT_BOLD, RES_CHRATR_WEIGHT);
rIDCO.InsertPoolItem(*pCursor, aWeightItem);
- SfxItemSet aSet( pDoc->GetAttrPool(), svl::Items<RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT>{});
+ SfxItemSet aSet( pDoc->GetAttrPool(), svl::Items<RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT>);
//Add selected text's attributes to aSet
pCursor->GetNode().GetTextNode()->GetParaAttr(aSet, 5, 12);
SfxPoolItem const * pPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT);
@@ -3737,8 +3737,8 @@ void SwUiWriterTest::testUndoDelAsCharTdf107512()
sw::UndoManager & rUndoManager(pDoc->GetUndoManager());
IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
SwCursorShell * pShell(pDoc->GetEditShell());
- SfxItemSet frameSet(pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{});
- SfxItemSet grfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, RES_GRFATR_END-1>{});
+ SfxItemSet frameSet(pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>);
+ SfxItemSet grfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, RES_GRFATR_END-1>);
rIDCO.InsertString(*pShell->GetCursor(), "foo");
pShell->ClearMark();
SwFormatAnchor anchor(RndStdIds::FLY_AS_CHAR);
@@ -3757,7 +3757,7 @@ void SwUiWriterTest::testUndoDelAsCharTdf107512()
CPPUNIT_ASSERT(pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(4, RES_TXTATR_FLYCNT));
CPPUNIT_ASSERT_EQUAL(OUString(OUStringChar(CH_TXTATR_BREAKWORD) + u"foo" + OUStringChar(CH_TXTATR_BREAKWORD)), pShell->GetCursor()->GetNode().GetTextNode()->GetText());
SfxPoolItem const* pItem;
- SfxItemSet query(pDoc->GetAttrPool(), svl::Items<RES_CHRATR_HIDDEN, RES_CHRATR_HIDDEN>{});
+ SfxItemSet query(pDoc->GetAttrPool(), svl::Items<RES_CHRATR_HIDDEN, RES_CHRATR_HIDDEN>);
pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 1, 4);
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem));
CPPUNIT_ASSERT(static_cast<SvxCharHiddenItem const*>(pItem)->GetValue());
@@ -3870,7 +3870,7 @@ void SwUiWriterTest::testUndoCharAttribute()
// Apply a "Bold" attribute to selection
SvxWeightItem aWeightItem(WEIGHT_BOLD, RES_CHRATR_WEIGHT);
rIDCO.InsertPoolItem(*pCursor, aWeightItem);
- SfxItemSet aSet( pDoc->GetAttrPool(), svl::Items<RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT>{});
+ SfxItemSet aSet( pDoc->GetAttrPool(), svl::Items<RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT>);
// Adds selected text's attributes to aSet
pCursor->GetNode().GetTextNode()->GetParaAttr(aSet, 10, 19);
SfxPoolItem const * pPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT);
@@ -3891,8 +3891,8 @@ void SwUiWriterTest::testUndoDelAsChar()
sw::UndoManager & rUndoManager(pDoc->GetUndoManager());
IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
SwCursorShell * pShell(pDoc->GetEditShell());
- SfxItemSet frameSet(pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{});
- SfxItemSet grfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, RES_GRFATR_END-1>{});
+ SfxItemSet frameSet(pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>);
+ SfxItemSet grfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, RES_GRFATR_END-1>);
SwFormatAnchor anchor(RndStdIds::FLY_AS_CHAR);
frameSet.Put(anchor);
GraphicObject grf;
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 50af673c5d0e..7dfb8d634255 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -185,7 +185,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf101534)
// Go to the second paragraph, assert that we have margins as direct
// formatting.
pWrtShell->Down(/*bSelect=*/false);
- SfxItemSet aSet(pWrtShell->GetAttrPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE>{});
+ SfxItemSet aSet(pWrtShell->GetAttrPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE>);
pWrtShell->GetCurAttr(aSet);
CPPUNIT_ASSERT(aSet.HasItem(RES_LR_SPACE));
@@ -632,7 +632,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137245)
SwFormatAnchor anchor(RndStdIds::FLY_AT_PARA);
anchor.SetAnchor(pWrtShell->GetCursor()->GetPoint());
SfxItemSet flySet(pDoc->GetAttrPool(),
- svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{});
+ svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>);
flySet.Put(anchor);
SwFormatFrameSize size(SwFrameSize::Minimum, 1000, 1000);
flySet.Put(size); // set a size, else we get 1 char per line...
@@ -643,7 +643,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137245)
SwFormatAnchor anchor(RndStdIds::FLY_AT_CHAR);
anchor.SetAnchor(pWrtShell->GetCursor()->GetPoint());
SfxItemSet flySet(pDoc->GetAttrPool(),
- svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{});
+ svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>);
flySet.Put(anchor);
SwFormatFrameSize size(SwFrameSize::Minimum, 1000, 1000);
flySet.Put(size); // set a size, else we get 1 char per line...
@@ -660,7 +660,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137245)
SwFormatAnchor anchor(RndStdIds::FLY_AT_PARA);
anchor.SetAnchor(pWrtShell->GetCursor()->GetPoint());
SfxItemSet flySet(pDoc->GetAttrPool(),
- svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{});
+ svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>);
flySet.Put(anchor);
SwFormatFrameSize size(SwFrameSize::Minimum, 1000, 1000);
flySet.Put(size); // set a size, else we get 1 char per line...
@@ -671,7 +671,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137245)
SwFormatAnchor anchor(RndStdIds::FLY_AT_CHAR);
anchor.SetAnchor(pWrtShell->GetCursor()->GetPoint());
SfxItemSet flySet(pDoc->GetAttrPool(),
- svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{});
+ svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>);
flySet.Put(anchor);
SwFormatFrameSize size(SwFrameSize::Minimum, 1000, 1000);
flySet.Put(size); // set a size, else we get 1 char per line...
@@ -691,7 +691,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137245)
// check that the AutoFormat did something
pWrtShell->SttEndDoc(true);
- SfxItemSet set{ pDoc->GetAttrPool(), svl::Items<RES_BOX, RES_BOX>{} };
+ SfxItemSet set{ pDoc->GetAttrPool(), svl::Items<RES_BOX, RES_BOX> };
pWrtShell->GetCurParAttr(set);
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, set.GetItemState(RES_BOX, false));
}
@@ -730,7 +730,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf131912)
{
SfxItemSet flySet(pDoc->GetAttrPool(),
- svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{});
+ svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>);
SwFormatAnchor anchor(RndStdIds::FLY_AT_CHAR);
pWrtShell->StartOfSection(false);
pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 2, /*bBasicCall=*/false);
@@ -1235,7 +1235,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf109376_redline)
SwFormatAnchor anchor(RndStdIds::FLY_AT_PARA);
anchor.SetAnchor(pWrtShell->GetCursor()->GetPoint());
SfxItemSet flySet(pDoc->GetAttrPool(),
- svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{});
+ svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>);
flySet.Put(anchor);
SwFormatFrameSize size(SwFrameSize::Minimum, 1000, 1000);
flySet.Put(size); // set a size, else we get 1 char per line...
@@ -1286,7 +1286,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf109376)
SwFormatAnchor anchor(RndStdIds::FLY_AT_PARA);
anchor.SetAnchor(pWrtShell->GetCursor()->GetPoint());
SfxItemSet flySet(pDoc->GetAttrPool(),
- svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{});
+ svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>);
flySet.Put(anchor);
SwFormatFrameSize size(SwFrameSize::Minimum, 1000, 1000);
flySet.Put(size); // set a size, else we get 1 char per line...
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 62325b1c9c49..e835acf648cf 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -661,7 +661,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks)
{ // ToC toxmark
pWrtShell->Down(false);
SfxItemSet aSet(pWrtShell->GetAttrPool(),
- svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{});
+ svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>);
pWrtShell->GetCurAttr(aSet);
CPPUNIT_ASSERT(aSet.HasItem(RES_TXTATR_INETFMT));
pWrtShell->Push();
@@ -676,7 +676,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks)
{ // ToC heading
pWrtShell->Down(false);
SfxItemSet aSet(pWrtShell->GetAttrPool(),
- svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{});
+ svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>);
pWrtShell->GetCurAttr(aSet);
CPPUNIT_ASSERT(aSet.HasItem(RES_TXTATR_INETFMT));
pWrtShell->Push();
@@ -696,7 +696,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks)
{ // UD1 toxmark 1
pWrtShell->Down(false);
SfxItemSet aSet(pWrtShell->GetAttrPool(),
- svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{});
+ svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>);
pWrtShell->GetCurAttr(aSet);
CPPUNIT_ASSERT(aSet.HasItem(RES_TXTATR_INETFMT));
pWrtShell->Push();
@@ -711,7 +711,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks)
{ // UD1 toxmark 2 (with same text)
pWrtShell->Down(false);
SfxItemSet aSet(pWrtShell->GetAttrPool(),
- svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{});
+ svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>);
pWrtShell->GetCurAttr(aSet);
CPPUNIT_ASSERT(aSet.HasItem(RES_TXTATR_INETFMT));
pWrtShell->Push();
@@ -726,7 +726,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks)
{ // UD heading
pWrtShell->Down(false);
SfxItemSet aSet(pWrtShell->GetAttrPool(),
- svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{});
+ svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>);
pWrtShell->GetCurAttr(aSet);
CPPUNIT_ASSERT(aSet.HasItem(RES_TXTATR_INETFMT));
pWrtShell->Push();
@@ -746,7 +746,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks)
{ // UD2 toxmark, with same text as those in other UD
pWrtShell->Down(false);
SfxItemSet aSet(pWrtShell->GetAttrPool(),
- svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{});
+ svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>);
pWrtShell->GetCurAttr(aSet);
CPPUNIT_ASSERT(aSet.HasItem(RES_TXTATR_INETFMT));
pWrtShell->Push();
diff --git a/sw/qa/extras/unowriter/unowriter.cxx b/sw/qa/extras/unowriter/unowriter.cxx
index e22f71c27ada..a602259c30c2 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -696,8 +696,8 @@ CPPUNIT_TEST_FIXTURE(SwUnoWriter, testDeleteFlyAtCharAtStart)
// insert fly anchored at start of body text
pWrtShell->ClearMark();
pWrtShell->SttEndDoc(true);
- SfxItemSet frameSet(pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END - 1>{});
- SfxItemSet grfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, RES_GRFATR_END - 1>{});
+ SfxItemSet frameSet(pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END - 1>);
+ SfxItemSet grfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, RES_GRFATR_END - 1>);
SwFormatAnchor anchor(RndStdIds::FLY_AT_CHAR);
frameSet.Put(anchor);
GraphicObject grf;
diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index 2d17a7ff88fb..94f2c1753793 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -115,7 +115,7 @@ protected:
// emulate the behavior from tdf#94386 - insert an envelope to the
// document
- SfxItemSet aSet(pWrtShell->GetView().GetCurShell()->GetPool(), svl::Items<FN_ENVELOP, FN_ENVELOP>{});
+ SfxItemSet aSet(pWrtShell->GetView().GetCurShell()->GetPool(), svl::Items<FN_ENVELOP, FN_ENVELOP>);
aSet.Put(SwEnvItem());
SfxRequest aRequest(FN_ENVELOP, SfxCallMode::SYNCHRON, aSet);
SW_MOD()->ExecOther(aRequest);
diff --git a/sw/qa/uibase/dochdl/dochdl.cxx b/sw/qa/uibase/dochdl/dochdl.cxx
index 2006022fc587..c882eab89ea9 100644
--- a/sw/qa/uibase/dochdl/dochdl.cxx
+++ b/sw/qa/uibase/dochdl/dochdl.cxx
@@ -60,7 +60,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseDochdlTest, testComplexSelection)
pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, /*bBasicCall=*/false);
pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 1, /*bBasicCall=*/false);
SfxItemSet aSet(pWrtShell->GetView().GetPool(),
- svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1>{});
+ svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1>);
// Bold, italic, underline.
aSet.Put(SvxWeightItem(WEIGHT_BOLD, RES_CHRATR_WEIGHT));
aSet.Put(SvxPostureItem(ITALIC_NORMAL, RES_CHRATR_POSTURE));
diff --git a/sw/qa/uibase/shells/shells.cxx b/sw/qa/uibase/shells/shells.cxx
index 6334be3a553b..badc17d1f4ce 100644
--- a/sw/qa/uibase/shells/shells.cxx
+++ b/sw/qa/uibase/shells/shells.cxx
@@ -46,8 +46,8 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testTdf130179)
SwDoc* pDoc = createSwDoc();
IDocumentContentOperations& rIDCO = pDoc->getIDocumentContentOperations();
SwCursorShell* pShell(pDoc->GetEditShell());
- SfxItemSet aFrameSet(pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END - 1>{});
- SfxItemSet aGrfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, RES_GRFATR_END - 1>{});
+ SfxItemSet aFrameSet(pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END - 1>);
+ SfxItemSet aGrfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, RES_GRFATR_END - 1>);
SwFormatAnchor aAnchor(RndStdIds::FLY_AT_PARA);
aFrameSet.Put(aAnchor);
GraphicObject aGrf;