diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:20:19 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:20:19 +0000 |
| commit | 2dbfca82d581d15ffba8ecabd21e463d4e39b635 (patch) | |
| tree | 362092050eb043bc087e5a8e82821d89d98537d2 /configmgr | |
| parent | 2400263a7a6d393ce1f45c6495ff5f4f09900c30 (diff) | |
INTEGRATION: CWS warnings01 (1.13.26); FILE MERGED
2006/02/14 10:17:30 cd 1.13.26.5: #i55991# Fix warnings for ms c++ compiler
2005/11/01 12:47:13 cd 1.13.26.4: #i53898# Warning free code for sun solaris compiler
2005/10/25 10:38:45 cd 1.13.26.3: #i53898# Make code warning free for gcc and non-pro build
2005/09/22 16:40:43 sb 1.13.26.2: RESYNC: (1.13-1.14); FILE MERGED
2005/09/06 12:27:38 cd 1.13.26.1: #i53898# Make code warning free
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/backend/schemabuilder.cxx | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/configmgr/source/backend/schemabuilder.cxx b/configmgr/source/backend/schemabuilder.cxx index c77149d7fde5..6e63b6b3a9cb 100644 --- a/configmgr/source/backend/schemabuilder.cxx +++ b/configmgr/source/backend/schemabuilder.cxx @@ -4,9 +4,9 @@ * * $RCSfile: schemabuilder.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: rt $ $Date: 2005-09-08 03:33:52 $ + * last change: $Author: hr $ $Date: 2006-06-19 23:20:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -69,19 +69,24 @@ namespace configmgr namespace SchemaAttribute = backenduno::SchemaAttribute; // ----------------------------------------------------------------------------- +//#if OSL_DEBUG_LEVEL > 0 +// currently not used in debug builds +#if 0 static void check_if_complete(MergedComponentData & md, SchemaBuilder::Context const & xContext) { uno::Reference< backenduno::XSchemaHandler > test(new SchemaBuilder(xContext, OUString(),md,NULL)); } +#endif // ----------------------------------------------------------------------------- SchemaBuilder::SchemaBuilder(Context const & xContext, const OUString& aExpectedComponentName, MergedComponentData & rData, ITemplateDataProvider* aTemplateProvider ) : m_aData(rData) -, m_aContext(xContext,static_cast<backenduno::XSchemaHandler*>(this), aExpectedComponentName, aTemplateProvider ) +, m_aContext(xContext) +//, m_aContext(xContext,static_cast<backenduno::XSchemaHandler*>(this), aExpectedComponentName, aTemplateProvider ) , m_aFactory() { - + m_aContext = DataBuilderContext(xContext,static_cast<backenduno::XSchemaHandler*>(this), aExpectedComponentName, aTemplateProvider ); } // ----------------------------------------------------------------------------- @@ -137,7 +142,7 @@ void SAL_CALL SchemaBuilder::endSchema( ) } // ----------------------------------------------------------------------------- -void SAL_CALL SchemaBuilder::importComponent( const OUString& aName ) +void SAL_CALL SchemaBuilder::importComponent( const OUString& /*aName*/ ) throw (MalformedDataException, lang::WrappedTargetException, uno::RuntimeException) { //OSL_TRACE("WARNING: Configuration schema parser: Cross-component references are not yet supported\n"); @@ -540,8 +545,10 @@ namespace std::auto_ptr<INode> pTemplateInstance = aResult.extractDataAndClear(); pTemplateInstance->setName(_aName); - ISubtree * pAddedTree = rParent.addChild(pTemplateInstance)->asISubtree(); - OSL_ENSURE(pAddedTree, "Could not obtain added template instance"); + + // Add template instance - must be a tree as any template + OSL_VERIFY( + rParent.addChild(pTemplateInstance)->asISubtree() ); } } // ----------------------------------------------------------------------------- |