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 /editeng | |
| 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 'editeng')
| -rw-r--r-- | editeng/source/accessibility/AccessibleStaticTextBase.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index 8d97b0e4af91..abc190339c8b 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -32,7 +32,7 @@ #include <osl/mutex.hxx> #include <vcl/window.hxx> #include <vcl/svapp.hxx> -#include <comphelper/sequenceasvector.hxx> +#include <comphelper/sequence.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/awt/Point.hpp> @@ -66,7 +66,7 @@ using namespace ::com::sun::star::accessibility; namespace accessibility { - typedef ::comphelper::SequenceAsVector< beans::PropertyValue > PropertyValueVector; + typedef ::std::vector< beans::PropertyValue > PropertyValueVector; class PropertyValueEqualFunctor : public ::std::binary_function< beans::PropertyValue, beans::PropertyValue, bool > { @@ -970,7 +970,8 @@ namespace accessibility SolarMutexGuard aGuard; - PropertyValueVector aDefAttrVec( mpImpl->GetParagraph( 0 ).getDefaultAttributes( RequestedAttributes ) ); + PropertyValueVector aDefAttrVec( + comphelper::sequenceToContainer<PropertyValueVector>(mpImpl->GetParagraph( 0 ).getDefaultAttributes( RequestedAttributes )) ); const sal_Int32 nParaCount = mpImpl->GetParagraphCount(); for ( sal_Int32 nPara = 1; nPara < nParaCount; ++nPara ) @@ -998,7 +999,7 @@ namespace accessibility } } - return aDefAttrVec.getAsConstList(); + return comphelper::containerToSequence(aDefAttrVec); } uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getRunAttributes( sal_Int32 nIndex, const uno::Sequence< OUString >& RequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) @@ -1028,7 +1029,7 @@ namespace accessibility } } - return ::comphelper::concatSequences( aRunAttrSeq, aDiffVec.getAsConstList() ); + return ::comphelper::concatSequences( aRunAttrSeq, comphelper::containerToSequence(aDiffVec) ); } Rectangle AccessibleStaticTextBase::GetParagraphBoundingBox() const |