From 3f7f497192deb486b1b959996c14f8f094146945 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 16 Feb 2016 19:58:33 +0200 Subject: sequence->vector in framework Change-Id: I457c3da4f4a31f58d688dcd96a2ccfc36518490d Reviewed-on: https://gerrit.libreoffice.org/23692 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/framework/configimporter.hxx | 3 ++- include/framework/framelistanalyzer.hxx | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/framework/configimporter.hxx b/include/framework/configimporter.hxx index c35e8d6428b5..3082464c28c2 100644 --- a/include/framework/configimporter.hxx +++ b/include/framework/configimporter.hxx @@ -27,6 +27,7 @@ #include #include +#include namespace framework { @@ -35,7 +36,7 @@ namespace framework public: static bool ImportCustomToolbars( const css::uno::Reference< css::ui::XUIConfigurationManager2 >& rContainerFactory, - css::uno::Sequence< css::uno::Reference< css::container::XIndexContainer > >& rSeqContainer, + std::vector< css::uno::Reference< css::container::XIndexContainer > >& rSeqContainer, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::embed::XStorage >& rToolbarStorage ); }; diff --git a/include/framework/framelistanalyzer.hxx b/include/framework/framelistanalyzer.hxx index cdceae22559b..a1f2501bc08c 100644 --- a/include/framework/framelistanalyzer.hxx +++ b/include/framework/framelistanalyzer.hxx @@ -23,6 +23,7 @@ #include #include +#include namespace framework{ @@ -73,19 +74,19 @@ class FWE_DLLPUBLIC FrameListAnalyzer /** contains all frames, which uses the same model like the reference frame. Will be filled only if m_eDetectMode has set the flag E_MODEL. The reference frame is never part of this list! */ - css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > m_lModelFrames; + std::vector< css::uno::Reference< css::frame::XFrame > > m_lModelFrames; /** contains all frames, which does not contain the same model like the reference frame. Filling of it can't be suppressed by m_eDetectMode. The reference frame is never part of this list! All frames inside this list are visible ones. */ - css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > m_lOtherVisibleFrames; + std::vector< css::uno::Reference< css::frame::XFrame > > m_lOtherVisibleFrames; /** contains all frames, which does not contain the same model like the reference frame. Filling of it can't be suppressed by m_eDetectMode. The reference frame is never part of this list! All frames inside this list are hidden ones. */ - css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > m_lOtherHiddenFrames; + std::vector< css::uno::Reference< css::frame::XFrame > > m_lOtherHiddenFrames; /** points to the help frame. Will be set only, if any other frame (means different from the reference frame) -- cgit