diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-08-31 13:58:23 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-08-31 13:58:23 +0000 |
| commit | c3b7353ad0fb2ec41938b8aa3b02c2cd6f80f7e0 (patch) | |
| tree | 70aae5ae90224f21a1285936a00e92bad7e33eb3 /configmgr | |
| parent | 6b138da2922b8e8512f264fe7e6b0e8309cc00df (diff) | |
INTEGRATION: CWS cfglogging (1.5.120); FILE MERGED
2004/08/27 07:49:00 jb 1.5.120.1: #i25940#,#i25939# Add log output to parsing services
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/xml/basicparser.cxx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/configmgr/source/xml/basicparser.cxx b/configmgr/source/xml/basicparser.cxx index fc93e6e2ed5e..b290f1e229b7 100644 --- a/configmgr/source/xml/basicparser.cxx +++ b/configmgr/source/xml/basicparser.cxx @@ -2,9 +2,9 @@ * * $RCSfile: basicparser.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2003-04-15 17:19:20 $ + * last change: $Author: kz $ $Date: 2004-08-31 14:58:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,13 +85,14 @@ namespace typedef uno::Reference< script::XTypeConverter > TypeConverter; static inline - uno::Reference< uno::XInterface > createTCV(BasicParser::ServiceFactory const & _xSvcFactory) + uno::Reference< uno::XInterface > createTCV(BasicParser::Context const & _xContext) { - OSL_ENSURE(_xSvcFactory.is(),"Cannot create Parser without a ServiceManager"); + OSL_ENSURE(_xContext.is(),"Cannot create Parser without a Context"); static const rtl::OUString k_sTCVService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter")); - return TypeConverter::query(_xSvcFactory->createInstance(k_sTCVService)); + uno::Reference< lang::XMultiComponentFactory > xSvcFactory = _xContext->getServiceManager(); + return TypeConverter::query(xSvcFactory->createInstanceWithContext(k_sTCVService,_xContext)); } static inline @@ -140,10 +141,10 @@ struct BasicParser::ValueData : ValueConverter }; // ----------------------------------------------------------------------------- -BasicParser::BasicParser(ServiceFactory const & _xSvcFactory) -: m_xTypeConverter( createTCV(_xSvcFactory) ) +BasicParser::BasicParser(Context const & _xContext) +: m_xTypeConverter( createTCV(_xContext) ) , m_xLocator(NULL) -, m_aDataParser() +, m_aDataParser(Logger(_xContext)) , m_aNodes() , m_aValueType() , m_pValueData(NULL) @@ -531,6 +532,7 @@ void BasicParser::raiseParseException( uno::Any const & _aTargetException, sal_C if (_aTargetException >>= aEx) sMessage += aEx.Message; + getLogger().error(sMessage,"parse","configuration::xml::BasicParser"); throw sax::SAXException( sMessage, *this, _aTargetException ); } // ----------------------------------------------------------------------------- @@ -544,6 +546,7 @@ void BasicParser::raiseParseException( sal_Char const * _pMsg ) OUString const sMessage = OUString::createFromAscii(_pMsg); + getLogger().error(sMessage,"parse","configuration::xml::BasicParser"); throw sax::SAXException( sMessage, *this, uno::Any() ); } // ----------------------------------------------------------------------------- |