diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-07-10 17:50:12 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-20 07:06:22 +0000 |
| commit | a890a7696ff5dfc3ec8a012ba59cc04db4a1473d (patch) | |
| tree | 9e0d23aadb43f2bbdf3bac2db8aff76307bda5fc /comphelper/source/officeinstdir | |
| parent | 3f0677b86f4831b011a2baece85cf93c68646cd5 (diff) | |
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants, for comphelper.
This also includes extra changes in other modules
required accordingly.
Change-Id: Id1537f46f1c90f760a0d8987a6dafa0e1da03b8f
Reviewed-on: https://gerrit.libreoffice.org/16929
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'comphelper/source/officeinstdir')
| -rw-r--r-- | comphelper/source/officeinstdir/officeinstallationdirectories.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx index 0d0ab574f976..8cc740747c33 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx @@ -21,7 +21,7 @@ #define INCLUDED_COMPHELPER_SOURCE_OFFICEINSTDIR_OFFICEINSTALLATIONDIRECTORIES_HXX #include <osl/mutex.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> @@ -31,7 +31,7 @@ namespace comphelper { -typedef cppu::WeakImplHelper2< +typedef cppu::WeakImplHelper< com::sun::star::util::XOfficeInstallationDirectories, com::sun::star::lang::XServiceInfo > UnoImplBase; |