strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS chart2mst3 (1.17.4); FILE MERGED

Browse source 
2006/11/30 14:06:12 mba 1.17.4.3: #i64497#: parent is now set before objects are loaded
2006/10/18 20:57:35 bm 1.17.4.2: RESYNC: (1.17-1.20); FILE MERGED
2006/10/13 16:05:56 mba 1.17.4.1: #i64497#: make sure that parent of documents is set before loading it as some documents (chart2!) need this
This commit is contained in:
Vladimir Glazounov 2007-05-22 18:35:12 +00:00
parent b9a6821a5e
commit 64b6cea2ec
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
embeddedobj/source/commonembedding/miscobj.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: miscobj.cxx,v $
*
* $Revision: 1.20 $
* $Revision: 1.21 $
*
* last change: $Author: obo $ $Date: 2006-10-12 11:20:29 $
* last change: $Author: vg $ $Date: 2007-05-22 19:35:12 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -90,6 +90,7 @@ OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Reference< lang::XMulti
, m_bWaitSaveCompleted( sal_False )
, m_bIsLink( sal_False )
, m_bLinkHasPassword( sal_False )
, m_bHasCachedSize( sal_False )
{
CommonInit_Impl( aObjProps );
}
@ -113,6 +114,7 @@ OCommonEmbeddedObject::OCommonEmbeddedObject(
, m_bWaitSaveCompleted( sal_False )
, m_bIsLink( sal_True )
, m_bLinkHasPassword( sal_False )
, m_bHasCachedSize( sal_False )
{
// linked object has no own persistence so it is in loaded state starting from creation
LinkInit_Impl( aObjProps, aMediaDescr, aObjectDescr );
@ -264,6 +266,10 @@ void OCommonEmbeddedObject::LinkInit_Impl(
aObjectDescr[nObjInd].Value >>= xDispatchInterceptor;
break;
}
else if ( aObjectDescr[nObjInd].Name.equalsAscii( "Parent" ) )
{
aObjectDescr[nObjInd].Value >>= m_xParent;
}
CommonInit_Impl( aObjectProps );