mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use xmlreader::XmlReader::getUrl

Browse Source 
Change-Id: Idd59fd1324615e575ed812e0c2a7cdfd84a9aeb2
This commit is contained in:
Stephan Bergmann
2014-10-24 16:44:24 +02:00
parent 530334a27e
commit c57fb9ea45
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configmgr/source/parsemanager.cxx
View File

@@ -35,7 +35,7 @@ namespace configmgr {
ParseManager::ParseManager( ParseManager::ParseManager(
OUString const & url, rtl::Reference< Parser > const & parser) 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()); assert(parser.is());
int id; int id;
@@ -67,7 +67,7 @@ bool ParseManager::parse(std::set< OUString > const * existingDependencies) {
if (!parser_->startElement( if (!parser_->startElement(
reader_, itemNamespaceId_, itemData_, existingDependencies)) 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; return false;
} }
break; break;
@@ -78,7 +78,7 @@ bool ParseManager::parse(std::set< OUString > const * existingDependencies) {
parser_->characters(itemData_); parser_->characters(itemData_);
break; break;
case xmlreader::XmlReader::RESULT_DONE: 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; return true;
} }
itemData_.clear(); itemData_.clear();

1
configmgr/source/parsemanager.hxx
View File

@@ -47,7 +47,6 @@ public:
enum { NAMESPACE_OOR = 1, NAMESPACE_XS = 2, NAMESPACE_XSI = 3 }; enum { NAMESPACE_OOR = 1, NAMESPACE_XS = 2, NAMESPACE_XSI = 3 };
private: private:
OUString url_;
virtual ~ParseManager(); virtual ~ParseManager();
xmlreader::XmlReader reader_; xmlreader::XmlReader reader_;