diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-07-17 11:59:26 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-17 07:13:29 +0000 |
| commit | 7fa29ecc727c04159cee92aebc14fc5b1037a965 (patch) | |
| tree | a9c7a588d304894a88023fd8020795290faa869a /dbaccess/source/ui/inc | |
| parent | a90c6eb99c8c2167c4b1ec75a21a30a344bfea43 (diff) | |
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants, for dbaccess.
Change-Id: I60921b1b1d3b65fb9087552ed118c60dc9f89032
Reviewed-on: https://gerrit.libreoffice.org/17146
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'dbaccess/source/ui/inc')
| -rw-r--r-- | dbaccess/source/ui/inc/TokenWriter.hxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/formadapter.hxx | 29 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/singledoccontroller.hxx | 8 |
3 files changed, 21 insertions, 20 deletions
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index d1b87f0ddc70..390991e4d959 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/sdbcx/XRowLocate.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <tools/stream.hxx> #include <svx/dataaccessdescriptor.hxx> @@ -48,7 +48,7 @@ namespace dbaui { // ODatabaseImportExport base class for import/export class ODatabaseExport; - typedef ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener> ODatabaseImportExport_BASE; + typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XEventListener> ODatabaseImportExport_BASE; class ODatabaseImportExport : public ODatabaseImportExport_BASE { private: diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx index 6b0e94400f07..f35bef0df3ce 100644 --- a/dbaccess/source/ui/inc/formadapter.hxx +++ b/dbaccess/source/ui/inc/formadapter.hxx @@ -55,6 +55,7 @@ #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/util/XCancellable.hpp> #include <comphelper/uno3.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase12.hxx> #include <cppuhelper/implbase10.hxx> #include "moduledbu.hxx" @@ -63,20 +64,20 @@ namespace dbaui { // SbaXFormAdapter - typedef ::cppu::WeakImplHelper12< ::com::sun::star::sdbc::XResultSetMetaDataSupplier - , ::com::sun::star::sdb::XResultSetAccess - , ::com::sun::star::sdbc::XResultSetUpdate - , ::com::sun::star::sdbc::XRowSet - , ::com::sun::star::sdb::XRowSetApproveBroadcaster - , ::com::sun::star::sdbcx::XRowLocate - , ::com::sun::star::sdbc::XRowUpdate - , ::com::sun::star::sdbc::XRow - , ::com::sun::star::sdbcx::XColumnsSupplier - , ::com::sun::star::sdbc::XColumnLocate - // --- stardiv::one::form::component::DatabaseForm --- - , ::com::sun::star::sdbc::XParameters - , ::com::sun::star::sdbcx::XDeleteRows - > SbaXFormAdapter_BASE1; + typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaDataSupplier + , ::com::sun::star::sdb::XResultSetAccess + , ::com::sun::star::sdbc::XResultSetUpdate + , ::com::sun::star::sdbc::XRowSet + , ::com::sun::star::sdb::XRowSetApproveBroadcaster + , ::com::sun::star::sdbcx::XRowLocate + , ::com::sun::star::sdbc::XRowUpdate + , ::com::sun::star::sdbc::XRow + , ::com::sun::star::sdbcx::XColumnsSupplier + , ::com::sun::star::sdbc::XColumnLocate + // --- stardiv::one::form::component::DatabaseForm --- + , ::com::sun::star::sdbc::XParameters + , ::com::sun::star::sdbcx::XDeleteRows + > SbaXFormAdapter_BASE1; typedef ::cppu::ImplHelper12 < ::com::sun::star::sdbc::XWarningsSupplier , ::com::sun::star::sdbc::XCloseable , ::com::sun::star::form::XLoadable diff --git a/dbaccess/source/ui/inc/singledoccontroller.hxx b/dbaccess/source/ui/inc/singledoccontroller.hxx index fe9588ee6910..e6730b0152c6 100644 --- a/dbaccess/source/ui/inc/singledoccontroller.hxx +++ b/dbaccess/source/ui/inc/singledoccontroller.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/document/XUndoManagerSupplier.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> class SfxUndoAction; class SfxUndoManager; @@ -34,9 +34,9 @@ namespace dbaui // OSingleDocumentController struct OSingleDocumentController_Data; - typedef ::cppu::ImplInheritanceHelper1 < DBSubComponentController - , ::com::sun::star::document::XUndoManagerSupplier - > OSingleDocumentController_Base; + typedef ::cppu::ImplInheritanceHelper< DBSubComponentController + , ::com::sun::star::document::XUndoManagerSupplier + > OSingleDocumentController_Base; class OSingleDocumentController : public OSingleDocumentController_Base { protected: |