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 /include/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 'include/comphelper')
| -rw-r--r-- | include/comphelper/configurationhelper.hxx | 1 | ||||
| -rw-r--r-- | include/comphelper/sequenceasvector.hxx | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/comphelper/configurationhelper.hxx b/include/comphelper/configurationhelper.hxx index c1be8114df7a..be2bf0509499 100644 --- a/include/comphelper/configurationhelper.hxx +++ b/include/comphelper/configurationhelper.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/util/XChangesBatch.hpp> -#include <comphelper/sequenceasvector.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> #include <comphelper/comphelperdllapi.h> diff --git a/include/comphelper/sequenceasvector.hxx b/include/comphelper/sequenceasvector.hxx index 48b9e1a16f01..6b85e7233438 100644 --- a/include/comphelper/sequenceasvector.hxx +++ b/include/comphelper/sequenceasvector.hxx @@ -26,6 +26,10 @@ #include <com/sun/star/beans/IllegalTypeException.hpp> +/** This should not be used. Use the functions in + * comphelper/vectortosequence.hxx + * @deprecated + */ namespace comphelper{ |