From 236f59530e2be0d9ab4871c1e0cce6f18fcf83af Mon Sep 17 00:00:00 2001 From: Noel Power Date: Tue, 16 Aug 2011 17:25:08 +0100 Subject: fix merge foobar, use css::script::XLibraryQueryExecutable for Libraray make sure LibraryContainers use css::script::XLibraryQueryExecutable --- basic/source/inc/namecont.hxx | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index ba6efdc56471..26f04f847b4c 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -78,18 +78,6 @@ class BasicManager; namespace basic { - -typedef ::cppu::WeakComponentImplHelper9< - ::com::sun::star::lang::XInitialization, - ::com::sun::star::script::XStorageBasedLibraryContainer, - ::com::sun::star::script::XLibraryContainerPassword, - ::com::sun::star::script::XLibraryContainerExport, - ::com::sun::star::script::XLibraryContainer3, - ::com::sun::star::container::XContainer, - ::com::sun::star::script::XLibraryQueryExecutable, - ::com::sun::star::script::vba::XVBACompatibility, - ::com::sun::star::lang::XServiceInfo > LibraryContainerHelper; - typedef ::cppu::WeakImplHelper2< ::com::sun::star::container::XNameContainer, ::com::sun::star::container::XContainer > NameContainerHelper; @@ -231,13 +219,14 @@ private: class SfxLibrary; -typedef ::cppu::WeakComponentImplHelper8< +typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::lang::XInitialization, ::com::sun::star::script::XStorageBasedLibraryContainer, ::com::sun::star::script::XLibraryContainerPassword, ::com::sun::star::script::XLibraryContainerExport, ::com::sun::star::script::XLibraryContainer3, ::com::sun::star::container::XContainer, + ::com::sun::star::script::XLibraryQueryExecutable, ::com::sun::star::script::vba::XVBACompatibility, ::com::sun::star::lang::XServiceInfo > SfxLibraryContainer_BASE; -- cgit