diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-03-15 10:38:18 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-03-15 10:38:18 +0000 |
| commit | 7d6f3474264fddf8c2da82df286c05b3cfb6150f (patch) | |
| tree | cd94a956de3768e7334624c52bc208edd03ad720 /embeddedobj/source | |
| parent | 415ebdd04b49f75a8d8d51e37c7c11a2af0f968b (diff) | |
INTEGRATION: CWS mav17 (1.13.12); FILE MERGED
2005/03/02 18:20:11 mav 1.13.12.2: RESYNC: (1.13-1.14); FILE MERGED
2005/02/24 14:09:40 mav 1.13.12.1: #i41699# creation of an object from clipboard
Diffstat (limited to 'embeddedobj/source')
| -rw-r--r-- | embeddedobj/source/inc/oleembobj.hxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx index c9427e2da506..bada8ba49822 100644 --- a/embeddedobj/source/inc/oleembobj.hxx +++ b/embeddedobj/source/inc/oleembobj.hxx @@ -2,9 +2,9 @@ * * $RCSfile: oleembobj.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: vg $ $Date: 2005-02-25 09:21:40 $ + * last change: $Author: obo $ $Date: 2005-03-15 11:38:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -180,6 +180,9 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper3 // points to own view provider if the the object has no server OwnView_Impl* m_pOwnView; + // whether the object should be initialized from clipboard in case of default initialization + sal_Bool m_bFromClipboard; + protected: void SwitchComponentToRunningState_Impl(); @@ -243,6 +246,9 @@ public: OleEmbeddedObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, sal_Bool bLink ); + // this constructor let object be initialized from clipboard + OleEmbeddedObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); + virtual ~OleEmbeddedObject(); sal_Bool SaveObject_Impl(); @@ -250,6 +256,7 @@ public: void CreateOleComponent_Impl( OleComponent* pOleComponent = NULL ); void CreateOleComponentAndLoad_Impl( OleComponent* pOleComponent = NULL ); + void CreateOleComponentFromClipboard_Impl( OleComponent* pOleComponent = NULL ); void SetObjectIsLink_Impl( sal_Bool bIsLink ) { m_bIsLink = bIsLink; } |