diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-08-31 14:00:04 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-08-31 14:00:04 +0000 |
| commit | 5318d95539ff13deb660b2a21878f66c61655c4a (patch) | |
| tree | aeca04f041f9b6f2f5276814815569c65bd3aa56 /configmgr | |
| parent | a77a767d0a5c035a48aaaed88905d106a58fc0f4 (diff) | |
INTEGRATION: CWS cfglogging (1.8.156); FILE MERGED
2004/08/27 10:44:26 jb 1.8.156.3: #i25939# Log message was missing error condition
2004/08/27 10:28:09 jb 1.8.156.2: #i25939# Remove spurious newlines from log messages
2004/08/27 07:49:02 jb 1.8.156.1: #i25940#,#i25939# Add log output to parsing services
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/xml/schemaparser.cxx | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/configmgr/source/xml/schemaparser.cxx b/configmgr/source/xml/schemaparser.cxx index 6f2e55d29150..c5cf0f25381f 100644 --- a/configmgr/source/xml/schemaparser.cxx +++ b/configmgr/source/xml/schemaparser.cxx @@ -2,9 +2,9 @@ * * $RCSfile: schemaparser.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: jb $ $Date: 2002-11-22 14:51:57 $ + * last change: $Author: kz $ $Date: 2004-08-31 15:00:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,8 +90,8 @@ namespace configmgr namespace sax = ::com::sun::star::xml::sax; // ----------------------------------------------------------------------------- -SchemaParser::SchemaParser(ServiceFactory const & _xSvcFactory, uno::Reference< backenduno::XSchemaHandler > const & _xHandler, Select _selector) -: BasicParser(_xSvcFactory) +SchemaParser::SchemaParser(Context const & _xContext, uno::Reference< backenduno::XSchemaHandler > const & _xHandler, Select _selector) +: BasicParser(_xContext) , m_xHandler(_xHandler) , m_sComponent() , m_selector(_selector) @@ -404,22 +404,28 @@ void SchemaParser::startValueData(const uno::Reference< sax::XAttributeList >& x BasicParser::startValueData(xAttribs); - OSL_ENSURE(!this->isValueDataLocalized(),"Schema XML parser - language attributes on values are ignored in the schema.\n"); + if (this->isValueDataLocalized()) + getLogger().warning("Language attributes on values are ignored in the schema.", + "endValueData()","configuration::xml::SchemaParser"); } // ----------------------------------------------------------------------------- void SchemaParser::endValueData() { uno::Any aValue = this->getCurrentValue(); - OSL_ENSURE(aValue.hasValue(),"configmgr::SchemaParser Warning: Found deprecated explicit NIL value in schema data."); ElementInfo const & aInfo = this->getActiveNodeInfo(); if (aValue.hasValue()) + { m_xHandler->addPropertyWithDefault(aInfo.name,aInfo.flags,aValue); - + } else + { + getLogger().warning("Found deprecated explicit NIL value in schema data.", + "endValueData()","configuration::xml::SchemaParser"); m_xHandler->addProperty(aInfo.name,aInfo.flags,getActivePropertyType()); + } BasicParser::endValueData(); |