diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-18 14:24:50 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-19 11:57:57 +0100 |
commit | a5be07d6b627a18f104e2feed063ff9020e8c610 (patch) | |
tree | 389ea7a3c163bcafca743373b94cda4fba937552 /dbaccess/source | |
parent | b0cecbfb03dba67f01d1411a1e8b7402c2ca90ce (diff) |
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>
Diffstat (limited to 'dbaccess/source')
-rw-r--r-- | dbaccess/source/core/api/RowSet.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 3 | ||||
-rw-r--r-- | dbaccess/source/core/api/query.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/core/inc/ContainerMediator.hxx | 3 | ||||
-rw-r--r-- | dbaccess/source/core/inc/ContentHelper.hxx | 3 | ||||
-rw-r--r-- | dbaccess/source/core/inc/definitioncontainer.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/core/inc/tablecontainer.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/core/inc/viewcontainer.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/filter/xml/xmlfilter.hxx | 3 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/TokenWriter.hxx | 3 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/dbadmin.hxx | 3 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/sbagrid.hxx | 6 |
12 files changed, 12 insertions, 34 deletions
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 |