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 /svx/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 'svx/inc')
| -rw-r--r-- | svx/inc/tbunosearchcontrollers.hxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx index 25b3f8135d50..a7657eedeeaf 100644 --- a/svx/inc/tbunosearchcontrollers.hxx +++ b/svx/inc/tbunosearchcontrollers.hxx @@ -29,7 +29,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include <comphelper/sequenceasvector.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/weak.hxx> #include <svtools/toolboxcontroller.hxx> @@ -79,7 +78,7 @@ public: private: - typedef ::comphelper::SequenceAsVector< css::beans::PropertyValue > SearchToolbarControllersVec; + typedef ::std::vector< css::beans::PropertyValue > SearchToolbarControllersVec; typedef ::std::map< css::uno::Reference< css::frame::XFrame >, SearchToolbarControllersVec > SearchToolbarControllersMap; SearchToolbarControllersMap aSearchToolbarControllersMap; std::vector<OUString> m_aSearchStrings; |