diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-04 08:57:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-05 12:12:26 +0100 |
| commit | 191f85df5851473af270be486f95f940e3091fef (patch) | |
| tree | 753d9513ccda8ee2a132bdad74eedc47bd71b179 /connectivity | |
| parent | 983566119c926d0e2478f74548f00a789de55c15 (diff) | |
re-land "new loplugin typedefparam""
This reverts commit c9bb48386bad7d2a40e6958883328145ae439cad,
and adds a bunch more fixes.
Change-Id: Ib584d302a73125528eba85fa1e722cb6fc41538a
Reviewed-on: https://gerrit.libreoffice.org/68680
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity')
3 files changed, 7 insertions, 5 deletions
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx index cccbb294e204..0e52e9281f4b 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx @@ -60,7 +60,6 @@ namespace mysqlc using ::com::sun::star::sdbc::SQLException; using ::com::sun::star::sdbc::SQLWarning; using ::com::sun::star::uno::RuntimeException; -typedef css::uno::Reference<css::container::XNameAccess> my_XNameAccessRef; typedef ::cppu::WeakComponentImplHelper3<css::sdbc::XConnection, css::sdbc::XWarningsSupplier, css::lang::XServiceInfo> @@ -161,9 +160,10 @@ public: sal_Int32 SAL_CALL getTransactionIsolation() override; - my_XNameAccessRef SAL_CALL getTypeMap() override; + css::uno::Reference<css::container::XNameAccess> SAL_CALL getTypeMap() override; - void SAL_CALL setTypeMap(const my_XNameAccessRef& typeMap) override; + void SAL_CALL + setTypeMap(const css::uno::Reference<css::container::XNameAccess>& typeMap) override; // XCloseable void SAL_CALL close() override; // XWarningsSupplier diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx index 647d872c50d8..89e302eb08c7 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx @@ -167,7 +167,8 @@ public: css::uno::Reference<css::io::XInputStream> SAL_CALL getCharacterStream(sal_Int32 column) override; - Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& typeMap) override; + Any SAL_CALL getObject( + sal_Int32 column, const css::uno::Reference<css::container::XNameAccess>& typeMap) override; css::uno::Reference<css::sdbc::XRef> SAL_CALL getRef(sal_Int32 column) override; css::uno::Reference<css::sdbc::XBlob> SAL_CALL getBlob(sal_Int32 column) override; diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx index e87a4efef73e..027cc294c153 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx @@ -199,7 +199,8 @@ public: css::uno::Reference<css::io::XInputStream> SAL_CALL getCharacterStream(sal_Int32 column) override; - Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& typeMap) override; + Any SAL_CALL getObject( + sal_Int32 column, const css::uno::Reference<css::container::XNameAccess>& typeMap) override; css::uno::Reference<css::sdbc::XRef> SAL_CALL getRef(sal_Int32 column) override; css::uno::Reference<css::sdbc::XBlob> SAL_CALL getBlob(sal_Int32 column) override; |