diff options
author | Gabor Kelemen <gabor.kelemen.extern@allotropia.de> | 2023-02-14 23:25:40 +0100 |
---|---|---|
committer | Gabor Kelemen <kelemeng@ubuntu.com> | 2023-02-15 18:39:38 +0000 |
commit | 259ae22056b34f3477fc7ac0f31666dec41bf8ea (patch) | |
tree | e1f2818b39104941e5ab26eee1eb7af1fb93227a | |
parent | c95597ac428f6515df232a07e82af75f4e0e242a (diff) |
Drop 'using namespace ::std' in dirs [e-p]*
Change-Id: Ibe6a2f662f5721c594d28a8e0d7340d0f3cffe95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147075
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com>
-rw-r--r-- | editeng/source/uno/unonrule.cxx | 1 | ||||
-rw-r--r-- | framework/source/fwe/classes/addonsoptions.cxx | 1 | ||||
-rw-r--r-- | framework/source/helper/oframes.cxx | 1 | ||||
-rw-r--r-- | i18npool/source/localedata/saxparser.cxx | 3 | ||||
-rw-r--r-- | io/source/stm/odata.cxx | 3 | ||||
-rw-r--r-- | io/source/stm/omark.cxx | 17 | ||||
-rw-r--r-- | lingucomponent/source/languageguessing/guesslang.cxx | 11 | ||||
-rw-r--r-- | package/source/manifest/ManifestReader.cxx | 3 |
8 files changed, 16 insertions, 24 deletions
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 04403cf19a69..055fce8d5d4a 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -50,7 +50,6 @@ using ::com::sun::star::util::XCloneable; using ::com::sun::star::ucb::XAnyCompare; -using namespace ::std; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index b97a7eac6099..5aa0638481e8 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -43,7 +43,6 @@ // namespaces -using namespace ::std; using namespace ::utl; using namespace ::osl; using namespace ::com::sun::star::uno; diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index a58949852d43..2fd43c8a52a3 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::cppu; using namespace ::osl; -using namespace ::std; // constructor diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx index d13e99bb7345..8cad894951a1 100644 --- a/i18npool/source/localedata/saxparser.cxx +++ b/i18npool/source/localedata/saxparser.cxx @@ -40,7 +40,6 @@ #include "LocaleNode.hxx" -using namespace ::std; using namespace ::cppu; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -183,7 +182,7 @@ public: // Error handler public: // ExtendedDocumentHandler - stack<LocaleNode *> currentNode ; + std::stack<LocaleNode *> currentNode ; LocaleNode * rootNode; virtual void SAL_CALL startDocument() override diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index 7d39a5835852..6b19585da942 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -40,7 +40,6 @@ using namespace ::cppu; using namespace ::osl; -using namespace ::std; using namespace ::com::sun::star::io; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -1039,7 +1038,7 @@ private: Reference < XComponentContext > m_rCxt; bool m_bValidMarkable; Reference < XMarkableStream > m_rMarkable; - vector < Reference< XPersistObject > > m_aPersistVector; + std::vector < Reference< XPersistObject > > m_aPersistVector; }; diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index d4bf6c74169a..3e6127d7310e 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -40,7 +40,6 @@ #include <osl/diagnose.h> #include <mutex> -using namespace ::std; using namespace ::cppu; using namespace ::osl; using namespace ::com::sun::star::io; @@ -116,7 +115,7 @@ private: bool m_bValidStream; MemRingBuffer m_aRingBuffer; - map<sal_Int32,sal_Int32,less< sal_Int32 > > m_mapMarks; + std::map<sal_Int32,sal_Int32,std::less< sal_Int32 > > m_mapMarks; sal_Int32 m_nCurrentPos; sal_Int32 m_nCurrentMark; @@ -204,7 +203,7 @@ sal_Int32 OMarkableOutputStream::createMark() void OMarkableOutputStream::deleteMark(sal_Int32 Mark) { std::unique_lock guard( m_mutex ); - map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii = m_mapMarks.find( Mark ); + std::map<sal_Int32,sal_Int32,std::less<sal_Int32> >::iterator ii = m_mapMarks.find( Mark ); if( ii == m_mapMarks.end() ) { throw IllegalArgumentException( @@ -218,7 +217,7 @@ void OMarkableOutputStream::deleteMark(sal_Int32 Mark) void OMarkableOutputStream::jumpToMark(sal_Int32 nMark) { std::unique_lock guard( m_mutex ); - map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii = m_mapMarks.find( nMark ); + std::map<sal_Int32,sal_Int32,std::less<sal_Int32> >::iterator ii = m_mapMarks.find( nMark ); if( ii == m_mapMarks.end() ) { throw IllegalArgumentException( @@ -239,7 +238,7 @@ sal_Int32 OMarkableOutputStream::offsetToMark(sal_Int32 nMark) { std::unique_lock guard( m_mutex ); - map<sal_Int32,sal_Int32,less<sal_Int32> >::const_iterator ii = m_mapMarks.find( nMark ); + std::map<sal_Int32,sal_Int32,std::less<sal_Int32> >::const_iterator ii = m_mapMarks.find( nMark ); if( ii == m_mapMarks.end() ) { @@ -424,7 +423,7 @@ private: bool m_bValidStream; std::unique_ptr<MemRingBuffer> m_pBuffer; - map<sal_Int32,sal_Int32,less< sal_Int32 > > m_mapMarks; + std::map<sal_Int32,sal_Int32,std::less< sal_Int32 > > m_mapMarks; sal_Int32 m_nCurrentPos; sal_Int32 m_nCurrentMark; @@ -600,7 +599,7 @@ sal_Int32 OMarkableInputStream::createMark() void OMarkableInputStream::deleteMark(sal_Int32 Mark) { std::unique_lock guard( m_mutex ); - map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii = m_mapMarks.find( Mark ); + std::map<sal_Int32,sal_Int32,std::less<sal_Int32> >::iterator ii = m_mapMarks.find( Mark ); if( ii == m_mapMarks.end() ) { throw IllegalArgumentException( @@ -614,7 +613,7 @@ void OMarkableInputStream::deleteMark(sal_Int32 Mark) void OMarkableInputStream::jumpToMark(sal_Int32 nMark) { std::unique_lock guard( m_mutex ); - map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii = m_mapMarks.find( nMark ); + std::map<sal_Int32,sal_Int32,std::less<sal_Int32> >::iterator ii = m_mapMarks.find( nMark ); if( ii == m_mapMarks.end() ) { @@ -635,7 +634,7 @@ void OMarkableInputStream::jumpToFurthest() sal_Int32 OMarkableInputStream::offsetToMark(sal_Int32 nMark) { std::unique_lock guard( m_mutex ); - map<sal_Int32,sal_Int32,less<sal_Int32> >::const_iterator ii = m_mapMarks.find( nMark ); + std::map<sal_Int32,sal_Int32,std::less<sal_Int32> >::const_iterator ii = m_mapMarks.find( nMark ); if( ii == m_mapMarks.end() ) { diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index d6d5803a51a7..76576337914a 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -46,7 +46,6 @@ #include <textcat.h> #endif -using namespace ::std; using namespace ::osl; using namespace ::cppu; using namespace ::com::sun::star; @@ -194,7 +193,7 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getAvailableLanguages( ) EnsureInitialized(); Sequence< css::lang::Locale > aRes; - vector<Guess> gs = m_aGuesser.GetAllManagedLanguages(); + std::vector<Guess> gs = m_aGuesser.GetAllManagedLanguages(); aRes.realloc(gs.size()); css::lang::Locale *pRes = aRes.getArray(); @@ -216,7 +215,7 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getEnabledLanguages( ) EnsureInitialized(); Sequence< css::lang::Locale > aRes; - vector<Guess> gs = m_aGuesser.GetAvailableLanguages(); + std::vector<Guess> gs = m_aGuesser.GetAvailableLanguages(); aRes.realloc(gs.size()); css::lang::Locale *pRes = aRes.getArray(); @@ -238,7 +237,7 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getDisabledLanguages( ) EnsureInitialized(); Sequence< css::lang::Locale > aRes; - vector<Guess> gs = m_aGuesser.GetUnavailableLanguages(); + std::vector<Guess> gs = m_aGuesser.GetUnavailableLanguages(); aRes.realloc(gs.size()); css::lang::Locale *pRes = aRes.getArray(); @@ -262,7 +261,7 @@ void SAL_CALL LangGuess_Impl::disableLanguages( for (const Locale& rLanguage : rLanguages) { - string language; + std::string language; OString l = OUStringToOString( rLanguage.Language, RTL_TEXTENCODING_ASCII_US ); OString c = OUStringToOString( rLanguage.Country, RTL_TEXTENCODING_ASCII_US ); @@ -283,7 +282,7 @@ void SAL_CALL LangGuess_Impl::enableLanguages( for (const Locale& rLanguage : rLanguages) { - string language; + std::string language; OString l = OUStringToOString( rLanguage.Language, RTL_TEXTENCODING_ASCII_US ); OString c = OUStringToOString( rLanguage.Country, RTL_TEXTENCODING_ASCII_US ); diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx index e79d005cb17a..2a60feff02d4 100644 --- a/package/source/manifest/ManifestReader.cxx +++ b/package/source/manifest/ManifestReader.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/xml/sax/Parser.hpp> #include <vector> -using namespace ::std; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::io; @@ -51,7 +50,7 @@ Sequence< Sequence< PropertyValue > > SAL_CALL ManifestReader::readManifestSeque Reference < XParser > xParser = Parser::create(m_xContext); try { - vector < Sequence < PropertyValue > > aManVector; + std::vector < Sequence < PropertyValue > > aManVector; Reference < XDocumentHandler > xFilter = new ManifestImport( aManVector ); InputSource aParserInput; aParserInput.aInputStream = rStream; |