diff options
| author | Noel Grandin <noel@peralex.com> | 2020-07-21 17:02:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-22 17:48:12 +0200 |
| commit | 7405145605923123a09738829ead507fe6078e0c (patch) | |
| tree | b85add1a367166cb53bcb90d08e7d0327e9e6f2f /embeddedobj/source/inc | |
| parent | 950d7d4d51e68cfae3a5d0d23a3d39e84e548357 (diff) | |
embeddedobj/msole: create instances with uno constructors
See tdf#74608 for motivation.
Change-Id: I11ad7cf96d65332e418f1854803d62a30bacc7e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99163
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'embeddedobj/source/inc')
| -rw-r--r-- | embeddedobj/source/inc/oleembobj.hxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx index 051d63294af4..9739402c6a27 100644 --- a/embeddedobj/source/inc/oleembobj.hxx +++ b/embeddedobj/source/inc/oleembobj.hxx @@ -34,6 +34,7 @@ #include <com/sun/star/util/XCloseListener.hpp> #include <com/sun/star/io/XActiveDataStreamer.hpp> #include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> @@ -132,7 +133,7 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper sal_Int32 m_nTargetState; sal_Int32 m_nUpdateMode; - css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory; + css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Sequence< sal_Int8 > m_aClassID; OUString m_aClassName; @@ -291,17 +292,17 @@ protected: public: // in case a new object must be created the class ID must be specified - OleEmbeddedObject( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory, + OleEmbeddedObject( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName ); // in case object will be loaded from a persistent entry or from a file the class ID will be detected on loading // factory can do it for OOo objects, but for OLE objects OS dependent code is required - OleEmbeddedObject( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory, + OleEmbeddedObject( const css::uno::Reference< css::uno::XComponentContext >& xContext, bool bLink ); #ifdef _WIN32 // this constructor let object be initialized from clipboard - OleEmbeddedObject( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); + OleEmbeddedObject( const css::uno::Reference< css::uno::XComponentContext >& xContext ); #endif virtual ~OleEmbeddedObject() override; |