embeddedobj/source/commonembedding/xfactory.hxx | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit c33c309f13dee335d81eb0e00363d4ae2d7c911a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Feb 2 13:38:30 2015 +0100
OOoEmbeddedObjectFactory does implement optional XLinkFactory
regression from 251f1b0b38be7d1267339898e44e320f05849e22 "fdo#46808, Adapt
embed::*EmbeddedObjectCreator UNO services to new style"
Change-Id: Id8b49c04183d3bc98f22398a8e43c80909c1ea11
diff --git a/embeddedobj/source/commonembedding/xfactory.hxx
b/embeddedobj/source/commonembedding/xfactory.hxx
index 0635f8b..672eb6c 100644
--- a/embeddedobj/source/commonembedding/xfactory.hxx
+++ b/embeddedobj/source/commonembedding/xfactory.hxx
@@ -21,13 +21,15 @@
#define INCLUDED_EMBEDDEDOBJ_SOURCE_COMMONEMBEDDING_XFACTORY_HXX
#include <com/sun/star/embed/XEmbeddedObjectCreator.hpp>
+#include <com/sun/star/embed/XLinkFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <osl/diagnose.h>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/mimeconfighelper.hxx>
-class OOoEmbeddedObjectFactory : public ::cppu::WeakImplHelper2<
+class OOoEmbeddedObjectFactory : public ::cppu::WeakImplHelper<
::com::sun::star::embed::XEmbeddedObjectCreator,
+ css::embed::XLinkFactory,
::com::sun::star::lang::XServiceInfo >
{
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext
> m_xContext;
@@ -64,7 +66,7 @@ public:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >&
xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& aMediaDescr, const
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&
lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::io::IOException, ::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XLinkFactory
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence<
sal_Int8 >& aClassID, const OUString& aClassName, const
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >&
xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& lArguments, const
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&
lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::io::IOException, ::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence<
sal_Int8 >& aClassID, const OUString& aClassName, const
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >&
xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& lArguments, const
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&
lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::io::IOException, ::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -73,7 +75,7 @@ public:
};
-class OOoSpecialEmbeddedObjectFactory : public ::cppu::WeakImplHelper2<
+class OOoSpecialEmbeddedObjectFactory : public ::cppu::WeakImplHelper<
::com::sun::star::embed::XEmbedObjectFactory,
::com::sun::star::lang::XServiceInfo >
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
