inline use-once typedefs

Change-Id: I5c3ffc03c26b3428f1f336e6ecba7838a1cf1157
Reviewed-on: https://gerrit.libreoffice.org/46764Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

basegfx/source/polygon/b2dpolypolygoncutter.cxx

@@ -93,7 +93,6 @@ namespace basegfx
         typedef std::vector< VN > VNV;
         typedef std::vector< SN > SNV;
         typedef std::pair< basegfx::B2DPoint /*orig*/, basegfx::B2DPoint /*repl*/ > CorrectionPair;
-        typedef std::vector< CorrectionPair > CorrectionTable;
 
         class solver
         {
@@ -102,7 +101,8 @@ namespace basegfx
             PNV                     maPNV;
             VNV                     maVNV;
             SNV                     maSNV;
-            CorrectionTable         maCorrectionTable;
+            std::vector< CorrectionPair >
+                                    maCorrectionTable;
 
             bool                    mbIsCurve : 1;
             bool                    mbChanged : 1;

binaryurp/source/cache.hxx

@@ -55,9 +55,8 @@ public:
         }
         // try to insert into the map
         list_.push_front( rContent); // create a temp entry
-        typedef std::pair<typename LruList::iterator, IdxType> MappedType;
         typedef std::pair<typename LruItMap::iterator,bool> MapPair;
-        MapPair aMP = map_.insert( MappedType( list_.begin(), 0));
+        MapPair aMP = map_.emplace( list_.begin(), 0 );
         *pbFound = !aMP.second;
 
         if( !aMP.second) { // insertion not needed => found the entry

canvas/source/tools/canvascustomspritehelper.cxx

@@ -107,8 +107,7 @@ namespace canvas
                 {
                     // aClipBoundsB = maCurrClipBounds, i.e. last
                     // clip, intersected with sprite area
-                    typedef std::vector< ::basegfx::B2DRectangle > VectorOfRects;
-                    VectorOfRects aClipDifferences;
+                    std::vector< ::basegfx::B2DRectangle > aClipDifferences;
 
                     // get all rectangles covered by exactly one
                     // of the polygons (aka XOR)

canvas/source/tools/pagemanager.hxx

@@ -62,8 +62,7 @@ namespace canvas
 
         // this is the container holding all created pages,
         // behind the scenes these are real hardware surfaces.
-        typedef std::vector<PageSharedPtr> PageContainer_t;
-        PageContainer_t maPages;
+        std::vector<PageSharedPtr> maPages;
 
         bool relocate( const FragmentSharedPtr& pFragment );
     };

chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx

@@ -138,8 +138,7 @@ private: //member
 
     mutable css::uno::Reference< css::lang::XUnoTunnel > m_xChartView;
 
-    typedef std::map< OUString, css::uno::Reference< css::container::XNameContainer > > tTableMap;//GradientTable, HatchTable etc.
-    tTableMap   m_aTableMap;
+    std::map< OUString, css::uno::Reference< css::container::XNameContainer > > m_aTableMap;
 };
 
 } //  namespace wrapper

comphelper/source/misc/backupfilehelper.cxx

@@ -1339,13 +1339,12 @@ namespace
 
 namespace
 {
-    typedef std::deque< PackedFileEntry > PackedFileEntryVector;
-
     class PackedFile
     {
     private:
         const OUString          maURL;
-        PackedFileEntryVector   maPackedFileEntryVector;
+        std::deque< PackedFileEntry >
+                                maPackedFileEntryVector;
         bool                    mbChanged;
 
     public:

comphelper/source/property/propertycontainerhelper.cxx

@@ -276,7 +276,7 @@ bool OPropertyContainerHelper::convertFastPropertyValue(
             {
                 OSL_ENSURE(aPos->aLocation.nOwnClassVectorIndex < (sal_Int32)m_aHoldProperties.size(),
                     "OPropertyContainerHelper::convertFastPropertyValue: invalid position !");
-                PropertyContainerIterator aIter = m_aHoldProperties.begin() + aPos->aLocation.nOwnClassVectorIndex;
+                auto aIter = m_aHoldProperties.begin() + aPos->aLocation.nOwnClassVectorIndex;
                 pPropContainer = &(*aIter);
             }
             else

configmgr/source/xcuparser.hxx

@@ -135,8 +135,6 @@ private:
         {}
     };
 
-    typedef std::stack< State > StateStack;
-
     ValueParser valueParser_;
     Data & data_;
     Partial const * partial_;
@@ -145,7 +143,7 @@ private:
     bool recordModifications_;
     bool trackPath_;
     OUString componentName_;
-    StateStack state_;
+    std::stack< State > state_;
     std::vector<OUString> path_;
 };
 

connectivity/source/cpool/ZConnectionPool.hxx

@@ -59,8 +59,6 @@ namespace connectivity
     // OConnectionPool - the one-instance service for PooledConnections
     // manages the active connections and the connections in the pool
 
-    typedef ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener>  OConnectionPool_Base;
-
     // typedef for the internal structure
     typedef std::vector< css::uno::Reference< css::sdbc::XPooledConnection> > TPooledConnections;
 
@@ -106,7 +104,7 @@ namespace connectivity
     typedef std::map< css::uno::Reference< css::sdbc::XConnection>,
                         TActiveConnectionInfo> TActiveConnectionMap;
 
-    class OConnectionPool : public OConnectionPool_Base
+    class OConnectionPool : public ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener>
     {
         TConnectionMap          m_aPool;                // the pooled connections
         TActiveConnectionMap    m_aActiveConnections;   // the currently active connections

connectivity/source/drivers/file/FResultSet.cxx

@@ -1432,8 +1432,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
     const OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME);
     const OUString sType     = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE);
 
-    typedef std::map<OSQLColumns::Vector::iterator,sal_Bool> IterMap;
-    IterMap aSelectIters;
+    std::map<OSQLColumns::Vector::iterator,sal_Bool> aSelectIters;
     OValueRefVector::Vector::const_iterator aRowIter = _rRow->get().begin()+1;
     for (sal_Int32 i=0; // the first column is the bookmark column
          aRowIter != _rRow->get().end();

connectivity/source/drivers/firebird/Column.hxx

@@ -16,9 +16,8 @@ namespace connectivity
     namespace firebird
     {
         class Column;
-        typedef sdbcx::OColumn Column_BASE;
         typedef ::comphelper::OIdPropertyArrayUsageHelper<Column> Column_PROP;
-        class Column : public Column_BASE,
+        class Column : public sdbcx::OColumn,
                            public Column_PROP
         {
             OUString m_sAutoIncrement;

connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx

@@ -29,12 +29,7 @@ namespace connectivity
     namespace macab
     {
 
-        //************ Class: MacabDatabaseMetaData
-
-
-        typedef ::cppu::WeakImplHelper< css::sdbc::XDatabaseMetaData> MacabDatabaseMetaData_BASE;
-
-        class MacabDatabaseMetaData : public MacabDatabaseMetaData_BASE
+        class MacabDatabaseMetaData : public ::cppu::WeakImplHelper< css::sdbc::XDatabaseMetaData>
         {
             rtl::Reference< MacabConnection > m_xConnection;
             bool                                   m_bUseCatalog;

connectivity/source/drivers/macab/MacabResultSetMetaData.hxx

@@ -34,9 +34,7 @@ namespace connectivity
         /*
         **  MacabResultSetMetaData
         */
-        typedef ::cppu::WeakImplHelper< css::sdbc::XResultSetMetaData>   MacabResultSetMetaData_BASE;
-
-        class MacabResultSetMetaData : public MacabResultSetMetaData_BASE
+        class MacabResultSetMetaData : public ::cppu::WeakImplHelper< css::sdbc::XResultSetMetaData>
         {
             MacabConnection*                m_pConnection;
             OUString                 m_sTableName;

connectivity/source/inc/dbase/DConnection.hxx

@@ -27,8 +27,7 @@ namespace connectivity
     namespace dbase
     {
         class ODriver;
-        typedef file::OConnection ODbaseConnection_Base;
-        class ODbaseConnection : public ODbaseConnection_Base
+        class ODbaseConnection : public file::OConnection
         {
         protected:
             virtual ~ODbaseConnection() override;

connectivity/source/inc/dbase/DIndex.hxx

@@ -72,7 +72,8 @@ namespace connectivity
         private:
             SvStream*       m_pFileStream;                  // Stream to read/write the index
             NDXHeader       m_aHeader;
-            ONDXPageList    m_aCollector;                   // Pool of obsolete pages
+            std::vector<ONDXPage*>
+                            m_aCollector;                   // Pool of obsolete pages
             ONDXPagePtr     m_aRoot,                        // Root of the B+ tree
                             m_aCurLeaf;                     // Current leaf
             sal_uInt16      m_nCurNode;                     // Position of the current node

connectivity/source/inc/dbase/dindexnode.hxx

@@ -230,9 +230,6 @@ namespace connectivity
         SvStream& WriteONDXPage(SvStream &rStream, const ONDXPage& rPage);
 
 
-        typedef std::vector<ONDXPage*>    ONDXPageList;
-
-
         // Index Node
 
         class ONDXNode

connectivity/source/inc/hsqldb/HColumns.hxx

@@ -37,10 +37,9 @@ namespace connectivity
         };
 
         class OHSQLColumn;
-        typedef sdbcx::OColumn OHSQLColumn_BASE;
         typedef ::comphelper::OIdPropertyArrayUsageHelper<OHSQLColumn> OHSQLColumn_PROP;
 
-        class OHSQLColumn : public OHSQLColumn_BASE,
+        class OHSQLColumn : public sdbcx::OColumn,
                                 public OHSQLColumn_PROP
         {
             OUString m_sAutoIncrement;

connectivity/source/inc/mysql/YColumns.hxx

@@ -37,10 +37,9 @@ namespace connectivity
         };
 
         class OMySQLColumn;
-        typedef sdbcx::OColumn OMySQLColumn_BASE;
         typedef ::comphelper::OIdPropertyArrayUsageHelper<OMySQLColumn> OMySQLColumn_PROP;
 
-        class OMySQLColumn :    public OMySQLColumn_BASE,
+        class OMySQLColumn :    public sdbcx::OColumn,
                                 public OMySQLColumn_PROP
         {
             OUString m_sAutoIncrement;

connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx

@@ -62,7 +62,7 @@ namespace connectivity
                                     public  ::cppu::OPropertySetHelper,
                                     public  ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet>
         {
-            ::connectivity::TIntVector                  m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time
+            std::vector< sal_Int32>                     m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time
 
             std::map<sal_Int32, ::connectivity::TInt2IntMap >
                                                         m_aValueRange;

cui/source/customize/cfg.cxx

@@ -768,8 +768,7 @@ SvxEntries* ContextMenuSaveInData::GetEntries()
 {
     if ( !m_pRootEntry )
     {
-        typedef std::unordered_map< OUString, bool > MenuInfo;
-        MenuInfo aMenuInfo;
+        std::unordered_map< OUString, bool > aMenuInfo;
 
         m_pRootEntry.reset( new SvxConfigEntry( "ContextMenus", OUString(), true, /*bParentData*/false ) );
         css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aElementsInfo;

cui/source/dialogs/screenshotannotationdlg.cxx

@@ -124,7 +124,6 @@ private:
 };
 
 typedef std::vector< ControlDataEntry > ControlDataCollection;
-typedef std::set< ControlDataEntry* > ControlDataSet;
 
 class ScreenshotAnnotationDlg_Impl // : public ModalDialog
 {
@@ -173,7 +172,8 @@ private:
 
     // hilighted/selected children
     ControlDataEntry*           mpHilighted;
-    ControlDataSet              maSelected;
+    std::set< ControlDataEntry* >
+                                maSelected;
 
     // list of detected controls
     VclPtr<FixedImage>          mpPicture;

dbaccess/source/core/api/RowSet.cxx

@@ -681,8 +681,7 @@ void SAL_CALL ORowSet::close(  )
 // cppu::OPropertySetHelper
 ::cppu::IPropertyArrayHelper& SAL_CALL ORowSet::getInfoHelper()
 {
-    typedef ::comphelper::OPropertyArrayUsageHelper<ORowSet> ORowSet_PROP;
-    return *ORowSet_PROP::getArrayHelper();
+    return *::comphelper::OPropertyArrayUsageHelper<ORowSet>::getArrayHelper();
 }
 
 void ORowSet::updateValue(sal_Int32 columnIndex,const ORowSetValue& x)
@@ -2936,8 +2935,7 @@ void ORowSetClone::close()
 // cppu::OPropertySetHelper
 ::cppu::IPropertyArrayHelper& SAL_CALL ORowSetClone::getInfoHelper()
 {
-    typedef ::comphelper::OPropertyArrayUsageHelper<ORowSetClone> ORowSetClone_PROP;
-    return *ORowSetClone_PROP::getArrayHelper();
+    return *::comphelper::OPropertyArrayUsageHelper<ORowSetClone>::getArrayHelper();
 }
 
 Sequence< sal_Int8 > ORowSetClone::getUnoTunnelImplementationId()

dbaccess/source/core/api/SingleSelectQueryComposer.cxx

@@ -834,8 +834,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns(  )
         }
 
         const ::comphelper::UStringMixEqual aCaseCompare( bCase );
-        typedef std::set< size_t > SizeTSet;
-        SizeTSet aUsedSelectColumns;
+        std::set< size_t > aUsedSelectColumns;
         ::connectivity::parse::OParseColumn::StringMap aColumnNames;
 
         sal_Int32 nCount = xResultSetMeta->getColumnCount();

dbaccess/source/core/api/query.hxx

@@ -55,11 +55,7 @@ class OQuery    :public OContentHelper
 {
     friend struct TRelease;
 
-public:
-    typedef std::map< OUString,OColumn*,::comphelper::UStringMixLess> TNameColumnMap;
-
 protected:
-//  TNameColumnMap      m_aColumnMap; // contains all columnnames to columns
     css::uno::Reference< css::beans::XPropertySet >           m_xCommandDefinition;
     css::uno::Reference< css::sdbc::XConnection >             m_xConnection;
     css::uno::Reference< css::beans::XPropertySetInfo >       m_xCommandPropInfo;

dbaccess/source/core/inc/ContainerMediator.hxx

@@ -39,8 +39,7 @@ namespace dbaccess
                                 ,public ::cppu::WeakImplHelper< css::container::XContainerListener >
     {
     private:
-        typedef ::rtl::Reference< OPropertyForward >          TPropertyForward;
-        typedef std::map< OUString, TPropertyForward >      PropertyForwardList;
+        typedef std::map< OUString, ::rtl::Reference< OPropertyForward > >  PropertyForwardList;
         PropertyForwardList                                   m_aForwardList;
         css::uno::Reference< css::container::XNameAccess >    m_xSettings;    // can not be weak
         css::uno::Reference< css::container::XContainer >     m_xContainer;   // can not be weak

dbaccess/source/core/inc/ContentHelper.hxx

@@ -80,7 +80,6 @@ namespace dbaccess
 
     typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
         PropertyChangeListenerContainer;
-    typedef ::cppu::BaseMutex    OContentHelper_MBASE;
     typedef ::cppu::WeakComponentImplHelper<   css::ucb::XContent
                                            ,   css::ucb::XCommandProcessor
                                            ,   css::lang::XServiceInfo
@@ -92,7 +91,7 @@ namespace dbaccess
                                            ,   css::sdbcx::XRename
                                            >   OContentHelper_COMPBASE;
 
-    class OContentHelper :   public OContentHelper_MBASE
+    class OContentHelper :   public ::cppu::BaseMutex
                             ,public OContentHelper_COMPBASE
     {
         css::uno::Sequence< css::uno::Any >

dbaccess/source/core/inc/definitioncontainer.hxx

@@ -96,7 +96,6 @@ class ODefinitionContainer
 {
 protected:
     typedef std::map< OUString, css::uno::WeakReference< css::ucb::XContent > > Documents;
-    typedef std::vector<Documents::iterator> DocumentsIndexAccess;
 
     enum ContainerOperation
     {
@@ -117,7 +116,8 @@ private:
 protected:
     // we can't just hold a vector of XContentRefs, as after initialization they're all empty
     // cause we load them only on access
-    DocumentsIndexAccess    m_aDocuments;               // for a efficient index access
+    std::vector<Documents::iterator>
+                            m_aDocuments;               // for a efficient index access
     Documents               m_aDocumentMap;             // for a efficient name access
 
     ::comphelper::OInterfaceContainerHelper2

dbaccess/source/core/inc/tablecontainer.hxx

@@ -42,13 +42,11 @@
 
 namespace dbaccess
 {
-    typedef ::cppu::ImplHelper1< css::container::XContainerListener> OTableContainer_Base;
-
     // OTableContainer
     class OContainerMediator;
 
     class OTableContainer :  public OFilteredContainer,
-                             public OTableContainer_Base
+                             public ::cppu::ImplHelper1< css::container::XContainerListener>
     {
         css::uno::Reference< css::container::XNameContainer > m_xTableDefinitions;
         ::rtl::Reference< OContainerMediator >                m_pTableMediator;

dbaccess/source/core/inc/viewcontainer.hxx

@@ -46,11 +46,9 @@ namespace dbtools
 
 namespace dbaccess
 {
-    typedef ::cppu::ImplHelper1< css::container::XContainerListener> OViewContainer_Base;
-
     // OViewContainer
     class OViewContainer :  public OFilteredContainer,
-                            public OViewContainer_Base
+                            public ::cppu::ImplHelper1< css::container::XContainerListener>
     {
     public:
         /** ctor of the container. The parent has to support the <type scope="css::sdbc">XConnection</type>

dbaccess/source/filter/xml/xmlfilter.hxx

@@ -58,11 +58,10 @@ class ODBFilter : public SvXMLImport
 {
 public:
     typedef std::map< OUString, Sequence<PropertyValue> > TPropertyNameMap;
-    typedef std::vector< css::beans::PropertyValue> TInfoSequence;
 private:
     TPropertyNameMap                                m_aQuerySettings;
     TPropertyNameMap                                m_aTablesSettings;
-    TInfoSequence                                   m_aInfoSequence;
+    std::vector< css::beans::PropertyValue>         m_aInfoSequence;
 
     mutable std::unique_ptr<SvXMLTokenMap>          m_pDocElemTokenMap;
     mutable std::unique_ptr<SvXMLTokenMap>          m_pDocContentElemTokenMap;

dbaccess/source/ui/inc/TokenWriter.hxx

@@ -48,8 +48,7 @@ namespace dbaui
 {
     // ODatabaseImportExport base class for import/export
     class ODatabaseExport;
-    typedef ::cppu::WeakImplHelper< css::lang::XEventListener> ODatabaseImportExport_BASE;
-    class ODatabaseImportExport : public ODatabaseImportExport_BASE
+    class ODatabaseImportExport : public ::cppu::WeakImplHelper< css::lang::XEventListener>
     {
     protected:
         css::lang::Locale                                     m_aLocale;

dbaccess/source/ui/inc/dbadmin.hxx

@@ -48,8 +48,7 @@ class ODbDataSourceAdministrationHelper;
 class ODbAdminDialog final : public SfxTabDialog , public IItemSetHelper, public IDatabaseSettingsDialog
 {
 private:
-    typedef std::stack< sal_Int32 > PageStack;
-    PageStack               m_aCurrentDetailPages;  // ids of all currently enabled (type-dependent) detail pages
+    std::stack< sal_Int32 > m_aCurrentDetailPages;  // ids of all currently enabled (type-dependent) detail pages
 
     std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
 

dbaccess/source/ui/inc/sbagrid.hxx

@@ -131,13 +131,7 @@ namespace dbaui
 
     private:
         virtual VclPtr<FmGridControl>  imp_CreateControl(vcl::Window* pParent, WinBits nStyle) override;
-#ifdef _MSC_VER
-        typedef css::frame::XStatusListener xstlist_type;
-        typedef css::uno::Reference< xstlist_type > xlistener_type;
-        void NotifyStatusChanged(const css::util::URL& aUrl, const xlistener_type & xControl = xlistener_type() );
-#else
         void NotifyStatusChanged(const css::util::URL& aUrl, const css::uno::Reference< css::frame::XStatusListener > & xControl);
-#endif // # _MSC_VER
 
         // for any execution of XDispatch::dispatch
         struct DispatchArgs

desktop/source/deployment/dp_persmap.cxx

@@ -276,8 +276,7 @@ bool PersistentMap::get( OString * value, OString const & key ) const
 
 void PersistentMap::add( OString const & key, OString const & value )
 {
-    typedef std::pair<t_string2string_map::iterator,bool> InsertRC;
-    InsertRC r = m_entries.emplace(key,value);
+    auto r = m_entries.emplace(key,value);
     m_bIsDirty = r.second;
 }
 

desktop/source/deployment/manager/dp_manager.cxx

@@ -1193,10 +1193,9 @@ bool PackageManagerImpl::synchronizeRemovedExtensions(
     bool bModified = false;
     ActivePackages::Entries id2temp( m_activePackagesDB->getEntries() );
 
-    typedef ActivePackages::Entries::const_iterator ITActive;
     bool bShared = (m_context == "shared");
 
-    for (ITActive i = id2temp.begin(); i != id2temp.end(); ++i)
+    for (auto i = id2temp.begin(); i != id2temp.end(); ++i)
     {
         try
         {

desktop/source/pkgchk/unopkg/unopkg_misc.cxx

@@ -315,9 +315,8 @@ void printf_packages(
     }
     else
     {
-        typedef std::vector< Reference<deployment::XPackage> >::const_iterator I_EXT;
         int index = 0;
-        for (I_EXT i = allExtensions.begin(); i != allExtensions.end(); ++i, ++index)
+        for (auto i = allExtensions.begin(); i != allExtensions.end(); ++i, ++index)
         {
             if (vecUnaccepted[index])
                 printf_unaccepted_licenses(*i);

filter/source/svg/svgfilter.cxx

@@ -166,7 +166,7 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
                         uno::Any aSelection = xSelectionSupplier->getSelection();
                         if( aSelection.hasValue() )
                         {
-                            ObjectSequence aSelectedPageSequence;
+                            Sequence< Reference< XInterface > > aSelectedPageSequence;
                             aSelection >>= aSelectedPageSequence;
                             mSelectedPages.resize( aSelectedPageSequence.getLength() );
                             for( size_t j=0; j<mSelectedPages.size(); ++j )

filter/source/svg/svgfilter.hxx

@@ -183,7 +183,6 @@ class SVGFilter : public cppu::WeakImplHelper < XFilter,
 public:
     typedef std::unordered_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface >    ObjectMap;
     typedef std::unordered_set< Reference< XInterface >, HashReferenceXInterface >                          ObjectSet;
-    typedef Sequence< Reference< XInterface > >                                                                 ObjectSequence;
 
     typedef std::unordered_set< sal_Unicode, HashUChar >                                                    UCharSet;
     typedef std::unordered_map< OUString, UCharSet >                                          UCharSetMap;

fpicker/source/office/OfficeControlAccess.cxx

@@ -58,7 +58,6 @@ namespace svt
 
 
         typedef const ControlDescription* ControlDescIterator;
-        typedef ::std::pair< ControlDescIterator, ControlDescIterator > ControlDescRange;
 
 
         #define PROPERTY_FLAGS_COMMON       ( PropFlags::Enabled | PropFlags::Visible | PropFlags::HelpUrl )
@@ -234,7 +233,7 @@ namespace svt
         tmpDesc.pControlName = aControlName.getStr();
 
         // translate the name into an id
-        ControlDescRange aFoundRange = ::std::equal_range( s_pControls, s_pControlsEnd, tmpDesc, ControlDescriptionLookup() );
+        auto aFoundRange = ::std::equal_range( s_pControls, s_pControlsEnd, tmpDesc, ControlDescriptionLookup() );
         if ( aFoundRange.first != aFoundRange.second )
         {
             // get the VCL control determined by this id

include/canvas/base/canvasbase.hxx

@@ -99,7 +99,6 @@ namespace canvas
     {
     public:
         typedef Base            BaseType;
-        typedef CanvasHelper    HelperType;
         typedef Mutex           MutexType;
         typedef UnambiguousBase UnambiguousBaseType;
 
@@ -429,7 +428,7 @@ namespace canvas
     protected:
         ~CanvasBase() {} // we're a ref-counted UNO class. _We_ destroy ourselves.
 
-        HelperType          maCanvasHelper;
+        CanvasHelper        maCanvasHelper;
         mutable bool        mbSurfaceDirty;
 
     private:

include/canvas/base/canvascustomspritebase.hxx

@@ -76,7 +76,6 @@ namespace canvas
     {
     public:
         typedef IntegerBitmapBase< BitmapCanvasBase2<Base, CanvasHelper, Mutex, UnambiguousBase> > BaseType;
-        typedef SpriteHelper                                                    SpriteHelperType;
 
         CanvasCustomSpriteBase() :
             maSpriteHelper()
@@ -255,7 +254,7 @@ namespace canvas
         }
 
     protected:
-        SpriteHelperType maSpriteHelper;
+        SpriteHelper maSpriteHelper;
     };
 }
 

include/canvas/base/graphicdevicebase.hxx

@@ -106,7 +106,6 @@ namespace canvas
     {
     public:
         typedef Base              BaseType;
-        typedef DeviceHelper      DeviceHelperType;
         typedef Mutex             MutexType;
         typedef UnambiguousBase   UnambiguousBaseType;
         typedef GraphicDeviceBase ThisType;
@@ -334,7 +333,7 @@ namespace canvas
             rAny >>= mbDumpScreenContent;
         }
 
-        DeviceHelperType  maDeviceHelper;
+        DeviceHelper      maDeviceHelper;
         PropertySetHelper maPropHelper;
         bool              mbDumpScreenContent;
 

include/comphelper/propertycontainerhelper.hxx

@@ -73,7 +73,6 @@ struct COMPHELPER_DLLPUBLIC PropertyDescription
 class COMPHELPER_DLLPUBLIC OPropertyContainerHelper
 {
     typedef ::std::vector< css::uno::Any >              PropertyContainer;
-    typedef PropertyContainer::iterator                 PropertyContainerIterator;
     typedef PropertyContainer::const_iterator           ConstPropertyContainerIterator;
     PropertyContainer   m_aHoldProperties;
         // the properties which are hold by this class' instance, not the derived one's

include/connectivity/StdTypeDefs.hxx

@@ -28,7 +28,6 @@
 namespace connectivity
 {
     typedef ::std::vector< OUString>         TStringVector;
-    typedef ::std::vector< sal_Int32>        TIntVector;
     typedef ::std::map<sal_Int32,sal_Int32>  TInt2IntMap;
     typedef ::std::map< OUString,sal_Int32>  TString2IntMap;
     typedef ::std::map< sal_Int32,OUString>  TInt2StringMap;

include/dbaccess/genericcontroller.hxx

@@ -199,9 +199,6 @@ namespace dbaui
     };
 
 
-    typedef ::std::deque< FeatureListener > FeatureListeners;
-
-
     class FindFeatureListener
     {
         const css::uno::Reference< css::frame::XStatusListener >& m_xListener;
@@ -266,7 +263,8 @@ namespace dbaui
         typedef std::map<sal_uInt16, FeatureState> StateCache;
         typedef std::vector<DispatchTarget> Dispatch;
 
-        FeatureListeners        m_aFeaturesToInvalidate;
+        ::std::deque< FeatureListener >
+                                m_aFeaturesToInvalidate;
 
         ::osl::Mutex            m_aFeatureMutex;        // locked when features are append to or remove from deque
         StateCache              m_aStateCache;          // save the current status of feature state

include/oox/dump/dumperbase.hxx

@@ -880,8 +880,7 @@ protected:
     const OUString*     implGetOption( const OUString& rKey ) const;
 
 private:
-    typedef std::shared_ptr< SharedConfigData > SharedConfigDataRef;
-    SharedConfigDataRef mxCfgData;
+    std::shared_ptr< SharedConfigData > mxCfgData;
 };
 
 typedef std::shared_ptr< Config > ConfigRef;
@@ -984,13 +983,12 @@ private:
     void                writeItemName( const String& rItemName );
 
 private:
-    typedef ::std::vector< sal_Int32 > StringLenVec;
-
     css::uno::Reference< css::io::XTextOutputStream2 > mxStrm;
     OUString            maIndent;
     OUStringBuffer      maLine;
     OUString            maLastItem;
-    StringLenVec        maColPos;
+    ::std::vector< sal_Int32 >
+                        maColPos;
     size_t              mnCol;
     size_t              mnItemLevel;
     size_t              mnMultiLevel;
@@ -1681,8 +1679,7 @@ protected:
     virtual bool        implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) = 0;
 
 private:
-    typedef std::shared_ptr< StreamDataSequence > StreamDataSeqRef;
-    StreamDataSeqRef    mxRecData;
+    std::shared_ptr< StreamDataSequence > mxRecData;
 };
 
 

include/oox/helper/graphichelper.hxx

@@ -157,7 +157,6 @@ public:
 
 
 private:
-    typedef ::std::map< sal_Int32, sal_Int32 > SystemPalette;
     typedef ::std::deque< css::uno::Reference< css::graphic::XGraphicObject > > GraphicObjectDeque;
     typedef ::std::map< OUString, css::uno::Reference< css::graphic::XGraphic > > EmbeddedGraphicMap;
 
@@ -165,7 +164,7 @@ private:
     css::uno::Reference< css::graphic::XGraphicProvider2 > mxGraphicProvider;
     css::uno::Reference< css::awt::XUnitConversion > mxUnitConversion;
     css::awt::DeviceInfo maDeviceInfo; ///< Current output device info.
-    SystemPalette       maSystemPalette;            ///< Maps system colors (XML tokens) to RGB color values.
+    ::std::map< sal_Int32, sal_Int32 >  maSystemPalette;  ///< Maps system colors (XML tokens) to RGB color values.