summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorSwachhand Lokhande <swachhandl95@gmail.com>2015-03-07 18:58:49 +0530
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-03-10 10:26:59 +0000
commitb1534edf523a405b91ad04c5351735e745ceb7ee (patch)
tree936b938dab11100b532f3b9204891d162c334bef /chart2
parentbb2728fd246716588d135c9e159135b1c5a7d3e1 (diff)
tdf#89592 Using initializer_lists to populate Sequence<PropertyValue>
Change-Id: Idef9dd55eb1719eaf592bc4a86440cbd5aa4fb32 Reviewed-on: https://gerrit.libreoffice.org/14781 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/qa/extras/charttest.hxx7
-rw-r--r--chart2/source/controller/main/ChartController_Window.cxx16
-rw-r--r--chart2/source/controller/main/ShapeToolbarController.cxx7
3 files changed, 15 insertions, 15 deletions
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 <test/bootstrapfixture.hxx>
#include <unotest/macros_test.hxx>
#include <comphelper/processfactory.hxx>
+#include <comphelper/propertysequence.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/frame/Desktop.hpp>
@@ -120,9 +121,9 @@ void ChartTest::load( const OUString& aDir, const OUString& aName )
boost::shared_ptr<utl::TempFile> ChartTest::reload(const OUString& rFilterName)
{
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
- uno::Sequence<beans::PropertyValue> aArgs(1);
- aArgs[0].Name = "FilterName";
- aArgs[0].Value <<= rFilterName;
+ auto aArgs(::comphelper::InitPropertySequence({
+ { "FilterName", makeAny(rFilterName) }
+ }));
boost::shared_ptr<utl::TempFile> pTempFile = boost::make_shared<utl::TempFile>();
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 <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/util/XUpdatable.hpp>
#include <comphelper/InlineContainer.hxx>
+#include <comphelper/propertysequence.hxx>
#include <svtools/contextmenuhelper.hxx>
#include <toolkit/awt/vclxmenu.hxx>
@@ -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 <toolkit/helper/vclunohelper.hxx>
#include <svx/svxids.hrc>
#include <svx/tbxcustomshapes.hxx>
+#include <comphelper/propertysequence.hxx>
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 );
}