equal
deleted
inserted
replaced
626 // Find the KConfigurationElement to step over any optional xml elements |
626 // Find the KConfigurationElement to step over any optional xml elements |
627 ChspsDomDepthIterator* pluginIter = ChspsDomDepthIterator::NewL( *document.RootNode() ); |
627 ChspsDomDepthIterator* pluginIter = ChspsDomDepthIterator::NewL( *document.RootNode() ); |
628 CleanupStack::PushL( pluginIter ); |
628 CleanupStack::PushL( pluginIter ); |
629 ChspsDomNode* pluginNode = pluginIter->First(); |
629 ChspsDomNode* pluginNode = pluginIter->First(); |
630 TBool steppingtoConfNode(EFalse); |
630 TBool steppingtoConfNode(EFalse); |
631 while(pluginNode && !steppingtoConfNode) |
631 while( pluginNode && !steppingtoConfNode ) |
632 { |
632 { |
633 const TDesC8& pluginNodeName = pluginNode->Name(); |
633 const TDesC8& pluginNodeName = pluginNode->Name(); |
634 |
634 |
635 if( pluginNodeName == KConfigurationElement ) |
635 if( pluginNodeName == KConfigurationElement ) |
636 { |
636 { |
641 pluginNode = pluginIter->NextL(); |
641 pluginNode = pluginIter->NextL(); |
642 } |
642 } |
643 } |
643 } |
644 CleanupStack::PopAndDestroy( pluginIter ); |
644 CleanupStack::PopAndDestroy( pluginIter ); |
645 |
645 |
646 // Copy the plugin configuration to the main document. |
646 if ( pluginNode ) |
647 ChspsDomNode* rootCopy = pluginNode->CloneL( node->StringPool()); |
647 { |
648 rootCopy->SetParent( node ); |
648 // Copy the plugin configuration to the main document. |
649 node->AddChildL( rootCopy ); |
649 ChspsDomNode* rootCopy = pluginNode->CloneL( node->StringPool()); |
|
650 if ( rootCopy ) |
|
651 { |
|
652 rootCopy->SetParent( node ); |
|
653 node->AddChildL( rootCopy ); |
|
654 } |
|
655 } |
650 } // !pluginOdt else |
656 } // !pluginOdt else |
651 |
657 |
652 CleanupStack::PopAndDestroy( pluginOdt ); |
658 CleanupStack::PopAndDestroy( pluginOdt ); |
653 } // KPluginsElement |
659 } // KPluginsElement |
654 } |
660 } |