diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-04 08:56:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-04 08:56:11 +0200 |
| commit | c9bb48386bad7d2a40e6958883328145ae439cad (patch) | |
| tree | 8576ed314b2d219fdd96b8c1990f16fb70847a54 /connectivity | |
| parent | 9865440d217d975206a3f91612f0666312bc8fd8 (diff) | |
Revert "new loplugin typedefparam"
This reverts commit 9865440d217d975206a3f91612f0666312bc8fd8.
This is not ready to land yet, seems like the latest update
of the logic reveals a bunch more places I need to fix before it can land.
Diffstat (limited to 'connectivity')
3 files changed, 5 insertions, 7 deletions
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx index 0e52e9281f4b..cccbb294e204 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx @@ -60,6 +60,7 @@ 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> @@ -160,10 +161,9 @@ public: sal_Int32 SAL_CALL getTransactionIsolation() override; - css::uno::Reference<css::container::XNameAccess> SAL_CALL getTypeMap() override; + my_XNameAccessRef SAL_CALL getTypeMap() override; - void SAL_CALL - setTypeMap(const css::uno::Reference<css::container::XNameAccess>& typeMap) override; + void SAL_CALL setTypeMap(const my_XNameAccessRef& 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 89e302eb08c7..647d872c50d8 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx @@ -167,8 +167,7 @@ public: css::uno::Reference<css::io::XInputStream> SAL_CALL getCharacterStream(sal_Int32 column) override; - Any SAL_CALL getObject( - sal_Int32 column, const css::uno::Reference<css::container::XNameAccess>& typeMap) override; + Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& 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 027cc294c153..e87a4efef73e 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx @@ -199,8 +199,7 @@ public: css::uno::Reference<css::io::XInputStream> SAL_CALL getCharacterStream(sal_Int32 column) override; - Any SAL_CALL getObject( - sal_Int32 column, const css::uno::Reference<css::container::XNameAccess>& typeMap) override; + Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& 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; |