diff options
111 files changed, 129 insertions, 267 deletions
diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx b/basegfx/source/polygon/b2dpolypolygoncutter.cxx index 5f6e088fff1d..b24f7a37e0a4 100644 --- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx +++ b/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; diff --git a/binaryurp/source/cache.hxx b/binaryurp/source/cache.hxx index 578b6f4fd0b6..d1c1df7e32bf 100644 --- a/binaryurp/source/cache.hxx +++ b/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 diff --git a/canvas/source/tools/canvascustomspritehelper.cxx b/canvas/source/tools/canvascustomspritehelper.cxx index 9e74809da8d7..1d39107c9d00 100644 --- a/canvas/source/tools/canvascustomspritehelper.cxx +++ b/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) diff --git a/canvas/source/tools/pagemanager.hxx b/canvas/source/tools/pagemanager.hxx index 3fae17b04008..634114719487 100644 --- a/canvas/source/tools/pagemanager.hxx +++ b/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 ); }; diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx index 214963c38376..3b5767e6de18 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx +++ b/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 diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx index 85d8b2052d44..70b8ee0c2a9f 100644 --- a/comphelper/source/misc/backupfilehelper.cxx +++ b/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: diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index 44a1c058d05c..1291f073c690 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/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 diff --git a/configmgr/source/xcuparser.hxx b/configmgr/source/xcuparser.hxx index ec40372fed1d..bd74d434c612 100644 --- a/configmgr/source/xcuparser.hxx +++ b/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_; }; 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; diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index bb3769bd540b..5e4e6dffc7fb 100644 --- a/cui/source/customize/cfg.cxx +++ b/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; diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx index 576e2d23aeda..c2f74ed949db 100644 --- a/cui/source/dialogs/screenshotannotationdlg.cxx +++ b/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; diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 4ac176e343e4..e4d40077d97b 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/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() diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index a87852f5aa6b..814792990c12 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/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(); diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx index c7c1f242f8d7..fc0f499d0bb6 100644 --- a/dbaccess/source/core/api/query.hxx +++ b/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; diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx index af6f98cf5b12..fdf0edf392a1 100644 --- a/dbaccess/source/core/inc/ContainerMediator.hxx +++ b/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 diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index d7ec3ac89a57..7f201e3f229b 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/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 > diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index 394d95761ebd..479cee46d684 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/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 diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx index 1148fdb11688..36055e3e8a5e 100644 --- a/dbaccess/source/core/inc/tablecontainer.hxx +++ b/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; diff --git a/dbaccess/source/core/inc/viewcontainer.hxx b/dbaccess/source/core/inc/viewcontainer.hxx index cc5c69860233..4fc2134f7e87 100644 --- a/dbaccess/source/core/inc/viewcontainer.hxx +++ b/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> diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index 896dbecc7bb0..04f5658a0944 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/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; diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index 1c3127c3e17c..1173824ecf8d 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/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; diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 13e5dc7e8825..b5e8be4e32b0 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/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; diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index efaf68834f66..1eb7869eafe9 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/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 diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx index 5ca81c9a0b7b..ac45ea30142d 100644 --- a/desktop/source/deployment/dp_persmap.cxx +++ b/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; } diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 6bb8e3e659b7..c012750573d3 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/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 { diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 2955757f4a19..bc440df922d5 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/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); diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index c689eebee5e0..0f7245c133d9 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/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 ) diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 246edf646b3c..c85249d4e4c7 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/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; diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index be9a91f212af..32a0927c687c 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/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 diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx index 4d2406a18805..a36af3b71ff3 100644 --- a/include/canvas/base/canvasbase.hxx +++ b/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: diff --git a/include/canvas/base/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx index 1ad63f6f8ca5..9990b37be6e3 100644 --- a/include/canvas/base/canvascustomspritebase.hxx +++ b/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; }; } diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx index e5efe9bb4f0b..ca36c896e04e 100644 --- a/include/canvas/base/graphicdevicebase.hxx +++ b/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; diff --git a/include/comphelper/propertycontainerhelper.hxx b/include/comphelper/propertycontainerhelper.hxx index 513aa88f4993..cd2f65b72f00 100644 --- a/include/comphelper/propertycontainerhelper.hxx +++ b/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 diff --git a/include/connectivity/StdTypeDefs.hxx b/include/connectivity/StdTypeDefs.hxx index 78720651e723..dc26efb0924e 100644 --- a/include/connectivity/StdTypeDefs.hxx +++ b/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; diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index 20bbc7688210..de8a586c7b6e 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/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 diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 97a36f3699ba..9a1f3586b3e9 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/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; }; diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx index 545bdd0fd938..9eb77ee60318 100644 --- a/include/oox/helper/graphichelper.hxx +++ b/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. StorageRef mxStorage; ///< Storage containing embedded graphics. mutable GraphicObjectDeque maGraphicObjects; ///< Caches all created graphic objects to keep them alive. mutable EmbeddedGraphicMap maEmbeddedGraphics; ///< Maps all embedded graphics by their storage path. diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx index 7f88c5ff2123..537517fbff73 100644 --- a/include/oox/helper/storagebase.hxx +++ b/include/oox/helper/storagebase.hxx @@ -172,9 +172,8 @@ private: StorageRef getSubStorage( const OUString& rElementName, bool bCreateMissing ); private: - typedef RefMap< OUString, StorageBase > SubStorageMap; - - SubStorageMap maSubStorages; ///< Map of direct sub storages. + RefMap< OUString, StorageBase > + maSubStorages; ///< Map of direct sub storages. css::uno::Reference< css::io::XInputStream > mxInStream; ///< Cached base input stream (to keep it alive). css::uno::Reference< css::io::XStream > diff --git a/include/sfx2/docstoragemodifylistener.hxx b/include/sfx2/docstoragemodifylistener.hxx index 56935e187aeb..5d8c6f9fb5a2 100644 --- a/include/sfx2/docstoragemodifylistener.hxx +++ b/include/sfx2/docstoragemodifylistener.hxx @@ -50,9 +50,7 @@ namespace sfx2 //= DocumentStorageModifyListener - typedef cppu::WeakImplHelper<css::util::XModifyListener> DocumentStorageModifyListener_Base; - - class SFX2_DLLPUBLIC DocumentStorageModifyListener : public DocumentStorageModifyListener_Base + class SFX2_DLLPUBLIC DocumentStorageModifyListener : public cppu::WeakImplHelper<css::util::XModifyListener> { IModifiableDocument* m_pDocument; comphelper::SolarMutex& m_rMutex; diff --git a/include/svl/poolcach.hxx b/include/svl/poolcach.hxx index cfb148d30bd3..fe06ce416415 100644 --- a/include/svl/poolcach.hxx +++ b/include/svl/poolcach.hxx @@ -34,10 +34,10 @@ class SVL_DLLPUBLIC SfxItemPoolCache const SfxSetItem *pOrigItem; SfxSetItem *pPoolItem; }; - typedef std::vector<SfxItemModifyImpl> SfxItemModifyArr_Impl; SfxItemPool *pPool; - SfxItemModifyArr_Impl m_aCache; + std::vector<SfxItemModifyImpl> + m_aCache; const SfxItemSet *pSetToPut; const SfxPoolItem *pItemToPut; diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 65bd8096429d..4bfad8d4633a 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -267,8 +267,8 @@ private: } bool operator!=(const CursorMoveAttempt& r) const { return !(*this == r); } }; - typedef std::stack<CursorMoveAttempt> GotoStack; - GotoStack m_aGotoStack; + std::stack<CursorMoveAttempt> + m_aGotoStack; ::std::unique_ptr< ::svt::BrowseBoxImpl > m_pImpl; // impl structure of the BrowseBox object diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index c88ae2711d8b..ea73bbc71ed6 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -148,8 +148,7 @@ inline std::basic_ostream<charT, traits> & operator <<( class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem { - typedef std::vector<SvxColumnDescription> SvxColumnDescriptionVector; - SvxColumnDescriptionVector aColumns; // Column array + std::vector<SvxColumnDescription> aColumns; // Column array long nLeft; // Left edge for the table long nRight; // Right edge for the table; for columns always diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx index a8c246dcb5ef..b76872f54a63 100644 --- a/include/svx/sidebar/ValueSetWithTextControl.hxx +++ b/include/svx/sidebar/ValueSetWithTextControl.hxx @@ -53,8 +53,7 @@ private: OUString maItemText2; }; - typedef ::std::vector< ValueSetWithTextItem > tItemList; - tItemList maItems; + ::std::vector< ValueSetWithTextItem > maItems; }; } } // end of namespace svx::sidebar diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx index 9aff143b3b04..dccf62826591 100644 --- a/include/svx/xmlgrhlp.hxx +++ b/include/svx/xmlgrhlp.hxx @@ -48,7 +48,6 @@ class SVX_DLLPUBLIC SvXMLGraphicHelper final : public cppu::WeakComponentImplHel typedef ::std::pair< OUString, OUString > URLPair; typedef ::std::vector< URLPair > URLPairVector; typedef ::std::vector< GraphicObject > GraphicObjectVector; - typedef ::std::set< OUString > URLSet; typedef ::std::vector< css::uno::Reference< css::io::XOutputStream > > GraphicOutputStreamVector; ::osl::Mutex maMutex; @@ -57,7 +56,7 @@ class SVX_DLLPUBLIC SvXMLGraphicHelper final : public cppu::WeakComponentImplHel URLPairVector maGrfURLs; GraphicObjectVector maGrfObjs; GraphicOutputStreamVector maGrfStms; - URLSet maURLSet; + ::std::set< OUString > maURLSet; SvXMLGraphicHelperMode meCreateMode; OUString maOutputMimeType; bool mbDirect; diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx index 38a15800246e..199aef66ebd9 100644 --- a/include/svx/xtable.hxx +++ b/include/svx/xtable.hxx @@ -161,19 +161,17 @@ class XGradientList ; typedef rtl::Reference< class XGradientList > XGradientLis class SVX_DLLPUBLIC XPropertyList : public cppu::OWeakObject { - private: +private: SAL_DLLPRIVATE void* operator new(size_t); - protected: +protected: SAL_DLLPRIVATE void operator delete(void *); protected: - typedef std::vector< std::unique_ptr<XPropertyEntry> > XPropertyEntryList_impl; - XPropertyListType meType; OUString maName; // not persistent OUString maPath; OUString maReferer; - XPropertyEntryList_impl maList; + std::vector< std::unique_ptr<XPropertyEntry> > maList; bool mbListDirty; bool mbEmbedInDocument; diff --git a/include/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx index b6b573d1c66a..0068de5673d1 100644 --- a/include/unotools/streamhelper.hxx +++ b/include/unotools/streamhelper.hxx @@ -36,9 +36,7 @@ namespace utl * @author Dirk Grobler * @since 00/28/03 */ - typedef cppu::WeakImplHelper<css::io::XInputStream, css::io::XSeekable> InputStreamHelper_Base; - // needed for some compilers -class UNOTOOLS_DLLPUBLIC OInputStreamHelper : public InputStreamHelper_Base +class UNOTOOLS_DLLPUBLIC OInputStreamHelper : public cppu::WeakImplHelper<css::io::XInputStream, css::io::XSeekable> { ::osl::Mutex m_aMutex; SvLockBytesRef m_xLockBytes; diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index a6e3bc6a8959..4410760c6f26 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -37,10 +37,8 @@ using namespace ::com::sun::star::io; namespace io_acceptor { - typedef WeakImplHelper< XConnection > MyPipeConnection; - class PipeConnection : - public MyPipeConnection + public WeakImplHelper< XConnection > { public: explicit PipeConnection( const OUString &sConnectionDescription); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 5a74b6c169ca..224874b5c153 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -645,8 +645,7 @@ bool getJavaInfoFromRegistry(const wchar_t* szRegKey, { bool bAppend= true; //iterate over the vector with java home strings - typedef vector<OUString>::iterator ItHome; - for(ItHome itHome= vecJavaHome.begin(); + for(auto itHome= vecJavaHome.begin(); itHome != vecJavaHome.end(); ++itHome) { if(usHomeUrl.equals(*itHome)) diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx index 8f485e9707eb..b3a8fbe36455 100644 --- a/l10ntools/inc/xmlparse.hxx +++ b/l10ntools/inc/xmlparse.hxx @@ -140,9 +140,6 @@ typedef std::unordered_map<OString, XMLElement*> LangHashMap; /// Mapping XML Element string identifier <-> Language Map typedef std::unordered_map<OString, LangHashMap*> XMLHashMap; -/// Mapping XML tag names <-> have localizable strings -typedef std::unordered_map<OString, sal_Bool> TagMap; - /** Holds information of a XML file, is root node of tree */ class XMLFile final : public XMLParentNode @@ -180,7 +177,9 @@ private: // DATA OString m_sFileName; - TagMap m_aNodes_localize; + /// Mapping XML tag names <-> have localizable strings + std::unordered_map<OString, sal_Bool> m_aNodes_localize; + std::unique_ptr<XMLHashMap> m_pXMLStrings; std::vector <OString> m_vOrder; diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index 822996d85b55..9a2cf8ad4b94 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -247,9 +247,7 @@ void handleFilesOfDir( ///Handle files in lexical order std::sort(aFiles.begin(), aFiles.end()); - typedef std::vector<OUString>::const_iterator citer_t; - - for( citer_t aIt = aFiles.begin(); aIt != aFiles.end(); ++aIt ) + for( auto aIt = aFiles.begin(); aIt != aFiles.end(); ++aIt ) handleFile(rProject, *aIt, rPotDir); } diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index c15c72e4f5e5..e5dc4b1d4829 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -666,9 +666,8 @@ void LngSvcMgr::UpdateAll() using lang::Locale; using uno::Sequence; - typedef OUString OUstring_t; typedef Sequence< OUString > Sequence_OUString_t; - typedef std::map< OUstring_t, Sequence_OUString_t > list_entry_map_t; + typedef std::map< OUString, Sequence_OUString_t > list_entry_map_t; SvtLinguConfig aCfg; diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx index 2c65f3c75545..77e056ca80ef 100644 --- a/oox/source/ole/vbacontrol.cxx +++ b/oox/source/ole/vbacontrol.cxx @@ -95,8 +95,8 @@ public: OUString generateDummyName(); private: - typedef ::std::set< OUString > OUStringSet; - OUStringSet maCtrlNames; + ::std::set< OUString > + maCtrlNames; const OUString maDummyBaseName; sal_Int32 mnIndex; }; diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index 5a8e53d912d2..5c100d51398c 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -64,11 +64,8 @@ class OPropertyMediator; class REPORTDESIGN_DLLPUBLIC OObjectBase { -public: - typedef rtl::Reference<OPropertyMediator> TMediator; - protected: - mutable TMediator m_xMediator; + mutable rtl::Reference<OPropertyMediator> m_xMediator; mutable css::uno::Reference< css::beans::XPropertyChangeListener> m_xPropertyChangeListener; mutable css::uno::Reference< css::report::XReportComponent> m_xReportComponent; css::uno::Reference< css::uno::XInterface > m_xKeepShapeAlive; diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 63ee8bf3e020..835392c3a044 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -4006,8 +4006,7 @@ void OReportController::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, Any& // cppu::OPropertySetHelper ::cppu::IPropertyArrayHelper& SAL_CALL OReportController::getInfoHelper() { - typedef ::comphelper::OPropertyArrayUsageHelper<OReportController_BASE> OReportController_PROP; - return *OReportController_PROP::getArrayHelper(); + return *::comphelper::OPropertyArrayUsageHelper<OReportController_BASE>::getArrayHelper(); } void SAL_CALL OReportController::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle,const Any& _aValue) diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index dcaca741ae1f..d537cd9c8d05 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -45,7 +45,6 @@ namespace /* private */ typedef std::vector<rtl::OUString> string_container_t; typedef string_container_t::iterator string_container_iterator_t; typedef string_container_t::const_iterator string_container_const_iterator_t; - typedef std::pair<string_container_iterator_t, string_container_iterator_t> iterator_pair_t; typedef std::vector<sal_Unicode> environment_container_t; /* Function object that compares two strings that are @@ -144,7 +143,7 @@ namespace /* private */ if (env_var.getLength() == 0) return false; - iterator_pair_t iter_pair = std::equal_range( + auto iter_pair = std::equal_range( merged_env->begin(), merged_env->end(), env_var, diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index 4c294b66aa5e..2e0517d993d6 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -119,15 +119,14 @@ public: class ScDPGroupTableData : public ScDPTableData { - typedef std::unordered_set< OUString > StringHashSet; - std::shared_ptr<ScDPTableData> pSourceData; long nSourceCount; ScDPGroupDimensionVec aGroups; std::unique_ptr<ScDPNumGroupDimension[]> pNumGroups; // array[nSourceCount] ScDocument* pDoc; - StringHashSet aGroupNames; + std::unordered_set< OUString > + aGroupNames; void FillGroupValues(std::vector<SCROW>& rItems, const std::vector<long>& rDims); virtual long GetSourceDim( long nDim ) override; diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index aec55f8c2ef8..ca4672f4ca61 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -934,8 +934,7 @@ void ScDPCache::PostInit() OSL_ENSURE(!maFields.empty(), "Cache not initialized!"); maEmptyRows.build_tree(); - typedef mdds::flat_segment_tree<SCROW, bool>::const_reverse_iterator itr_type; - itr_type it = maEmptyRows.rbegin(); + auto it = maEmptyRows.rbegin(); OSL_ENSURE(it != maEmptyRows.rend(), "corrupt flat_segment_tree instance!"); mnDataSize = maFields[0]->maData.size(); ++it; // Skip the first position. diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index a24a2b31cafc..d80da5e73578 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -151,8 +151,7 @@ private: SdStyleSheet& operator=( const SdStyleSheet& ) = delete; }; -typedef rtl::Reference< SdStyleSheet > SdStyleSheetRef; -typedef std::vector< SdStyleSheetRef > SdStyleSheetVector; +typedef std::vector< rtl::Reference< SdStyleSheet > > SdStyleSheetVector; #endif // INCLUDED_SD_INC_STLSHEET_HXX diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx index b81bb696bef0..0175f6e07200 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx @@ -36,8 +36,6 @@ class FontProvider : public SdGlobalResource { public: - typedef std::shared_ptr<vcl::Font> SharedFontPointer; - /** Return the single instance of this class. Throws a RuntimeException when no instance can be created. */ @@ -57,7 +55,7 @@ private: replaced by another one only when GetFont() is called with a device with a different map mode or by a call to Invalidate(). */ - SharedFontPointer maFont; + std::shared_ptr<vcl::Font> maFont; FontProvider(); virtual ~FontProvider() override; diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 426f06615983..7bf0ba2d15e2 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -2027,8 +2027,7 @@ private: } // create pairs of pages to print on each page - typedef std::vector< std::pair< sal_uInt16, sal_uInt16 > > PairVector; - PairVector aPairVector; + std::vector< std::pair< sal_uInt16, sal_uInt16 > > aPairVector; if ( ! aPageVector.empty()) { sal_uInt32 nFirstIndex = 0, nLastIndex = aPageVector.size() - 1; diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 42605dc29efe..11ee26436345 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -256,8 +256,7 @@ public: namespace { - typedef std::vector<std::unique_ptr<SfxFilterMatcher_Impl> > SfxFilterMatcherArr_Impl; - static SfxFilterMatcherArr_Impl aImplArr; + static std::vector<std::unique_ptr<SfxFilterMatcher_Impl> > aImplArr; static int nSfxFilterMatcherCount; SfxFilterMatcher_Impl & getSfxFilterMatcher_Impl(const OUString &rName) diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx index 78c1ac9c29e2..3ca0ddddeb42 100644 --- a/sfx2/source/doc/oleprops.hxx +++ b/sfx2/source/doc/oleprops.hxx @@ -121,8 +121,7 @@ public: void SetCodePage( sal_uInt16 nCodePage ); private: - typedef std::shared_ptr< rtl_TextEncoding > TextEncRef; - TextEncRef mxTextEnc; + std::shared_ptr< rtl_TextEncoding > mxTextEnc; }; diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 1cb5ff308c37..2b25ad1f993c 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1072,8 +1072,7 @@ void SAL_CALL SfxBaseModel::disconnectController( const Reference< frame::XContr namespace { - typedef ::cppu::WeakImplHelper< XUndoAction > ControllerLockUndoAction_Base; - class ControllerLockUndoAction : public ControllerLockUndoAction_Base + class ControllerLockUndoAction : public ::cppu::WeakImplHelper< XUndoAction > { public: ControllerLockUndoAction( const Reference< XModel >& i_model, const bool i_undoIsUnlock ) diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx index 108de6fbaf1c..51b564e6e683 100644 --- a/sfx2/source/inc/docundomanager.hxx +++ b/sfx2/source/inc/docundomanager.hxx @@ -96,9 +96,8 @@ namespace sfx2 { //= DocumentUndoManager - typedef ::cppu::WeakImplHelper <css::document::XUndoManager> DocumentUndoManager_Base; struct DocumentUndoManager_Impl; - class DocumentUndoManager :public DocumentUndoManager_Base + class DocumentUndoManager :public ::cppu::WeakImplHelper<css::document::XUndoManager> ,public SfxModelSubComponent { friend struct DocumentUndoManager_Impl; diff --git a/slideshow/source/engine/slide/layer.hxx b/slideshow/source/engine/slide/layer.hxx index 25dddde4f477..68792ee44884 100644 --- a/slideshow/source/engine/slide/layer.hxx +++ b/slideshow/source/engine/slide/layer.hxx @@ -257,7 +257,6 @@ namespace slideshow typedef ::std::shared_ptr< Layer > LayerSharedPtr; typedef ::std::weak_ptr< Layer > LayerWeakPtr; - typedef ::std::vector< LayerSharedPtr > LayerVector; } } diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx index 44e391fe5c7d..f9ba7da23feb 100644 --- a/slideshow/source/engine/slide/layermanager.hxx +++ b/slideshow/source/engine/slide/layermanager.hxx @@ -240,7 +240,6 @@ namespace slideshow */ private: typedef ::std::map< ShapeSharedPtr, LayerWeakPtr, ShapeComparator > LayerShapeMap; - typedef ::std::set< ShapeSharedPtr > ShapeUpdateSet; /// Adds shape area to containing layer's damage area @@ -306,7 +305,8 @@ namespace slideshow const UnoViewContainer& mrViews; /// All layers of this object. Vector owns the layers - LayerVector maLayers; + ::std::vector< LayerSharedPtr > + maLayers; /** Contains all shapes with their XShape reference as the key */ @@ -328,7 +328,8 @@ namespace slideshow has bNeedsUpdate set to true. We maintain this redundant information for faster update processing. */ - ShapeUpdateSet maUpdateShapes; + ::std::set< ShapeSharedPtr > + maUpdateShapes; /// Number of shape sprites currently active on this LayerManager sal_Int32 mnActiveSprites; diff --git a/slideshow/source/inc/basenode.hxx b/slideshow/source/inc/basenode.hxx index 9798aa11a171..96291176ff55 100644 --- a/slideshow/source/inc/basenode.hxx +++ b/slideshow/source/inc/basenode.hxx @@ -186,9 +186,7 @@ private: private: SlideShowContext maContext; - typedef ::std::vector< AnimationNodeSharedPtr > ListenerVector; - - ListenerVector maDeactivatingListeners; + ::std::vector< AnimationNodeSharedPtr > maDeactivatingListeners; css::uno::Reference< css::animations::XAnimationNode > mxAnimationNode; ::std::shared_ptr< BaseContainerNode > mpParent; ::std::shared_ptr< BaseNode > mpSelf; diff --git a/slideshow/source/inc/shapeimporter.hxx b/slideshow/source/inc/shapeimporter.hxx index e1fba6fa7683..5c0afa917b5c 100644 --- a/slideshow/source/inc/shapeimporter.hxx +++ b/slideshow/source/inc/shapeimporter.hxx @@ -122,13 +122,12 @@ private: : mpGroupShape(), mxShapes(xShapes), mnCount(xShapes->getCount()), mnPos(0) {} }; - typedef ::std::stack<XShapesEntry> XShapesStack; css::uno::Reference<css::drawing::XDrawPage> mxPage; css::uno::Reference<css::drawing::XDrawPagesSupplier> mxPagesSupplier; const SlideShowContext& mrContext; PolyPolygonVector maPolygons; - XShapesStack maShapesStack; + ::std::stack<XShapesEntry> maShapesStack; double mnAscendingPrio; bool mbConvertingMasterPage; }; diff --git a/svgio/inc/svgdocument.hxx b/svgio/inc/svgdocument.hxx index 97acd39d8e31..de7fbc304c88 100644 --- a/svgio/inc/svgdocument.hxx +++ b/svgio/inc/svgdocument.hxx @@ -38,12 +38,10 @@ namespace svgio /// hash mapper to find nodes by their id typedef std::unordered_map< OUString, const SvgNode* > IdTokenMapper; - typedef std::pair< const OUString, const SvgNode* > IdTokenValueType; IdTokenMapper maIdTokenMapperList; /// hash mapper to find css styles by their id typedef std::unordered_map< OUString, const SvgStyleAttributes* > IdStyleTokenMapper; - typedef std::pair< const OUString, const SvgStyleAttributes* > IdStyleTokenValueType; IdStyleTokenMapper maIdStyleTokenMapperList; public: diff --git a/svgio/inc/svgnode.hxx b/svgio/inc/svgnode.hxx index a5da1faee343..fd4e45c5ccc4 100644 --- a/svgio/inc/svgnode.hxx +++ b/svgio/inc/svgnode.hxx @@ -45,7 +45,6 @@ namespace svgio namespace svgreader { typedef ::std::vector< SvgNode* > SvgNodeVector; - typedef ::std::vector< const SvgStyleAttributes* > SvgStyleAttributeVector; enum XmlSpace { @@ -109,7 +108,7 @@ namespace svgio // CSS style vector chain, used in decompose phase and built up once per node. // It contains the StyleHierarchy for the local node. INdependent from the // node hierarchy itself which also needs to be used in style entry solving - SvgStyleAttributeVector maCssStyleVector; + ::std::vector< const SvgStyleAttributes* > maCssStyleVector; /// possible local CssStyle, e.g. style="fill:red; stroke:red;" SvgStyleAttributes* mpLocalCssStyle; diff --git a/svgio/source/svgreader/svgdocument.cxx b/svgio/source/svgreader/svgdocument.cxx index 227ad4ae40d6..44fb0d507eec 100644 --- a/svgio/source/svgreader/svgdocument.cxx +++ b/svgio/source/svgreader/svgdocument.cxx @@ -51,7 +51,7 @@ namespace svgio { if(!rStr.isEmpty()) { - maIdTokenMapperList.insert(IdTokenValueType(rStr, &rNode)); + maIdTokenMapperList.emplace(rStr, &rNode); } } @@ -81,7 +81,7 @@ namespace svgio { if(!rStr.isEmpty()) { - maIdStyleTokenMapperList.insert(IdStyleTokenValueType(rStr, &rSvgStyleAttributes)); + maIdStyleTokenMapperList.emplace(rStr, &rSvgStyleAttributes); } } diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx index 335117f4ca84..fd0fe2905d8b 100644 --- a/svx/inc/xpolyimp.hxx +++ b/svx/inc/xpolyimp.hxx @@ -51,12 +51,10 @@ public: void Remove( sal_uInt16 nPos, sal_uInt16 nCount ); }; -typedef ::std::vector< XPolygon > XPolygonVector; - class ImpXPolyPolygon { public: - XPolygonVector aXPolyList; + ::std::vector< XPolygon > aXPolyList; ImpXPolyPolygon() {} ImpXPolyPolygon( const ImpXPolyPolygon& rImpXPolyPoly ); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index c530948ea002..129c16a08582 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -84,7 +84,6 @@ namespace svxform typedef ::std::map< Reference< XInterface >, SdrObject*, ::comphelper::OInterfaceCompare< XInterface > > MapModelToShape; - typedef MapModelToShape::value_type ModelShapePair; void collectShapeModelMapping( SdrPage const * _pPage, MapModelToShape& _rMapping ) @@ -105,7 +104,7 @@ namespace svxform // note that this is normalized (i.e. queried for XInterface explicitly) ::std::pair< MapModelToShape::iterator, bool > aPos = - _rMapping.insert( ModelShapePair( xNormalizedModel, pSdrObject ) ); + _rMapping.emplace( xNormalizedModel, pSdrObject ); DBG_ASSERT( aPos.second, "collectShapeModelMapping: model was already existent!" ); // if this asserts, this would mean we have 2 shapes pointing to the same model } diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 84249101ebb8..9135583a0cbc 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -96,7 +96,6 @@ namespace svxform typedef css::uno::Reference< css::xforms::XSubmission > XSubmission_ref; typedef css::uno::Sequence< css::beans::PropertyValue > PropertyValue_seq; typedef std::vector< XContainer_ref > ContainerList; - typedef std::vector< XEventTarget_ref > EventTargetList; class DataTreeListBox : public SvTreeListBox @@ -321,7 +320,8 @@ namespace svxform bool m_bIsNotifyDisabled; PageList m_aPageList; ContainerList m_aContainerList; - EventTargetList m_aEventTargetList; + std::vector< XEventTarget_ref > + m_aEventTargetList; Timer m_aUpdateTimer; DataListener_ref m_xDataListener; @@ -493,8 +493,6 @@ namespace svxform class NamespaceItemDialog : public ModalDialog { private: - typedef std::vector< OUString > PrefixList; - VclPtr<SvSimpleTable> m_pNamespacesList; VclPtr<PushButton> m_pAddNamespaceBtn; VclPtr<PushButton> m_pEditNamespaceBtn; @@ -502,7 +500,7 @@ namespace svxform VclPtr<OKButton> m_pOKBtn; VclPtr<AddConditionDialog> m_pConditionDlg; - PrefixList m_aRemovedList; + std::vector< OUString > m_aRemovedList; XNameContainer_ref& m_rNamespaces; diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index 62a0d7f3a9d7..21c35ddd758d 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -239,7 +239,6 @@ class FrameBorderIterBase public: typedef Cont container_type; typedef Iter iterator_type; - typedef Pred predicate_type; typedef typename Cont::value_type value_type; typedef FrameBorderIterBase<Cont, Iter, Pred> this_type; @@ -251,7 +250,7 @@ public: private: iterator_type maIt; iterator_type maEnd; - predicate_type maPred; + Pred maPred; }; /** Iterator for constant svx::FrameBorder containers, iterates over all borders. */ diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index f5e6f551e8c9..7f01f6ff09d6 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -72,7 +72,6 @@ namespace i18nutil { struct SearchOptions2; } #define COL_NOTES_SIDEPANE_ARROW_DISABLED RGB_COLORDATA(172,168,153) typedef std::list<SwSidebarItem*> SwSidebarItem_list; -typedef std::list<SwSidebarItem*>::iterator SwSidebarItem_iterator; struct SwPostItPageItem { diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 2fad70d89c64..ea4ede102581 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -294,7 +294,6 @@ namespace sw { private: std::vector<SwFltStackEntry *> maStack; - typedef std::vector<SwFltStackEntry *>::reverse_iterator myriter; SwDoc &mrDoc; RedlineStack(RedlineStack const&) = delete; @@ -376,7 +375,6 @@ namespace sw }; typedef std::vector<CharRunEntry> CharRuns; - typedef CharRuns::const_iterator cCharRunIter; /** Collect the ranges of Text which share diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index bd255edc0a92..b87573d9bfa4 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -700,7 +700,7 @@ namespace sw bool RedlineStack::close(const SwPosition& rPos, RedlineType_t eType) { //Search from end for same type - myriter aResult = std::find_if(maStack.rbegin(), maStack.rend(), + auto aResult = std::find_if(maStack.rbegin(), maStack.rend(), SameOpenRedlineType(eType)); if (aResult != maStack.rend()) { diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 57a2eb756b14..93f4d392c0d9 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -1462,7 +1462,7 @@ private: const SwTextNode& rNd; sw::util::CharRuns maCharRuns; - sw::util::cCharRunIter maCharRunIter; + sw::util::CharRuns::const_iterator maCharRunIter; rtl_TextEncoding meChrSet; sal_uInt16 mnScript; diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index c50dd00bc18b..1cf72a50e519 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -6492,7 +6492,7 @@ bool SwWW8ImplReader::InEqualOrHigherApo(int nLvl) const { return false; } - mycApoIter aIter = std::find(m_aApos.begin() + nLvl, m_aApos.end(), true); + auto aIter = std::find(m_aApos.begin() + nLvl, m_aApos.end(), true); return aIter != m_aApos.end(); } diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 57a6b4c5355c..089bfc574764 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1188,7 +1188,6 @@ private: //Keep track of APO environments std::deque<bool> m_aApos; - typedef std::deque<bool>::const_iterator mycApoIter; /* Keep track of generated Ruby character formats we can minimize the number of character formats created diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index c204998f35a0..e03e43a2994e 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -43,9 +43,7 @@ using namespace ::std; struct SwCompatibilityOptPage_Impl { - typedef vector< SvtCompatibilityEntry > SwCompatibilityItemList; - - SwCompatibilityItemList m_aList; + std::vector< SvtCompatibilityEntry > m_aList; }; SwCompatibilityOptPage::SwCompatibilityOptPage(vcl::Window* pParent, const SfxItemSet& rSet) diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index f7571ffb0398..0b982a5b8945 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -934,7 +934,7 @@ bool SwPostItMgr::BorderOverPageBorder(unsigned long aPage) const return false; } - SwSidebarItem_iterator aItem = mPages[aPage-1]->mList->end(); + auto aItem = mPages[aPage-1]->mList->end(); --aItem; OSL_ENSURE ((*aItem)->pPostIt,"BorderOverPageBorder: NULL postIt, should never happen"); if ((*aItem)->pPostIt) diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index a4cb2fab7ebb..edb95a6f3a94 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -75,8 +75,7 @@ using namespace ::com::sun::star::util; template< typename T > class SimpleNamedThingContainer : public ::cppu::WeakImplHelper< container::XNameContainer > { - typedef std::unordered_map< OUString, Reference< T > > NamedThingsHash; - NamedThingsHash things; + std::unordered_map< OUString, Reference< T > > things; ::osl::Mutex m_aMutex; public: // css::container::XNameContainer, XNameReplace, XNameAccess diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index 87faa5dff7b7..22f77d574891 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -427,11 +427,10 @@ class XResultSet_impl : public Notifier, typedef std::vector< css::uno::Reference< css::ucb::XContentIdentifier > > IdentSet; typedef std::vector< css::uno::Reference< css::sdbc::XRow > > ItemSet; - typedef std::vector< OUString > UnqPathSet; IdentSet m_aIdents; ItemSet m_aItems; - UnqPathSet m_aUnqPath; + std::vector< OUString > m_aUnqPath; const OUString m_aBaseDirectory; osl::Directory m_aFolder; diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index 912e1fdb7d8b..ddc3ba5d8210 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -81,10 +81,7 @@ public: }; -// Packages. -typedef std::unordered_map<OUString, Package*> PackageMap; - -class Packages : public PackageMap {}; +class Packages : public std::unordered_map<OUString, Package*> {}; } diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx index 25b99d74252b..92f4d8b187bc 100644 --- a/ucb/source/ucp/webdav/webdavresponseparser.cxx +++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -146,7 +146,6 @@ namespace namespace { typedef std::map< OUString, OUString > NamespaceMap; - typedef std::pair< const OUString, OUString > NamespaceValueType; class WebDAVContext { @@ -198,7 +197,7 @@ namespace { const OUString aToken(aName.copy(nIndex + 1)); - maNamespaceMap.insert(NamespaceValueType(aToken, xAttribs->getValueByIndex(a))); + maNamespaceMap.emplace(aToken, xAttribs->getValueByIndex(a)); } } } diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx index 22d7d98d9285..3aec56767f60 100644 --- a/unotools/source/config/configvaluecontainer.cxx +++ b/unotools/source/config/configvaluecontainer.cxx @@ -179,8 +179,6 @@ namespace utl } }; - typedef std::vector<NodeValueAccessor> NodeValueAccessors; - //= OConfigurationValueContainerImpl struct OConfigurationValueContainerImpl @@ -189,7 +187,7 @@ namespace utl ::osl::Mutex& rMutex; // the mutex for accessing the data containers OConfigurationTreeRoot aConfigRoot; // the configuration node we're accessing - NodeValueAccessors aAccessors; // the accessors to the node values + std::vector<NodeValueAccessor> aAccessors; // the accessors to the node values OConfigurationValueContainerImpl( const Reference< XComponentContext >& _rxORB, ::osl::Mutex& _rMutex ) :xORB( _rxORB ) diff --git a/unoxml/source/dom/elementlist.hxx b/unoxml/source/dom/elementlist.hxx index 3f44d05a0253..28a4cb61670e 100644 --- a/unoxml/source/dom/elementlist.hxx +++ b/unoxml/source/dom/elementlist.hxx @@ -42,8 +42,6 @@ namespace DOM { class CElement; - typedef std::vector< xmlNodePtr > nodevector_t; - class CElementListImpl : public cppu::WeakImplHelper< css::xml::dom::XNodeList, css::xml::dom::events::XEventListener > @@ -59,7 +57,7 @@ namespace DOM ::std::unique_ptr<xmlChar[]> const m_pName; ::std::unique_ptr<xmlChar[]> const m_pURI; bool m_bRebuild; - nodevector_t m_nodevector; + std::vector< xmlNodePtr > m_nodevector; void buildlist(xmlNodePtr pNode, bool start=true); diff --git a/unoxml/source/dom/saxbuilder.hxx b/unoxml/source/dom/saxbuilder.hxx index 0caf53ea4faf..dd2331426c63 100644 --- a/unoxml/source/dom/saxbuilder.hxx +++ b/unoxml/source/dom/saxbuilder.hxx @@ -44,10 +44,8 @@ namespace DOM { - typedef std::stack< css::uno::Reference< css::xml::dom::XNode > > NodeStack; typedef std::map< OUString, OUString > NSMap; typedef std::map< OUString, OUString > AttrMap; - typedef std::stack< NSMap > NSStack; class CSAXDocumentBuilder : public ::cppu::WeakImplHelper< css::xml::dom::XSAXDocumentBuilder2, css::lang::XServiceInfo > @@ -58,8 +56,8 @@ namespace DOM const css::uno::Reference< css::lang::XMultiServiceFactory > m_aServiceManager; css::xml::dom::SAXDocumentBuilderState m_aState; - NodeStack m_aNodeStack; - NSStack m_aNSStack; + std::stack< css::uno::Reference< css::xml::dom::XNode > > m_aNodeStack; + std::stack< NSMap > m_aNSStack; css::uno::Reference< css::xml::dom::XDocument > m_aDocument; css::uno::Reference< css::xml::dom::XDocumentFragment > m_aFragment; diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx index 7efa5697df4a..683f2fc81ffe 100644 --- a/vbahelper/source/msforms/vbacontrols.cxx +++ b/vbahelper/source/msforms/vbacontrols.cxx @@ -40,13 +40,12 @@ using namespace ooo::vba; typedef std::unordered_map< OUString, sal_Int32 > ControlIndexMap; -typedef std::vector< uno::Reference< awt::XControl > > ControlVec; class ControlArrayWrapper : public ::cppu::WeakImplHelper< container::XNameAccess, container::XIndexAccess > { uno::Reference< awt::XControlContainer > mxDialog; uno::Sequence< OUString > msNames; - ControlVec mControls; + std::vector< uno::Reference< awt::XControl > > mControls; ControlIndexMap mIndices; private: diff --git a/vcl/inc/implimagetree.hxx b/vcl/inc/implimagetree.hxx index 6675d0dc3ee4..341fd44ddfd9 100644 --- a/vcl/inc/implimagetree.hxx +++ b/vcl/inc/implimagetree.hxx @@ -101,11 +101,9 @@ private: {} }; - /// Map between the theme name(s) and the content. - typedef std::unordered_map<OUString, IconSet> StyleIconSet; - /// Remember all the (used) icon styles and individual icons in them. - StyleIconSet maIconSets; + /// Map between the theme name(s) and the content. + std::unordered_map<OUString, IconSet> maIconSets; /// Style used for the current operations; switches switch several times during fallback search. OUString maCurrentStyle; diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 6fba738201cd..c9d38e465cd8 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -536,8 +536,6 @@ public: {} }; - typedef std::map<PDFWriter::StructAttribute, PDFStructureAttribute > PDFStructAttributes; - struct PDFStructureElementKid // for Kids entries { sal_Int32 nObject; // an object number if nMCID is -1, @@ -559,8 +557,9 @@ public: bool m_bOpenMCSeq; std::list< sal_Int32 > m_aChildren; // indexes into structure vector std::list< PDFStructureElementKid > m_aKids; - PDFStructAttributes m_aAttributes; - tools::Rectangle m_aBBox; + std::map<PDFWriter::StructAttribute, PDFStructureAttribute > + m_aAttributes; + tools::Rectangle m_aBBox; OUString m_aActualText; OUString m_aAltText; css::lang::Locale m_aLocale; diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index ce6ad134fa88..e81af9ded1fb 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -43,8 +43,6 @@ typedef ::std::pair< MetaAction*, int > Component; // MetaAction plus index in metafile -typedef ::std::list< Component > ComponentList; - // List of (intersecting) actions, plus overall bounds struct ConnectedComponents { @@ -56,7 +54,7 @@ struct ConnectedComponents bIsFullyTransparent(false) {} - ComponentList aComponentList; + ::std::list< Component > aComponentList; tools::Rectangle aBounds; Color aBgColor; bool bIsSpecial; diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx index cec1cf2073d4..2b086af41212 100644 --- a/vcl/source/window/menuitemlist.hxx +++ b/vcl/source/window/menuitemlist.hxx @@ -98,8 +98,7 @@ struct MenuItemData class MenuItemList { private: - typedef ::std::vector< std::unique_ptr<MenuItemData> > MenuItemDataList_impl; - MenuItemDataList_impl maItemList; + ::std::vector< std::unique_ptr<MenuItemData> > maItemList; public: MenuItemList() {} diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx index 9b4c9c31d0e7..b8e3fb4cc9d4 100644 --- a/vcl/unx/generic/gdi/gdiimpl.cxx +++ b/vcl/unx/generic/gdi/gdiimpl.cxx @@ -1507,8 +1507,7 @@ bool X11SalGraphicsImpl::drawFilledTrapezoids( const basegfx::B2DTrapezoid* pB2D return false; // convert the B2DTrapezoids into XRender-Trapezoids - typedef std::vector<XTrapezoid> TrapezoidVector; - TrapezoidVector aTrapVector( nTrapCount ); + std::vector<XTrapezoid> aTrapVector( nTrapCount ); const basegfx::B2DTrapezoid* pB2DTrap = pB2DTraps; for( int i = 0; i < nTrapCount; ++pB2DTrap, ++i ) { diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index fe1bb9391307..863867ef7a20 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -693,8 +693,7 @@ bool FreetypeFontInfo::GetFontCodeRanges( CmapResult& rResult ) const return true; } - typedef std::vector<sal_uInt32> U32Vector; - U32Vector aCodes; + std::vector<sal_uInt32> aCodes; // FT's coverage is available since FT>=2.1.0 (OOo-baseline>=2.1.4 => ok) aCodes.reserve( 0x1000 ); diff --git a/vcl/unx/gtk/salprn-gtk.cxx b/vcl/unx/gtk/salprn-gtk.cxx index da1314a47a9c..9d7abcc7db75 100644 --- a/vcl/unx/gtk/salprn-gtk.cxx +++ b/vcl/unx/gtk/salprn-gtk.cxx @@ -426,11 +426,10 @@ GtkPrintDialog::impl_initDialog() void GtkPrintDialog::impl_initCustomTab() { - typedef std::map<OUString, GtkWidget*> DependencyMap_t; typedef std::vector<std::pair<GtkWidget*, OUString> > CustomTabs_t; const uno::Sequence<beans::PropertyValue>& rOptions(m_rController.getUIOptions()); - DependencyMap_t aPropertyToDependencyRowMap; + std::map<OUString, GtkWidget*> aPropertyToDependencyRowMap; CustomTabs_t aCustomTabs; GtkWidget* pCurParent = nullptr; GtkWidget* pCurTabPage = nullptr; diff --git a/writerfilter/source/dmapper/FormControlHelper.hxx b/writerfilter/source/dmapper/FormControlHelper.hxx index 89e0a1dba6f1..da4c8e53bcb4 100644 --- a/writerfilter/source/dmapper/FormControlHelper.hxx +++ b/writerfilter/source/dmapper/FormControlHelper.hxx @@ -43,8 +43,7 @@ public: private: FFDataHandler::Pointer_t m_pFFData; struct FormControlHelper_Impl; - typedef std::shared_ptr<FormControlHelper_Impl> ImplPointer_t; - ImplPointer_t m_pImpl; + std::shared_ptr<FormControlHelper_Impl> m_pImpl; bool createCheckbox(css::uno::Reference<css::text::XTextRange> const& xTextRange, const OUString & rControlName); diff --git a/xmloff/inc/RDFaImportHelper.hxx b/xmloff/inc/RDFaImportHelper.hxx index c64e5a19cd7c..7242d3fdcc1f 100644 --- a/xmloff/inc/RDFaImportHelper.hxx +++ b/xmloff/inc/RDFaImportHelper.hxx @@ -45,9 +45,7 @@ class RDFaImportHelper private: const SvXMLImport & m_rImport; - typedef ::std::vector< RDFaEntry > RDFaEntries_t; - - RDFaEntries_t m_RDFaEntries; + ::std::vector< RDFaEntry > m_RDFaEntries; const SvXMLImport & GetImport() const { return m_rImport; } diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 932505961e75..e6b93e5a918f 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -139,8 +139,7 @@ namespace class TextContentSet { public: - typedef Reference<XTextContent> text_content_ref_t; - typedef list<text_content_ref_t> contents_t; + typedef list<Reference<XTextContent>> contents_t; typedef back_insert_iterator<contents_t> inserter_t; typedef contents_t::const_iterator const_iterator_t; |