diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-24 16:44:24 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-24 16:44:24 +0200 |
| commit | c57fb9ea459f08c33a4b8c129938411a59a19b77 (patch) | |
| tree | 47942f44fa8cf5230b29eca0b8b88553b5933c83 | |
| parent | 530334a27e8aba93f81391ddc7f21482e605dd3f (diff) | |
Use xmlreader::XmlReader::getUrl
Change-Id: Idd59fd1324615e575ed812e0c2a7cdfd84a9aeb2
| -rw-r--r-- | configmgr/source/parsemanager.cxx | 6 | ||||
| -rw-r--r-- | configmgr/source/parsemanager.hxx | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/configmgr/source/parsemanager.cxx b/configmgr/source/parsemanager.cxx index 008f2bf69ddf..dab0c496e7c7 100644 --- a/configmgr/source/parsemanager.cxx +++ b/configmgr/source/parsemanager.cxx @@ -35,7 +35,7 @@ namespace configmgr { ParseManager::ParseManager( OUString const & url, rtl::Reference< Parser > const & parser) - : url_(url), reader_(url), parser_(parser), itemNamespaceId_(-1) + : reader_(url), parser_(parser), itemNamespaceId_(-1) { assert(parser.is()); int id; @@ -67,7 +67,7 @@ bool ParseManager::parse(std::set< OUString > const * existingDependencies) { if (!parser_->startElement( reader_, itemNamespaceId_, itemData_, existingDependencies)) { - SAL_INFO("configmgr", "parsing " << url_ << " took " << (osl_getGlobalTimer() - startTime) << " ms, fail"); + SAL_INFO("configmgr", "parsing " << reader_.getUrl() << " took " << (osl_getGlobalTimer() - startTime) << " ms, fail"); return false; } break; @@ -78,7 +78,7 @@ bool ParseManager::parse(std::set< OUString > const * existingDependencies) { parser_->characters(itemData_); break; case xmlreader::XmlReader::RESULT_DONE: - SAL_INFO("configmgr", "parsing " << url_ << " took " << (osl_getGlobalTimer() - startTime) << " ms, success"); + SAL_INFO("configmgr", "parsing " << reader_.getUrl() << " took " << (osl_getGlobalTimer() - startTime) << " ms, success"); return true; } itemData_.clear(); diff --git a/configmgr/source/parsemanager.hxx b/configmgr/source/parsemanager.hxx index 74fa131b1caf..85ed3c5ca4f3 100644 --- a/configmgr/source/parsemanager.hxx +++ b/configmgr/source/parsemanager.hxx @@ -47,7 +47,6 @@ public: enum { NAMESPACE_OOR = 1, NAMESPACE_XS = 2, NAMESPACE_XSI = 3 }; private: - OUString url_; virtual ~ParseManager(); xmlreader::XmlReader reader_; |