diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-25 09:34:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-25 12:03:17 +0200 |
| commit | f74da1315a5b2ec232a66944e41ff90231b383be (patch) | |
| tree | 60d464c45df3531013642d61cbc8302ac815a1ae /sd | |
| parent | 04a6a5d5cdc6889c6f0e41b3df537f59baeee9f9 (diff) | |
use more comphelper::InitAnyPropertySequence
Found with:
git grep -n -A10 'Sequence.*Any' -- *.cxx | grep -B5 -w PropertyValueProvider
and:
git grep -n 'Sequence.*Any.*( *&'
Change-Id: Icb18c98bdd3f8352817e443ff78de5df042859ad
Reviewed-on: https://gerrit.libreoffice.org/40389
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/CustomAnimationPreset.cxx | 12 | ||||
| -rw-r--r-- | sd/source/core/TransitionPreset.cxx | 12 |
2 files changed, 11 insertions, 13 deletions
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index 2163676af665..3754479cb46d 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -303,16 +303,14 @@ void CustomAnimationPresets::importEffects() configuration::theDefaultProvider::get( xContext ); // read path to transition effects files from config - Any propValue = uno::makeAny( - beans::PropertyValue( - "nodepath", -1, - uno::makeAny( OUString( "/org.openoffice.Office.Impress/Misc" )), - beans::PropertyState_DIRECT_VALUE ) ); - + uno::Sequence<uno::Any> aArgs(comphelper::InitAnyPropertySequence( + { + {"nodepath", uno::Any(OUString("/org.openoffice.Office.Impress/Misc"))} + })); Reference<container::XNameAccess> xNameAccess( xConfigProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", - Sequence<Any>( &propValue, 1 ) ), UNO_QUERY_THROW ); + aArgs ), UNO_QUERY_THROW ); uno::Sequence< OUString > aFiles; xNameAccess->getByName( "EffectFiles" ) >>= aFiles; diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index 6c0746a69e37..17496dd95972 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -29,6 +29,7 @@ #include <unotools/streamwrap.hxx> #include <comphelper/getexpandeduri.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/propertysequence.hxx> #include <unotools/pathoptions.hxx> #include <officecfg/Office/UI/Effects.hxx> #include <tools/stream.hxx> @@ -205,15 +206,14 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList ) configuration::theDefaultProvider::get( xContext ); // read path to transition effects files from config - Any propValue = uno::makeAny( - beans::PropertyValue("nodepath", -1, - uno::makeAny( OUString("/org.openoffice.Office.Impress/Misc")), - beans::PropertyState_DIRECT_VALUE ) ); - + uno::Sequence<uno::Any> aArgs(comphelper::InitAnyPropertySequence( + { + {"nodepath", uno::Any(OUString("/org.openoffice.Office.Impress/Misc"))} + })); Reference<container::XNameAccess> xNameAccess( xConfigProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", - Sequence<Any>( &propValue, 1 ) ), + aArgs), UNO_QUERY_THROW ); uno::Sequence< OUString > aFiles; xNameAccess->getByName("TransitionFiles") >>= aFiles; |