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 /framework/source/inc | |
| 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 'framework/source/inc')
| -rw-r--r-- | framework/source/inc/accelerators/acceleratorcache.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx index 47e0d86ce81e..07c0cf877b94 100644 --- a/framework/source/inc/accelerators/acceleratorcache.hxx +++ b/framework/source/inc/accelerators/acceleratorcache.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/awt/KeyEvent.hpp> -#include <comphelper/sequenceasvector.hxx> +#include <vector> // definition @@ -51,7 +51,7 @@ class AcceleratorCache /** TODO document me commands -> keys */ - typedef ::comphelper::SequenceAsVector< css::awt::KeyEvent > TKeyList; + typedef ::std::vector< css::awt::KeyEvent > TKeyList; typedef BaseHash< TKeyList > TCommand2Keys; /** TODO document me |