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

writerfilter: drop global 'using' from XPathLogger

Browse Source 
Change-Id: I8686a0aa3786284ab946d3c58b458ad211eb347d
This commit is contained in:
Miklos Vajna
2014-05-18 16:10:47 +02:00
parent 1f6017f758
commit ab06a1b74c
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
writerfilter/inc/resourcemodel/XPathLogger.hxx
View File

@@ -29,19 +29,16 @@
namespace writerfilter namespace writerfilter
{ {
using ::std::stack;
using ::std::string;
using ::std::vector;
class XPathLogger class XPathLogger
{ {
typedef boost::unordered_map<string, unsigned int> TokenMap_t; typedef boost::unordered_map<std::string, unsigned int> TokenMap_t;
typedef boost::shared_ptr<TokenMap_t> TokenMapPointer_t; typedef boost::shared_ptr<TokenMap_t> TokenMapPointer_t;
TokenMapPointer_t mp_tokenMap; TokenMapPointer_t mp_tokenMap;
stack<TokenMapPointer_t> m_tokenMapStack; std::stack<TokenMapPointer_t> m_tokenMapStack;
vector<string> m_path; std::vector<std::string> m_path;
string m_currentPath; std::string m_currentPath;
void updateCurrentPath(); void updateCurrentPath();
@@ -49,8 +46,8 @@ public:
explicit XPathLogger(); explicit XPathLogger();
virtual ~XPathLogger(); virtual ~XPathLogger();
string getXPath() const; std::string getXPath() const;
void startElement(string _token); void startElement(std::string _token);
void endElement(); void endElement();
}; };
} }

6
writerfilter/source/resourcemodel/XPathLogger.cxx
View File

@@ -33,7 +33,7 @@ XPathLogger::~XPathLogger()
{ {
} }
string XPathLogger::getXPath() const std::string XPathLogger::getXPath() const
{ {
return m_currentPath; return m_currentPath;
} }
@@ -42,7 +42,7 @@ void XPathLogger::updateCurrentPath()
{ {
m_currentPath = ""; m_currentPath = "";
for (vector<string>::const_iterator aIt = m_path.begin(); for (std::vector<std::string>::const_iterator aIt = m_path.begin();
aIt != m_path.end(); aIt != m_path.end();
++aIt) ++aIt)
{ {
@@ -53,7 +53,7 @@ void XPathLogger::updateCurrentPath()
} }
} }
void XPathLogger::startElement(string _token) void XPathLogger::startElement(std::string _token)
{ {
TokenMap_t::const_iterator aIt = mp_tokenMap->find(_token); TokenMap_t::const_iterator aIt = mp_tokenMap->find(_token);