[Libreoffice-commits] core.git: configmgr/source

[Stephan Bergmann]

 configmgr/source/parsemanager.cxx |    6 +++---
 configmgr/source/parsemanager.hxx |    1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 161681e40bc281404275e12b775e8267fe790100
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Fri Dec 5 14:32:31 2014 +0100

    Revert "Log parsing time of each xcd file"
    
    This reverts commit ca85c87bf66d15e689cb09daf5dab5c4467046bc,
    c57fb9ea459f08c33a4b8c129938411a59a19b77 "Use xmlreader::XmlReader::getUrl" 
was
    meant for real.

diff --git a/configmgr/source/parsemanager.cxx 
b/configmgr/source/parsemanager.cxx
index 008f2bf..dab0c49 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 74fa131..85ed3c5 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_;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits