diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-18 15:18:09 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-18 17:11:23 +0200 |
| commit | f6f41960fa7171ca52da1668862cf3accfc81421 (patch) | |
| tree | 74fd92319f9efc8b43b5fef7108bdde4ceb84625 /writerfilter | |
| parent | c623612b0bd0bbd2307a19ccf3c2f1f343b932b3 (diff) | |
writerfilter: clean up two 'using' statement from header files
Change-Id: I47f3d0c68668d03db3c5f3187414833aa3097424
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/inc/resourcemodel/QNameToString.hxx | 7 | ||||
| -rw-r--r-- | writerfilter/inc/resourcemodel/TableManager.hxx | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/writerfilter/inc/resourcemodel/QNameToString.hxx b/writerfilter/inc/resourcemodel/QNameToString.hxx index a69bfc3abe8c..5fe3c692a943 100644 --- a/writerfilter/inc/resourcemodel/QNameToString.hxx +++ b/writerfilter/inc/resourcemodel/QNameToString.hxx @@ -28,12 +28,11 @@ namespace writerfilter { -using namespace ::std; class QNameToString { typedef boost::shared_ptr<QNameToString> Pointer_t; - typedef map < Id, string > Map; + typedef std::map < Id, string > Map; static Pointer_t pInstance; @@ -59,7 +58,7 @@ class SprmIdToString static Pointer_t pInstance; - map<sal_uInt32, string> mMap; + std::map<sal_uInt32, string> mMap; protected: /** @@ -70,7 +69,7 @@ protected: public: static Pointer_t Instance(); #ifdef DEBUG_LOGGING - string operator()(sal_uInt32 nId); + std::string operator()(sal_uInt32 nId); #endif }; diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx index 312e42a4b8da..68b4359b1658 100644 --- a/writerfilter/inc/resourcemodel/TableManager.hxx +++ b/writerfilter/inc/resourcemodel/TableManager.hxx @@ -38,8 +38,6 @@ namespace writerfilter { -using namespace ::std; - /** Class to handle events generated by TableManager::resolveCurrentTable */ @@ -132,7 +130,7 @@ class TableManager /** properties of the current table */ - stack<PropertiesPointer> mTableProps; + std::stack<PropertiesPointer> mTableProps; /** true if at the end of a row @@ -407,7 +405,7 @@ private: for each level of nested tables there is one frame in the stack */ - stack<typename TableData<T, PropertiesPointer>::Pointer_t > mTableDataStack; + std::stack<typename TableData<T, PropertiesPointer>::Pointer_t > mTableDataStack; typename RowData<T, PropertiesPointer>::Pointer_t mpUnfinishedRow; bool mbKeepUnfinishedRow; |