diff options
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/qa/cppunit/test_starmath.cxx | 8 | ||||
| -rw-r--r-- | starmath/source/document.cxx | 5 | ||||
| -rw-r--r-- | starmath/source/smmod.cxx | 5 | ||||
| -rw-r--r-- | starmath/source/view.cxx | 2 |
4 files changed, 9 insertions, 11 deletions
diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx index 8accbc2225ae..c7cbb284aa2f 100644 --- a/starmath/qa/cppunit/test_starmath.cxx +++ b/starmath/qa/cppunit/test_starmath.cxx @@ -436,7 +436,7 @@ void Test::viewZoom() } { - SfxItemSet aSet(SmDocShell::GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM); + SfxItemSet aSet(SmDocShell::GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>{}); aSet.Put(SvxZoomItem(SvxZoomType::OPTIMAL, 0)); SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet); m_pViewShell->Execute(aZoom); @@ -482,7 +482,7 @@ void Test::viewZoom() nFinalZoom = rGraphicWindow.GetZoom(); CPPUNIT_ASSERT_MESSAGE("Should not be optimal zoom", nFinalZoom != nOptimalZoom); - SfxItemSet aSet(SmDocShell::GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM); + SfxItemSet aSet(SmDocShell::GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>{}); aSet.Put(SvxZoomItem(SvxZoomType::PERCENT, 50)); SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet); m_pViewShell->Execute(aZoom); @@ -491,7 +491,7 @@ void Test::viewZoom() } { - SfxItemSet aSet(SmDocShell::GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM); + SfxItemSet aSet(SmDocShell::GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>{}); aSet.Put(SvxZoomItem(SvxZoomType::PERCENT, 5)); SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet); m_pViewShell->Execute(aZoom); @@ -500,7 +500,7 @@ void Test::viewZoom() } { - SfxItemSet aSet(SmDocShell::GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM); + SfxItemSet aSet(SmDocShell::GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>{}); aSet.Put(SvxZoomItem(SvxZoomType::PERCENT, 1000)); SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet); m_pViewShell->Execute(aZoom); diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 4f4c198e81b3..f814db1962c7 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -561,15 +561,14 @@ Printer* SmDocShell::GetPrt() else if (!mpPrinter) { auto pOptions = o3tl::make_unique<SfxItemSet>(GetPool(), - SID_PRINTSIZE, SID_PRINTSIZE, + svl::Items<SID_PRINTSIZE, SID_PRINTSIZE, SID_PRINTZOOM, SID_PRINTZOOM, SID_PRINTTITLE, SID_PRINTTITLE, SID_PRINTTEXT, SID_PRINTTEXT, SID_PRINTFRAME, SID_PRINTFRAME, SID_NO_RIGHT_SPACES, SID_NO_RIGHT_SPACES, SID_SAVE_ONLY_USED_SYMBOLS, SID_SAVE_ONLY_USED_SYMBOLS, - SID_AUTO_CLOSE_BRACKETS, SID_AUTO_CLOSE_BRACKETS, - 0); + SID_AUTO_CLOSE_BRACKETS, SID_AUTO_CLOSE_BRACKETS>{}); SmModule *pp = SM_MOD(); pp->GetConfig()->ConfigToItemSet(*pOptions); mpPrinter = VclPtr<SfxPrinter>::Create(std::move(pOptions)); diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index e4ce32a4baeb..b532073bafac 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -249,15 +249,14 @@ std::unique_ptr<SfxItemSet> SmModule::CreateItemSet( sal_uInt16 nId ) { pRet = o3tl::make_unique<SfxItemSet>(GetPool(), //TP_SMPRINT - SID_PRINTSIZE, SID_PRINTSIZE, + svl::Items<SID_PRINTSIZE, SID_PRINTSIZE, SID_PRINTZOOM, SID_PRINTZOOM, SID_PRINTTITLE, SID_PRINTTITLE, SID_PRINTTEXT, SID_PRINTTEXT, SID_PRINTFRAME, SID_PRINTFRAME, SID_NO_RIGHT_SPACES, SID_NO_RIGHT_SPACES, SID_SAVE_ONLY_USED_SYMBOLS, SID_SAVE_ONLY_USED_SYMBOLS, - SID_AUTO_CLOSE_BRACKETS, SID_AUTO_CLOSE_BRACKETS, - 0 ); + SID_AUTO_CLOSE_BRACKETS, SID_AUTO_CLOSE_BRACKETS>{} ); GetConfig()->ConfigToItemSet(*pRet); } diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index b68d72e7d866..a9652672e16f 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1715,7 +1715,7 @@ void SmViewShell::Execute(SfxRequest& rReq) } else { - SfxItemSet aSet( SmDocShell::GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM); + SfxItemSet aSet( SmDocShell::GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>{}); aSet.Put( SvxZoomItem( SvxZoomType::PERCENT, mpGraphic->GetZoom())); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) |