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 /include | |
| 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 'include')
| -rw-r--r-- | include/dbaccess/dbsubcomponentcontroller.hxx | 10 | ||||
| -rw-r--r-- | include/dbaccess/genericcontroller.hxx | 26 |
2 files changed, 18 insertions, 18 deletions
diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx index 6cf592e4f072..9406a3e7954d 100644 --- a/include/dbaccess/dbsubcomponentcontroller.hxx +++ b/include/dbaccess/dbsubcomponentcontroller.hxx @@ -33,7 +33,7 @@ #include <comphelper/proparrhlp.hxx> #include <comphelper/propertycontainer.hxx> #include <connectivity/dbmetadata.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <memory> @@ -47,10 +47,10 @@ namespace dbaui class DBSubComponentController; - typedef ::cppu::ImplInheritanceHelper2 < OGenericUnoController - , ::com::sun::star::document::XScriptInvocationContext - , ::com::sun::star::util::XModifiable - > DBSubComponentController_Base; + typedef ::cppu::ImplInheritanceHelper< OGenericUnoController + , ::com::sun::star::document::XScriptInvocationContext + , ::com::sun::star::util::XModifiable + > DBSubComponentController_Base; struct DBSubComponentController_Impl; class DBACCESS_DLLPUBLIC DBSubComponentController : public DBSubComponentController_Base diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index f1953218ef15..3b40f65b774c 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -54,7 +54,7 @@ #include <comphelper/sharedmutex.hxx> #include <comphelper/namedvaluecollection.hxx> #include <connectivity/dbexception.hxx> -#include <cppuhelper/compbase11.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/interfacecontainer.h> #include <boost/optional.hpp> @@ -188,18 +188,18 @@ namespace dbaui typedef ::comphelper::SharedMutexBase OGenericUnoController_MBASE; - typedef ::cppu::WeakComponentImplHelper11 < ::com::sun::star::frame::XDispatch - , ::com::sun::star::frame::XDispatchProviderInterceptor - , ::com::sun::star::util::XModifyListener - , ::com::sun::star::frame::XFrameActionListener - , ::com::sun::star::lang::XInitialization - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::frame::XDispatchInformationProvider - , ::com::sun::star::frame::XController2 - , ::com::sun::star::frame::XTitle - , ::com::sun::star::frame::XTitleChangeBroadcaster - , ::com::sun::star::awt::XUserInputInterception - > OGenericUnoController_Base; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::frame::XDispatch + , ::com::sun::star::frame::XDispatchProviderInterceptor + , ::com::sun::star::util::XModifyListener + , ::com::sun::star::frame::XFrameActionListener + , ::com::sun::star::lang::XInitialization + , ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::frame::XDispatchInformationProvider + , ::com::sun::star::frame::XController2 + , ::com::sun::star::frame::XTitle + , ::com::sun::star::frame::XTitleChangeBroadcaster + , ::com::sun::star::awt::XUserInputInterception + > OGenericUnoController_Base; struct OGenericUnoController_Data; |