diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2018-06-01 22:59:47 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-06-03 09:38:42 +0200 |
| commit | 62667aac83bd743fa98a5eaa946cc8088335f66c (patch) | |
| tree | af4442622bdf7d417a55e69c72d2fe44bfd18f17 /forms | |
| parent | 10da3d817afd3f5d5c4f84cb814d56efc0678d43 (diff) | |
tdf#96099 Remove some trivial std::vector typedefs
Change-Id: I21171bd90b5e19fe8e5b8f2d125b6dfcb9a8b766
Reviewed-on: https://gerrit.libreoffice.org/55198
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/EventThread.cxx | 2 | ||||
| -rw-r--r-- | forms/source/component/EventThread.hxx | 3 | ||||
| -rw-r--r-- | forms/source/solar/control/navtoolbar.cxx | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx index dd3e16c951bd..821f2b63e77e 100644 --- a/forms/source/component/EventThread.cxx +++ b/forms/source/component/EventThread.cxx @@ -161,7 +161,7 @@ void OComponentEventThread::run() Reference<XAdapter> xControlAdapter = *firstControl; m_aControls.erase( firstControl ); - ThreadBools::iterator firstFlag( m_aFlags.begin() ); + auto firstFlag( m_aFlags.begin() ); bool bFlag = *firstFlag; m_aFlags.erase( firstFlag ); diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx index 607db4956b26..efb9e20fc4dc 100644 --- a/forms/source/component/EventThread.hxx +++ b/forms/source/component/EventThread.hxx @@ -50,13 +50,12 @@ class OComponentEventThread { typedef std::vector<css::lang::EventObject*> ThreadEvents; typedef std::vector< css::uno::Reference< css::uno::XAdapter> > ThreadObjects; - typedef std::vector<bool> ThreadBools; ::osl::Mutex m_aMutex; ::osl::Condition m_aCond; // Queue filled? ThreadEvents m_aEvents; // EventQueue ThreadObjects m_aControls; // Control for Submit - ThreadBools m_aFlags; // Flags for Submit/Reset + std::vector<bool> m_aFlags; // Flags for Submit/Reset rtl::Reference<::cppu::OComponentHelper> m_xComp; // Implementation of the Control diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index 1eea34edd9b4..af5428305c70 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -345,8 +345,7 @@ namespace frm const ToolBox::ImplToolItems::size_type nItemCount = m_pToolbar->GetItemCount(); // collect the FormFeatures in the toolbar - typedef ::std::vector< sal_Int16 > FormFeatures; - FormFeatures aFormFeatures; + std::vector<sal_Int16> aFormFeatures; aFormFeatures.reserve( nItemCount ); for ( ToolBox::ImplToolItems::size_type i=0; i<nItemCount; ++i ) |