diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2021-10-03 14:17:24 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2021-10-03 19:27:50 +0200 |
| commit | 7e7dd7f152bc7457437f541e7ff88d69e9f8e765 (patch) | |
| tree | 79cf030579ce329aa82a25ecbe0bb3406aa99cd0 /editeng | |
| parent | f7a456af92f3c1c47731b7ad0494e74897aea4d3 (diff) | |
drop 'using namespace std' in desktop, e*, f*
Change-Id: I277dc957798093001f9a3935f97db8ac0314e6a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123022
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/accessibility/AccessibleEditableTextPara.cxx | 3 | ||||
| -rw-r--r-- | editeng/source/lookuptree/Trie.cxx | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 70d7ed49b6bd..68243e411e7f 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -68,7 +68,6 @@ #include "AccessibleImageBullet.hxx" #include <svtools/colorcfg.hxx> -using namespace std; #include <editeng/editrids.hrc> #include <editeng/eerdll.hxx> #include <editeng/numitem.hxx> @@ -1276,7 +1275,7 @@ namespace accessibility sal_Int32 i = 0; for( i = 0; i < nLength; i++ ) pIndices[i] = i; - sort( &pIndices[0], &pIndices[nLength], IndexCompare(pPairs) ); + std::sort( &pIndices[0], &pIndices[nLength], IndexCompare(pPairs) ); // create sorted sequences according to index array uno::Sequence<beans::PropertyValue> aNewValues( nLength ); beans::PropertyValue* pNewValues = aNewValues.getArray(); diff --git a/editeng/source/lookuptree/Trie.cxx b/editeng/source/lookuptree/Trie.cxx index 153fe01e1c6d..c994fa7cfb42 100644 --- a/editeng/source/lookuptree/Trie.cxx +++ b/editeng/source/lookuptree/Trie.cxx @@ -16,8 +16,6 @@ namespace editeng { -using namespace std; - /* TrieNode */ struct TrieNode final @@ -36,7 +34,7 @@ struct TrieNode final TrieNode* traversePath(const OUString& sPath); void addNewChild(TrieNode* pChild); void collectSuggestions(std::u16string_view sPath, std::vector<OUString>& rSuggestionList); - static void collectSuggestionsForCurrentNode(TrieNode* pCurrent, std::u16string_view sPath, vector<OUString>& rSuggestionList); + static void collectSuggestionsForCurrentNode(TrieNode* pCurrent, std::u16string_view sPath, std::vector<OUString>& rSuggestionList); }; TrieNode::TrieNode(sal_Unicode aCharacter) : @@ -84,7 +82,7 @@ TrieNode* TrieNode::findChild(sal_Unicode aInputCharacter) return nullptr; } -void TrieNode::collectSuggestions(std::u16string_view sPath, vector<OUString>& rSuggestionList) +void TrieNode::collectSuggestions(std::u16string_view sPath, std::vector<OUString>& rSuggestionList) { // first traverse nodes for alphabet characters for (auto const & pCurrent : mLatinArray) @@ -101,7 +99,7 @@ void TrieNode::collectSuggestions(std::u16string_view sPath, vector<OUString>& r } } -void TrieNode::collectSuggestionsForCurrentNode(TrieNode* pCurrent, std::u16string_view sPath, vector<OUString>& rSuggestionList) +void TrieNode::collectSuggestionsForCurrentNode(TrieNode* pCurrent, std::u16string_view sPath, std::vector<OUString>& rSuggestionList) { OUString aStringPath = sPath + OUStringChar(pCurrent->mCharacter); if(pCurrent->mMarker) @@ -168,7 +166,7 @@ void Trie::insert(const OUString& sInputString) const pCurrent->markWord(); } -void Trie::findSuggestions(const OUString& sWordPart, vector<OUString>& rSuggestionList) const +void Trie::findSuggestions(const OUString& sWordPart, std::vector<OUString>& rSuggestionList) const { TrieNode* pNode = mRoot->traversePath(sWordPart); |