inline use-once typedefs

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

11 files changed, 11 insertions, 27 deletions

diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index a678dd352de9..e02b618678f4 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/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
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 6f46a3f5b11b..76f30d4045c8 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/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();
diff --git a/connectivity/source/drivers/firebird/Column.hxx b/connectivity/source/drivers/firebird/Column.hxx
index 33d49516b6d7..c5cb8957d8b6 100644
--- a/connectivity/source/drivers/firebird/Column.hxx
+++ b/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;
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
index 540db16e9d37..c1c9feb5cc06 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
+++ b/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;
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
index 05f911cb0c49..ec7c2c651dd5 100644
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
+++ b/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;
diff --git a/connectivity/source/inc/dbase/DConnection.hxx b/connectivity/source/inc/dbase/DConnection.hxx
index f09eec3ca614..f81f7b494773 100644
--- a/connectivity/source/inc/dbase/DConnection.hxx
+++ b/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;
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index 8a0f0bff8b1f..32f252b1ccec 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/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
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index 481faa1ccbf5..1dc2cad48c6f 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/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
diff --git a/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx
index 3f8e8285de27..c639588f2c6f 100644
--- a/connectivity/source/inc/hsqldb/HColumns.hxx
+++ b/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;
diff --git a/connectivity/source/inc/mysql/YColumns.hxx b/connectivity/source/inc/mysql/YColumns.hxx
index db7149cb5b92..4157046d4663 100644
--- a/connectivity/source/inc/mysql/YColumns.hxx
+++ b/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;
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 52aca63b012f..06909ab54dba 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/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;