From b1534edf523a405b91ad04c5351735e745ceb7ee Mon Sep 17 00:00:00 2001 From: Swachhand Lokhande Date: Sat, 7 Mar 2015 18:58:49 +0530 Subject: tdf#89592 Using initializer_lists to populate Sequence Change-Id: Idef9dd55eb1719eaf592bc4a86440cbd5aa4fb32 Reviewed-on: https://gerrit.libreoffice.org/14781 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- avmedia/source/framework/mediatoolbox.cxx | 8 +++++--- basctl/source/basicide/basicrenderable.cxx | 8 +++++--- basctl/source/basicide/moduldl2.cxx | 11 +++++------ basctl/source/basicide/scriptdocument.cxx | 7 ++++--- chart2/qa/extras/charttest.hxx | 7 ++++--- chart2/source/controller/main/ChartController_Window.cxx | 16 +++++++--------- chart2/source/controller/main/ShapeToolbarController.cxx | 7 ++++--- comphelper/source/container/embeddedobjectcontainer.cxx | 10 +++++----- 8 files changed, 39 insertions(+), 35 deletions(-) diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx index 22e5a50c0a17..d33cd93149c8 100644 --- a/avmedia/source/framework/mediatoolbox.cxx +++ b/avmedia/source/framework/mediatoolbox.cxx @@ -26,6 +26,8 @@ #include #include +#include + using namespace ::com::sun::star; namespace avmedia @@ -146,13 +148,13 @@ void MediaToolBoxControl::implUpdateMediaControl() void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem ) { MediaItem aExecItem( SID_AVMEDIA_TOOLBOX ); - uno::Sequence< beans::PropertyValue > aArgs( 1 ); uno::Any aAny; + auto aArgs(::comphelper::InitPropertySequence({ + { "AVMediaToolBox", makeAny(aAny) } + })); aExecItem.merge( rItem ); aExecItem.QueryValue( aAny ); - aArgs[ 0 ].Name = "AVMediaToolBox" ; - aArgs[ 0 ].Value = aAny; Dispatch( ".uno:AVMediaToolBox" , aArgs ); } diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx index 013807e202b3..ee5ed4bef958 100644 --- a/basctl/source/basicide/basicrenderable.cxx +++ b/basctl/source/basicide/basicrenderable.cxx @@ -25,6 +25,8 @@ #include #include +#include + namespace basctl { @@ -136,12 +138,12 @@ Sequence SAL_CALL Renderable::getRenderer ( { Size aPageSize( pPrinter->PixelToLogic( pPrinter->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) ); - aVals.realloc( 1 ); - aVals[0].Name = "PageSize" ; awt::Size aSize; aSize.Width = aPageSize.Width(); aSize.Height = aPageSize.Height(); - aVals[0].Value <<= aSize; + aVals = ::comphelper::InitPropertySequence({ + { "PageSize", makeAny(aSize) } + }); } appendPrintUIOptions( aVals ); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 812c9ec1fa03..786574e8365c 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -52,6 +52,7 @@ #include #include +#include namespace basctl @@ -1220,14 +1221,12 @@ void LibPage::ExportAsPackage( const OUString& aLibName ) const OUString strFullPath = "FullPath" ; const OUString strBasicMediaType = "application/vnd.sun.star.basic-library" ; - Sequence attribs( 2 ); - beans::PropertyValue * pattribs = attribs.getArray(); - pattribs[ 0 ].Name = strFullPath; OUString fullPath = aLibName; fullPath += "/" ; - pattribs[ 0 ].Value <<= fullPath; - pattribs[ 1 ].Name = strMediaType; - pattribs[ 1 ].Value <<= strBasicMediaType; + auto attribs(::comphelper::InitPropertySequence({ + { strFullPath, makeAny(fullPath) }, + { strMediaType, makeAny(strBasicMediaType) } + })); manifest.push_back( attribs ); // write into pipe: diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index 4a96cc7e23ee..f137d7acdd2d 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -54,6 +54,7 @@ #include #include +#include #include #include @@ -815,9 +816,9 @@ namespace basctl Sequence< PropertyValue > aArgs; if ( _rxStatusIndicator.is() ) { - aArgs.realloc(1); - aArgs[0].Name = "StatusIndicator" ; - aArgs[0].Value <<= _rxStatusIndicator; + aArgs = ::comphelper::InitPropertySequence({ + { "StatusIndicator", makeAny(_rxStatusIndicator) } + }); } try diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx index ad2cd5579c77..e640118d0cb5 100644 --- a/chart2/qa/extras/charttest.hxx +++ b/chart2/qa/extras/charttest.hxx @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -120,9 +121,9 @@ void ChartTest::load( const OUString& aDir, const OUString& aName ) boost::shared_ptr ChartTest::reload(const OUString& rFilterName) { uno::Reference xStorable(mxComponent, uno::UNO_QUERY); - uno::Sequence aArgs(1); - aArgs[0].Name = "FilterName"; - aArgs[0].Value <<= rFilterName; + auto aArgs(::comphelper::InitPropertySequence({ + { "FilterName", makeAny(rFilterName) } + })); boost::shared_ptr pTempFile = boost::make_shared(); pTempFile->EnableKillingFile(); xStorable->storeToURL(pTempFile->GetURL(), aArgs); diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index b7a677b545ea..23724f428b62 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -55,6 +55,7 @@ #include #include #include +#include #include #include @@ -253,15 +254,12 @@ void SAL_CALL ChartController::setPosSize( uno::Reference< beans::XPropertySet > xProp( m_xChartView, uno::UNO_QUERY ); if( xProp.is() ) { - uno::Sequence< beans::PropertyValue > aZoomFactors(4); - aZoomFactors[0].Name = "ScaleXNumerator"; - aZoomFactors[0].Value = uno::makeAny( nScaleXNumerator ); - aZoomFactors[1].Name = "ScaleXDenominator"; - aZoomFactors[1].Value = uno::makeAny( nScaleXDenominator ); - aZoomFactors[2].Name = "ScaleYNumerator"; - aZoomFactors[2].Value = uno::makeAny( nScaleYNumerator ); - aZoomFactors[3].Name = "ScaleYDenominator"; - aZoomFactors[3].Value = uno::makeAny( nScaleYDenominator ); + auto aZoomFactors(::comphelper::InitPropertySequence({ + { "ScaleXNumerator", uno::makeAny( nScaleXNumerator ) }, + { "ScaleXDenominator", uno::makeAny( nScaleXDenominator ) }, + { "ScaleYNumerator", uno::makeAny( nScaleYNumerator ) }, + { "ScaleYDenominator", uno::makeAny( nScaleYDenominator ) } + })); xProp->setPropertyValue( "ZoomFactors", uno::makeAny( aZoomFactors )); } diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx index ec0df948e3d8..63231e99fe6a 100644 --- a/chart2/source/controller/main/ShapeToolbarController.cxx +++ b/chart2/source/controller/main/ShapeToolbarController.cxx @@ -26,6 +26,7 @@ #include #include #include +#include using namespace com::sun::star; @@ -233,9 +234,9 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno void ShapeToolbarController::execute( sal_Int16 KeyModifier ) throw (uno::RuntimeException, std::exception) { - uno::Sequence< beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = "KeyModifier"; - aArgs[0].Value <<= KeyModifier; + auto aArgs(::comphelper::InitPropertySequence({ + { "KeyModifier", uno::makeAny(KeyModifier) } + })); dispatchCommand( m_aCommandURL, aArgs ); } diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index 99a968673a7e..1f3f61b3b9d6 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -492,11 +493,10 @@ bool EmbeddedObjectContainer::StoreEmbeddedObject( uno::Sequence < beans::PropertyValue > aSeq; if ( bCopy ) { - uno::Sequence aObjArgs(2); - aObjArgs[0].Name = "SourceShellID"; - aObjArgs[0].Value <<= rSrcShellID; - aObjArgs[1].Name = "DestinationShellID"; - aObjArgs[1].Value <<= rDestShellID; + auto aObjArgs(::comphelper::InitPropertySequence({ + { "SourceShellID", uno::makeAny(rSrcShellID) }, + { "DestinationShellID", uno::makeAny(rDestShellID) } + })); xPersist->storeToEntry(pImpl->mxStorage, rName, aSeq, aObjArgs); } else -- cgit v1.2.3