From 728104b31c89c93c8211fcd78a2c7a38192268eb Mon Sep 17 00:00:00 2001 From: ekuiitr Date: Wed, 27 Dec 2017 18:55:49 +0800 Subject: tdf#96099 Removed some trivial typedefs related to UnOrderedMap and size_t. Change-Id: I59d3d0b2c1097b5ca96505dc99a4a104b4f8ab48 Reviewed-on: https://gerrit.libreoffice.org/47082 Tested-by: Jenkins Reviewed-by: Michael Stahl --- scripting/source/provider/BrowseNodeFactoryImpl.cxx | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'scripting') diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index 90be10172ba7..94b35b6b82c1 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -150,9 +150,6 @@ public: } }; -typedef std::unordered_map< OUString, Reference< browse::XBrowseNode > > BrowseNodeAggregatorHash; -typedef std::vector< OUString > vString; - struct alphaSort { bool operator()( const OUString& a, const OUString& b ) @@ -164,8 +161,8 @@ class LocationBrowseNode : public ::cppu::WeakImplHelper< browse::XBrowseNode > { private: - std::unique_ptr m_hBNA; - vString m_vStr; + std::unique_ptr >> m_hBNA; + std::vector< OUString > m_vStr; OUString m_sNodeName; Reference< browse::XBrowseNode > m_origNode; @@ -197,7 +194,7 @@ public: Sequence< Reference< browse::XBrowseNode > > children( m_hBNA->size() ); sal_Int32 index = 0; - vString::const_iterator it = m_vStr.begin(); + auto it = m_vStr.begin(); for ( ; it != m_vStr.end(); ++it, index++ ) { @@ -221,7 +218,7 @@ private: void loadChildNodes() { - m_hBNA.reset( new BrowseNodeAggregatorHash ); + m_hBNA.reset( new std::unordered_map< OUString, Reference< browse::XBrowseNode > > ); Sequence< Reference< browse::XBrowseNode > > langNodes = m_origNode->getChildNodes(); @@ -245,7 +242,7 @@ private: { Reference< browse::XBrowseNode > grandchild(grandchildren[j]); - BrowseNodeAggregatorHash::iterator h_it = + auto h_it = m_hBNA->find( grandchild->getName() ); if ( h_it != m_hBNA->end() ) -- cgit