diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-02-07 01:07:03 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-02-07 01:07:03 +0100 |
commit | 3159f59e2c620de14d9570b69a802554a3968af8 (patch) | |
tree | 998ad44daa95290bb9ef6365fe660ccc53221071 /filter/source | |
parent | Fixup --without-x build (diff) | |
download | core-3159f59e2c620de14d9570b69a802554a3968af8.tar.gz core-3159f59e2c620de14d9570b69a802554a3968af8.zip |
filter: try to fix GCC 4.6 build
Change-Id: I3fa777b2f2d155bbd8bebf58211446eb1fa458f6
Diffstat (limited to 'filter/source')
-rw-r--r-- | filter/source/config/cache/contenthandlerfactory.cxx | 2 | ||||
-rw-r--r-- | filter/source/config/cache/filtercache.cxx | 2 | ||||
-rw-r--r-- | filter/source/config/cache/filterfactory.cxx | 2 | ||||
-rw-r--r-- | filter/source/config/cache/frameloaderfactory.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index fe774f8b9c91..23738f3a338c 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -125,7 +125,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea css::uno::Sequence< css::beans::PropertyValue > lConfig; aHandler >> lConfig; - ::std::vector< css::uno::Any > stlArguments(comphelper::sequenceToContainer<::std::vector< css::uno::Any > >(lArguments)); + ::std::vector< css::uno::Any > stlArguments(comphelper::sequenceToContainer< ::std::vector< css::uno::Any > >(lArguments)); stlArguments.insert(stlArguments.begin(), css::uno::makeAny(lConfig)); xInit->initialize(comphelper::containerToSequence(stlArguments)); diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index f8d995fc23a7..eb802f0b9317 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -1545,7 +1545,7 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe if (!(aVal >>= xUIName) && !xUIName.is()) return; - const ::std::vector< OUString > lLocales(comphelper::sequenceToContainer<::std::vector< OUString >>( + const ::std::vector< OUString > lLocales(comphelper::sequenceToContainer< ::std::vector< OUString >>( xUIName->getElementNames())); ::std::vector< OUString >::const_iterator pLocale ; ::comphelper::SequenceAsHashMap lUINames; diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index f6108bf523d9..9abfaa84d77b 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -143,7 +143,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan css::uno::Sequence< css::beans::PropertyValue > lConfig; aFilter >> lConfig; - ::std::vector< css::uno::Any > stlArguments(comphelper::sequenceToContainer<::std::vector< css::uno::Any > >(lArguments)); + ::std::vector< css::uno::Any > stlArguments(comphelper::sequenceToContainer< ::std::vector< css::uno::Any > >(lArguments)); stlArguments.insert(stlArguments.begin(), css::uno::makeAny(lConfig)); xInit->initialize(comphelper::containerToSequence(stlArguments)); diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index 320a9918be57..36a46c71c7a4 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -122,7 +122,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI css::uno::Sequence< css::beans::PropertyValue > lConfig; aLoader >> lConfig; - ::std::vector< css::uno::Any > stlArguments(comphelper::sequenceToContainer<::std::vector<css::uno::Any> >(lArguments)); + ::std::vector< css::uno::Any > stlArguments(comphelper::sequenceToContainer< ::std::vector<css::uno::Any> >(lArguments)); stlArguments.insert(stlArguments.begin(), css::uno::makeAny(lConfig)); xInit->initialize(comphelper::containerToSequence(stlArguments)); |