diff options
Diffstat (limited to 'sax')
-rw-r--r-- | sax/qa/cppunit/xmlimport.cxx | 11 | ||||
-rw-r--r-- | sax/source/fastparser/fastparser.cxx | 1 | ||||
-rw-r--r-- | sax/source/fastparser/legacyfastparser.cxx | 3 |
3 files changed, 6 insertions, 9 deletions
diff --git a/sax/qa/cppunit/xmlimport.cxx b/sax/qa/cppunit/xmlimport.cxx index 3da498ecded4..cb34ff1f5eb2 100644 --- a/sax/qa/cppunit/xmlimport.cxx +++ b/sax/qa/cppunit/xmlimport.cxx @@ -49,7 +49,6 @@ using namespace css; using namespace uno; using namespace io; using namespace xml::sax; -using namespace std; using namespace ::osl; using namespace sax_fastparser; @@ -71,8 +70,8 @@ class TestDocumentHandler : public cppu::WeakImplHelper< XDocumentHandler > { private: OUString m_aStr; - deque< pair<OUString,OUString> > m_aNamespaceStack; - stack<sal_uInt16> m_aCountStack; + std::deque< std::pair<OUString,OUString> > m_aNamespaceStack; + std::stack<sal_uInt16> m_aCountStack; OUString canonicalform(const OUString &sName, const OUString &sValue, bool isElement); OUString getNamespace(std::u16string_view sName); @@ -126,7 +125,7 @@ OUString TestDocumentHandler::getNamespace(std::u16string_view sName) { for (sal_Int16 i = m_aNamespaceStack.size() - 1; i>=0; i--) { - pair<OUString, OUString> aPair = m_aNamespaceStack.at(i); + std::pair<OUString, OUString> aPair = m_aNamespaceStack.at(i); if (aPair.first == sName) return aPair.second; } @@ -137,8 +136,8 @@ void SAL_CALL TestDocumentHandler::startDocument() { m_aStr.clear(); m_aNamespaceStack.clear(); - m_aNamespaceStack.emplace_back( make_pair( OUString( "default" ), OUString() ) ); - m_aCountStack = stack<sal_uInt16>(); + m_aNamespaceStack.emplace_back( std::make_pair( OUString( "default" ), OUString() ) ); + m_aCountStack = std::stack<sal_uInt16>(); m_aCountStack.emplace(0); } diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 86bd8a734b63..97435e2219ea 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -54,7 +54,6 @@ // Inverse of libxml's BAD_CAST. #define XML_CAST( str ) reinterpret_cast< const char* >( str ) -using namespace std; using namespace ::osl; using namespace ::cppu; using namespace ::com::sun::star::uno; diff --git a/sax/source/fastparser/legacyfastparser.cxx b/sax/source/fastparser/legacyfastparser.cxx index c748eb057fbe..d32b12d8a5f9 100644 --- a/sax/source/fastparser/legacyfastparser.cxx +++ b/sax/source/fastparser/legacyfastparser.cxx @@ -29,7 +29,6 @@ #include <memory> #include <vector> -using namespace std; using namespace ::cppu; using namespace css; using namespace uno; @@ -49,7 +48,7 @@ private: NamespaceDefine( const OUString& rPrefix, const OUString& rNamespaceURI ) : m_aPrefix( rPrefix ), m_aNamespaceURI( rNamespaceURI ) {} }; - vector< unique_ptr< NamespaceDefine > > m_aNamespaceDefines; + std::vector< std::unique_ptr< NamespaceDefine > > m_aNamespaceDefines; public: NamespaceHandler(); |