diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-25 08:21:15 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-25 08:21:15 +0000 |
commit | 0e9878fa1dbb6c3c9dfd9a0fab126a6988263bd1 (patch) | |
tree | 5b13687e9b88777d9d98c43fc9a5af754a44cf09 /embeddedobj/source/commonembedding/miscobj.cxx | |
parent | 33a6159ba1a61c11323068b8dd63ebe562e1e9d0 (diff) |
INTEGRATION: CWS mav16 (1.13.2); FILE MERGED
2005/02/09 12:37:44 mav 1.13.2.1: #i41990# no possibility to activate object during activation
Diffstat (limited to 'embeddedobj/source/commonembedding/miscobj.cxx')
-rw-r--r-- | embeddedobj/source/commonembedding/miscobj.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index b7aa41c3b7..c634737d6a 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: miscobj.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: rt $ $Date: 2005-01-31 09:01:20 $ + * last change: $Author: vg $ $Date: 2005-02-25 09:21:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,6 +106,7 @@ OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Reference< lang::XMulti , m_bDisposed( sal_False ) , m_bClosed( sal_False ) , m_nObjectState( -1 ) +, m_nTargetState( -1 ) , m_nUpdateMode ( embed::EmbedUpdateModes::ALWAYS_UPDATE ) , m_xFactory( xFactory ) , m_nMiscStatus( 0 ) @@ -128,6 +129,7 @@ OCommonEmbeddedObject::OCommonEmbeddedObject( , m_bDisposed( sal_False ) , m_bClosed( sal_False ) , m_nObjectState( embed::EmbedStates::LOADED ) +, m_nTargetState( -1 ) , m_nUpdateMode ( embed::EmbedUpdateModes::ALWAYS_UPDATE ) , m_xFactory( xFactory ) , m_nMiscStatus( 0 ) |