diff options
| author | Joachim Lingner <jl@openoffice.org> | 2010-06-07 17:08:48 +0200 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2010-06-07 17:08:48 +0200 |
| commit | 77d761f74d1147b013325487753255846aa56b96 (patch) | |
| tree | c5e7df3c61892cf34780f03283d7f0219a6fdd4e /basic | |
| parent | 4edc7f8eac625e30719fec69bd9b26dd9356657c (diff) | |
jl152 #i77196# fixing merge conflicts
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/inc/namecont.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 4d31483ab513..c475535143d2 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -58,7 +58,7 @@ #include <com/sun/star/deployment/XPackage.hpp> #include <cppuhelper/implbase2.hxx> -#include <cppuhelper/compbase7.hxx> +#include <cppuhelper/compbase8.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <com/sun/star/script/XVBACompat.hpp> @@ -67,7 +67,7 @@ class BasicManager; namespace basic { -typedef ::cppu::WeakComponentImplHelper7< +typedef ::cppu::WeakComponentImplHelper8< ::com::sun::star::lang::XInitialization, ::com::sun::star::script::XStorageBasedLibraryContainer, ::com::sun::star::script::XLibraryContainerPassword, |