Skip to content

C
core
Kaydet (Commit) d2aa21c6 authored tarafından Andreas Bregas's avatar Andreas Bregas
Dosyalara gözat
Seçenekler

mib18: #163254# Set right name and parent for copied object class members

üst 20e2562e
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
basic/source/classes/sb.cxx
Dosyayı görüntüle @ d2aa21c6
...@@ -571,12 +571,16 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule ) ...@@ -571,12 +571,16 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
{ {
SbModule* pClassModule = pClassModuleObj->getClassModule(); SbModule* pClassModule = pClassModuleObj->getClassModule();
SbClassModuleObject* pNewObj = new SbClassModuleObject( pClassModule ); SbClassModuleObject* pNewObj = new SbClassModuleObject( pClassModule );
pNewObj->SetName( pProp->GetName() );
pNewObj->SetParent( pClassModule->pParent );
pNewProp->PutObject( pNewObj ); pNewProp->PutObject( pNewObj );
} }
else if( aObjClass.EqualsIgnoreCaseAscii( "Collection" ) ) else if( aObjClass.EqualsIgnoreCaseAscii( "Collection" ) )
{ {
String aCollectionName( RTL_CONSTASCII_USTRINGPARAM("Collection") ); String aCollectionName( RTL_CONSTASCII_USTRINGPARAM("Collection") );
BasicCollection* pNewCollection = new BasicCollection( aCollectionName ); BasicCollection* pNewCollection = new BasicCollection( aCollectionName );
pNewCollection->SetName( pProp->GetName() );
pNewCollection->SetParent( pClassModule->pParent );
pNewProp->PutObject( pNewCollection ); pNewProp->PutObject( pNewCollection );
} }
} }
......
basic/source/comp/sbcomp.cxx
Dosyayı görüntüle @ d2aa21c6
...@@ -261,7 +261,7 @@ void dbg_traceNotifyCall( SbModule* pModule, SbMethod* pMethod, INT32 nCallLvl, ...@@ -261,7 +261,7 @@ void dbg_traceNotifyCall( SbModule* pModule, SbMethod* pMethod, INT32 nCallLvl,
{ {
aStr.AppendAscii( "Entering " ); aStr.AppendAscii( "Entering " );
} }
String aModuleName = pModule->GetName(); String aModuleName = pTraceMod->GetName();
aStr += aModuleName; aStr += aModuleName;
if( pMethod != NULL ) if( pMethod != NULL )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment