diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-05 08:56:27 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-05 08:56:27 +0000 |
| commit | 2db78fedd8f45e8634c71dfffe7cb934eefa5d18 (patch) | |
| tree | 077122a3d37da3edf111d8fc780066526a35a603 /embedserv/source/inc/docholder.hxx | |
| parent | d0813ee6f3d1af3aff072f994f804085b224e353 (diff) | |
INTEGRATION: CWS fwkc03fixes (1.16.20); FILE MERGED
2006/04/28 13:11:41 mav 1.16.20.1: #134455# fix objects crosslinking
Diffstat (limited to 'embedserv/source/inc/docholder.hxx')
| -rw-r--r-- | embedserv/source/inc/docholder.hxx | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/embedserv/source/inc/docholder.hxx b/embedserv/source/inc/docholder.hxx index ea37877903f9..613ffbd1f6d4 100644 --- a/embedserv/source/inc/docholder.hxx +++ b/embedserv/source/inc/docholder.hxx @@ -4,9 +4,9 @@ * * $RCSfile: docholder.hxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: rt $ $Date: 2005-09-08 18:55:34 $ + * last change: $Author: rt $ $Date: 2006-05-05 09:56:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -53,10 +53,17 @@ #ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_ #include <com/sun/star/frame/XFrame.hpp> #endif +#ifndef _COM_SUN_STAR_FRAME_XDISPATCHPROVIDERINTERCEPTOR_HPP_ +#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> +#endif #ifndef _CPPUHELPER_IMPLBASE4_HXX_ #include <cppuhelper/implbase4.hxx> #endif +#include <rtl/ref.hxx> + +#include "embeddocaccess.hxx" + class EmbedDocument_Impl; class Interceptor; class CIIAObj; @@ -74,15 +81,18 @@ class DocumentHolder : ::com::sun::star::ui::XDockingAreaAcceptor> { private: + ::osl::Mutex m_aMutex; + BOOL m_bAllowInPlace; LPOLEINPLACESITE m_pIOleIPSite; LPOLEINPLACEFRAME m_pIOleIPFrame; LPOLEINPLACEUIWINDOW m_pIOleIPUIWindow; winwrap::CHatchWin* m_pCHatchWin; - EmbedDocument_Impl* m_pOLEInterface; + ::rtl::Reference< EmbeddedDocumentInstanceAccess_Impl > m_xOleAccess; + + ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProviderInterceptor > m_xInterceptorLocker; Interceptor* m_pInterceptor; - CIIAObj* m_pImpIOleIPActiveObject; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; @@ -120,6 +130,11 @@ private: ::com::sun::star::frame::XFrame > DocumentFrame(); + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor > + CreateNewInterceptor(); + + void ClearInterceptorInternally(); + public: @@ -139,7 +154,7 @@ public: DocumentHolder( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, - EmbedDocument_Impl *pOLEInterface); + const ::rtl::Reference< EmbeddedDocumentInstanceAccess_Impl >& xOleAccess ); ~DocumentHolder(); |