diff options
-rw-r--r-- | linguistic/source/convdicxml.cxx | 3 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 15 | ||||
-rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 22 | ||||
-rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 5 | ||||
-rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 18 |
5 files changed, 19 insertions, 44 deletions
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 46b5ec69d320..c8a09997fd7e 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -248,8 +248,7 @@ bool ConvDicXMLExport::Export() { uno::Reference< document::XExporter > xExporter( this ); uno::Reference< document::XFilter > xFilter( xExporter, UNO_QUERY ); - uno::Sequence< beans::PropertyValue > aProps(0); - xFilter->filter( aProps ); // calls exportDoc implicitly + xFilter->filter( {} ); // calls exportDoc implicitly return bSuccess; } diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index b845623ed0fa..91b0dc9cf03e 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -1701,9 +1701,7 @@ void OReportController::impl_initialize( ) const OReportPage* pPage = dynamic_cast<OReportPage*>(m_aReportModel->GetPage(static_cast<sal_uInt16>(m_nPageNum))); if ( pPage ) { - uno::Sequence< beans::PropertyValue> aArgs(1); - aArgs.getArray()[0].Value <<= pPage->getSection(); - executeUnChecked(SID_SELECT,aArgs); + executeUnChecked(SID_SELECT,{ comphelper::makePropertyValue("", pPage->getSection() ) }); } } else @@ -1719,8 +1717,7 @@ void OReportController::impl_initialize( ) { m_sLastActivePage = "Data"; getDesignView()->setCurrentPage(m_sLastActivePage); - uno::Sequence< beans::PropertyValue> aArgs; - executeUnChecked(SID_SELECT_REPORT,aArgs); + executeUnChecked(SID_SELECT_REPORT,{}); } setModified(false); // and we are not modified yet @@ -2790,8 +2787,7 @@ void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) util::URL aCommand; aCommand.Complete = ".uno:" + rCommandName; - Sequence aCommandArgs{ comphelper::makePropertyValue("Value", rCommandValue) }; - executeUnChecked( aCommand, aCommandArgs ); + executeUnChecked( aCommand, { comphelper::makePropertyValue("Value", rCommandValue) } ); } else { @@ -2866,7 +2862,7 @@ uno::Reference<frame::XModel> OReportController::executeReport() if (pErrorId != RID_ERR_NO_COMMAND) { if ( !m_bShowProperties ) - executeUnChecked(SID_SHOW_PROPERTYBROWSER,uno::Sequence< beans::PropertyValue>()); + executeUnChecked(SID_SHOW_PROPERTYBROWSER, {}); m_sLastActivePage = "Data"; getDesignView()->setCurrentPage(m_sLastActivePage); @@ -2878,8 +2874,7 @@ uno::Reference<frame::XModel> OReportController::executeReport() } if ( nCommand ) { - uno::Sequence< beans::PropertyValue> aArgs; - executeUnChecked(nCommand,aArgs); + executeUnChecked(nCommand, {}); } } } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 2c739b909fb2..ca7cb56fee5f 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -1905,19 +1905,15 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 const awt::Size aPageSize(aMMRect.GetWidth(), aMMRect.GetHeight()); const awt::Point aCalcPagePos(aMMRect.Left(), aMMRect.Top()); - uno::Sequence<beans::PropertyValue> aSequence(5); - beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = SC_UNONAME_PAGESIZE; - pArray[0].Value <<= aPageSize; - // #i111158# all positions are relative to the whole page, including non-printable area - pArray[1].Name = SC_UNONAME_INC_NP_AREA; - pArray[1].Value <<= true; - pArray[2].Name = SC_UNONAME_SOURCERANGE; - pArray[2].Value <<= aRangeAddress; - pArray[3].Name = SC_UNONAME_CALCPAGESIZE; - pArray[3].Value <<= aPageSize; - pArray[4].Name = SC_UNONAME_CALCPAGEPOS; - pArray[4].Value <<= aCalcPagePos; + uno::Sequence<beans::PropertyValue> aSequence + { + comphelper::makePropertyValue(SC_UNONAME_PAGESIZE, aPageSize), + // #i111158# all positions are relative to the whole page, including non-printable area + comphelper::makePropertyValue(SC_UNONAME_INC_NP_AREA, true), + comphelper::makePropertyValue(SC_UNONAME_SOURCERANGE, aRangeAddress), + comphelper::makePropertyValue(SC_UNONAME_CALCPAGESIZE, aPageSize), // TODO aPageSize too ? + comphelper::makePropertyValue(SC_UNONAME_CALCPAGEPOS, aCalcPagePos) + }; if( ! pPrinterOptions ) pPrinterOptions.reset(new ScPrintUIOptions); diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index fd81eb41837b..cd031e725e78 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -222,10 +222,7 @@ void ShutdownIcon::FromTemplate() if ( !xDisp.is() ) return; - Sequence<PropertyValue> aArgs(1); - PropertyValue* pArg = aArgs.getArray(); - pArg[0].Name = "Referer"; - pArg[0].Value <<= OUString("private:user"); + Sequence<PropertyValue> aArgs { comphelper::makePropertyValue("Referer", OUString("private:user")) }; css::uno::Reference< css::frame::XNotifyingDispatch > xNotifier(xDisp, UNO_QUERY); if (xNotifier.is()) { diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index e67eeee27c6b..c3e47f6507fe 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -563,20 +563,13 @@ IMPL_LINK( BackingWindow, ClickHdl, weld::Button&, rButton, void ) { Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY ); - Sequence< css::beans::PropertyValue > aArgs(1); - PropertyValue* pArg = aArgs.getArray(); - pArg[0].Name = "Referer"; - pArg[0].Value <<= OUString("private:user"); - - dispatchURL( ".uno:Open", OUString(), xFrame, aArgs ); + dispatchURL( ".uno:Open", OUString(), xFrame, { comphelper::makePropertyValue("Referer", OUString("private:user")) } ); } else if( &rButton == mxRemoteButton.get() ) { Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY ); - Sequence< css::beans::PropertyValue > aArgs(0); - - dispatchURL( ".uno:OpenRemote", OUString(), xFrame, aArgs ); + dispatchURL( ".uno:OpenRemote", OUString(), xFrame, {} ); } else if( &rButton == mxRecentButton.get() ) { @@ -631,12 +624,7 @@ IMPL_LINK (BackingWindow, MenuSelectHdl, const OString&, rId, void) { Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY ); - Sequence< css::beans::PropertyValue > aArgs(1); - PropertyValue* pArg = aArgs.getArray(); - pArg[0].Name = "Referer"; - pArg[0].Value <<= OUString("private:user"); - - dispatchURL( ".uno:NewDoc", OUString(), xFrame, aArgs ); + dispatchURL( ".uno:NewDoc", OUString(), xFrame, { comphelper::makePropertyValue("Referer", OUString("private:user")) } ); return; } |