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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/inc/pch/precompiled_cui.hxx | 1 | ||||
| -rw-r--r-- | cui/source/options/optsave.cxx | 14 |
2 files changed, 7 insertions, 8 deletions
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 4c2d5a8df3eb..b4657c1efef8 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -269,7 +269,6 @@ #include <comphelper/seqstream.hxx> #include <comphelper/sequence.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <comphelper/sequenceasvector.hxx> #include <comphelper/string.hxx> #include <comphelper/types.hxx> #include <comphelper/uno3.hxx> diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 3efe0099e5b8..465be9c6f59c 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -28,7 +28,7 @@ #include <comphelper/processfactory.hxx> #include <unotools/moduleoptions.hxx> #include <unotools/saveopt.hxx> -#include <comphelper/sequenceasvector.hxx> +#include <comphelper/sequence.hxx> #include <comphelper/sequenceashashmap.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameContainer.hpp> @@ -421,9 +421,9 @@ void SfxSaveTabPage::Reset( const SfxItemSet* ) } sCommand = sCommand.replaceFirst("%1", sReplace); Reference< XEnumeration > xList = xQuery->createSubSetEnumerationByQuery(sCommand); - SequenceAsVector< OUString > lList; - SequenceAsVector< sal_Bool > lAlienList; - SequenceAsVector< sal_Bool > lODFList; + std::vector< OUString > lList; + std::vector< sal_Bool > lAlienList; + std::vector< sal_Bool > lODFList; while(xList->hasMoreElements()) { SequenceAsHashMap aFilter(xList->nextElement()); @@ -436,9 +436,9 @@ void SfxSaveTabPage::Reset( const SfxItemSet* ) lODFList.push_back( isODFFormat( sFilter ) ); } } - pImpl->aFilterArr[nData] = lList.getAsConstList(); - pImpl->aAlienArr[nData] = lAlienList.getAsConstList(); - pImpl->aODFArr[nData] = lODFList.getAsConstList(); + pImpl->aFilterArr[nData] = comphelper::containerToSequence(lList); + pImpl->aAlienArr[nData] = comphelper::containerToSequence(lAlienList); + pImpl->aODFArr[nData] = comphelper::containerToSequence(lODFList); } } aDocTypeLB->SelectEntryPos(0); |