[Libreoffice-commits] core.git: filter/source

Michael Stahl mstahl at redhat.com
Fri Feb 6 16:12:25 PST 2015


 filter/source/config/cache/contenthandlerfactory.cxx |    2 +-
 filter/source/config/cache/filtercache.cxx           |    2 +-
 filter/source/config/cache/filterfactory.cxx         |    2 +-
 filter/source/config/cache/frameloaderfactory.cxx    |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3159f59e2c620de14d9570b69a802554a3968af8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Feb 7 01:07:03 2015 +0100

    filter: try to fix GCC 4.6 build
    
    Change-Id: I3fa777b2f2d155bbd8bebf58211446eb1fa458f6

diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx
index fe774f8..23738f3 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 f8d995f..eb802f0 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 f6108bf..9abfaa8 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 320a991..36a46c7 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));


More information about the Libreoffice-commits mailing list