diff options
| author | Matthew Pottage <matthewpottage@invincitech.com> | 2014-10-28 16:50:02 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-06 23:06:58 +0100 |
| commit | 4f7a1f5b9499d5fbeff413a4914283c2bfe7c2d9 (patch) | |
| tree | d626505be68b47a1219d9838f9d5dc35c7271248 /comphelper | |
| parent | 90613f4e47e5e113e5fafb573d832bfcace314e5 (diff) | |
fdo#75757: Remove inheritance from std::vector
Deprecated comphelper/sequenceasvector.hxx.
Rewritten code using it. Using instead the functions containerToSequence and
sequenceToContainer, found in include/comphelper/sequence.hxx.
One class that inherits from it (in framework/inc/stdtypes.h), and
the code using that has been left.
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/TblStylePrHandler.hxx
writerfilter/source/dmapper/WrapPolygonHandler.hxx
Change-Id: Ice61c94ffb052e389281aebb7cdf185134221061
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/configurationhelper.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx index b388162fa464..b3f7472a1c57 100644 --- a/comphelper/source/misc/configurationhelper.cxx +++ b/comphelper/source/misc/configurationhelper.cxx @@ -19,6 +19,7 @@ #include <comphelper/configurationhelper.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/sequence.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -36,8 +37,8 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider( css::configuration::theDefaultProvider::get( rxContext ) ); - ::comphelper::SequenceAsVector< css::uno::Any > lParams; - css::beans::PropertyValue aParam ; + ::std::vector< css::uno::Any > lParams; + css::beans::PropertyValue aParam ; // set root path aParam.Name = "nodepath"; @@ -65,11 +66,11 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons if (bReadOnly) xCFG = xConfigProvider->createInstanceWithArguments( OUString("com.sun.star.configuration.ConfigurationAccess"), - lParams.getAsConstList()); + comphelper::containerToSequence(lParams)); else xCFG = xConfigProvider->createInstanceWithArguments( OUString("com.sun.star.configuration.ConfigurationUpdateAccess"), - lParams.getAsConstList()); + comphelper::containerToSequence(lParams)); return xCFG; } |