summaryrefslogtreecommitdiff
path: root/embeddedobj/source/msole/olemisc.cxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-03-15 10:39:15 +0000
committerOliver Bolte <obo@openoffice.org>2005-03-15 10:39:15 +0000
commit03a579fb44b93b8489e48d19cbb62ecb6b4d8eb0 (patch)
tree95ed35ddb53266412d155c8e848bd7d6f759b5b9 /embeddedobj/source/msole/olemisc.cxx
parent507e3ee1f3c3570bd92e79000f5bc523d36cc938 (diff)
INTEGRATION: CWS mav17 (1.15.12); FILE MERGED
2005/03/07 13:13:05 mav 1.15.12.3: #i41699# set the member 2005/03/02 18:20:43 mav 1.15.12.2: RESYNC: (1.15-1.16); FILE MERGED 2005/02/24 14:09:41 mav 1.15.12.1: #i41699# creation of an object from clipboard
Diffstat (limited to 'embeddedobj/source/msole/olemisc.cxx')
-rw-r--r--embeddedobj/source/msole/olemisc.cxx32
1 files changed, 30 insertions, 2 deletions
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index 53413b77278c..e823bbbbb8d4 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: olemisc.cxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: vg $ $Date: 2005-02-25 09:22:20 $
+ * last change: $Author: obo $ $Date: 2005-03-15 11:39:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -108,6 +108,7 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF
, m_nStatus( 0 )
, m_nStatusAspect( 0 )
, m_pOwnView( NULL )
+, m_bFromClipboard( sal_False )
{
}
@@ -135,9 +136,36 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF
, m_nStatus( 0 )
, m_nStatusAspect( 0 )
, m_pOwnView( NULL )
+, m_bFromClipboard( sal_False )
{
}
+//------------------------------------------------------
+// this constructor let object be initialized from clipboard
+OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory )
+: m_pOleComponent( NULL )
+, m_pInterfaceContainer( NULL )
+, m_bReadOnly( sal_False )
+, m_bDisposed( sal_False )
+, m_nObjectState( -1 )
+, m_nTargetState( -1 )
+, m_nUpdateMode ( embed::EmbedUpdateModes::ALWAYS_UPDATE )
+, m_xFactory( xFactory )
+, m_bWaitSaveCompleted( sal_False )
+, m_bVisReplInStream( sal_True )
+, m_bStoreVisRepl( sal_True )
+, m_bNewVisReplInStream( sal_True )
+, m_bIsLink( sal_False )
+, m_bHasCachedSize( sal_False )
+, m_bHasSizeToSet( sal_False )
+, m_nCachedAspect( 0 )
+, m_bGotStatus( sal_False )
+, m_nStatus( 0 )
+, m_nStatusAspect( 0 )
+, m_pOwnView( NULL )
+, m_bFromClipboard( sal_True )
+{
+}
//------------------------------------------------------
OleEmbeddedObject::~OleEmbeddedObject()