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 /sw/source/core/unocore/unostyle.cxx | |
| parent | fdo#39440: remove redundant checks and breaks (diff) | |
| download | core-4f7a1f5b9499d5fbeff413a4914283c2bfe7c2d9.tar.gz core-4f7a1f5b9499d5fbeff413a4914283c2bfe7c2d9.zip | |
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 'sw/source/core/unocore/unostyle.cxx')
| -rw-r--r-- | sw/source/core/unocore/unostyle.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index d8dfed2cd3cc..6141ea65527d 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -71,7 +71,7 @@ #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> -#include <comphelper/sequenceasvector.hxx> +#include <comphelper/sequence.hxx> //UUUU #include <svx/unobrushitemhelper.hxx> @@ -767,7 +767,7 @@ uno::Any SwXStyleFamily::getByName(const OUString& rName) uno::Sequence< OUString > SwXStyleFamily::getElementNames(void) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; - comphelper::SequenceAsVector< OUString > aRet; + std::vector< OUString > aRet; if(pBasePool) { SfxStyleSheetIteratorPtr pIt = pBasePool->CreateIterator(eFamily, SFXSTYLEBIT_ALL); @@ -782,7 +782,7 @@ uno::Sequence< OUString > SwXStyleFamily::getElementNames(void) throw( uno::Runt else throw uno::RuntimeException(); - return aRet.getAsConstList(); + return comphelper::containerToSequence(aRet); } sal_Bool SwXStyleFamily::hasByName(const OUString& rName) throw( uno::RuntimeException, std::exception ) |