1 files changed, 11 insertions, 13 deletions

diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx
index 3ff53291c01f..e08d5a69b2f4 100644
--- a/embeddedobj/source/msole/olecomponent.hxx
+++ b/embeddedobj/source/msole/olecomponent.hxx
@@ -32,35 +32,32 @@
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <rtl/ref.hxx>
 
-
-namespace cppu {
-    class OMultiTypeInterfaceContainerHelper;
+namespace comphelper {
+    class OMultiTypeInterfaceContainerHelper2;
 }
 
 class OleWrapperClientSite;
 class OleWrapperAdviseSink;
 class OleEmbeddedObject;
-struct OleComponentNative_Impl;
+class OleComponentNative_Impl;
 
 class OleComponent : public ::cppu::WeakImplHelper< css::util::XCloseable, css::lang::XComponent,
                                                     css::lang::XUnoTunnel, css::util::XModifiable,
                                                     css::datatransfer::XTransferable >
 {
     ::osl::Mutex m_aMutex;
-    ::cppu::OMultiTypeInterfaceContainerHelper* m_pInterfaceContainer;
+    comphelper::OMultiTypeInterfaceContainerHelper2* m_pInterfaceContainer;
 
     bool m_bDisposed;
     bool m_bModified;
-    OleComponentNative_Impl* m_pNativeImpl;
+    std::unique_ptr<OleComponentNative_Impl> m_pNativeImpl;
 
     OleEmbeddedObject* m_pUnoOleObject;
     OleWrapperClientSite* m_pOleWrapClientSite;
     OleWrapperAdviseSink* m_pImplAdviseSink;
 
-    sal_Int32 m_nOLEMiscFlags;
-    sal_Int32 m_nAdvConn;
-
     css::uno::Sequence< css::embed::VerbDescriptor > m_aVerbList;
     css::uno::Sequence< css::datatransfer::DataFlavor > m_aDataFlavors;
 
@@ -72,9 +69,10 @@ class OleComponent : public ::cppu::WeakImplHelper< css::util::XCloseable, css::
     // such objects report the dirty state wrongly sometimes and do not allow to store them any time
     bool m_bWorkaroundActive;
 
-    bool InitializeObject_Impl();
+    void InitializeObject_Impl();
+
+    OUString getTempURL() const;
 
-    void CreateNewIStorage_Impl();
     void RetrieveObjectDataFlavors_Impl();
     void Dispose();
 
@@ -103,7 +101,7 @@ public:
                         const css::uno::Reference< css::datatransfer::XTransferable >& xTransfer );
     void CreateObjectFromFile( const OUString& aFileName );
     void CreateLinkFromFile( const OUString& aFileName );
-    void InitEmbeddedCopyOfLink( OleComponent const * pOleLinkComponent );
+    void InitEmbeddedCopyOfLink( rtl::Reference<OleComponent> const & pOleLinkComponent );
 
 
     void RunObject(); // switch OLE object to running state
@@ -123,7 +121,7 @@ public:
 
     css::uno::Sequence< sal_Int8 > GetCLSID();
 
-    bool IsWorkaroundActive() { return m_bWorkaroundActive; }
+    bool IsWorkaroundActive() const { return m_bWorkaroundActive; }
     bool IsDirty();
 
     void StoreOwnTmpIfNecessary();