desktop/source/migration/migration.cxx | 1 -
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 3 +--
editeng/source/lookuptree/Trie.cxx | 10 ++++------
emfio/source/reader/emfreader.cxx | 2 --
filter/source/xsltdialog/typedetectionimport.cxx | 1 -
forms/source/xforms/convert.cxx | 1 -
forms/source/xforms/pathexpression.cxx | 1 -
forms/source/xforms/submission/submission_get.cxx | 1 -
forms/source/xforms/submission/submission_post.cxx | 3 +--
forms/source/xforms/submission/submission_put.cxx | 3 +--
framework/source/uielement/fontmenucontroller.cxx | 4 +---
11 files changed, 8 insertions(+), 22 deletions(-)
New commits:
commit 7e7dd7f152bc7457437f541e7ff88d69e9f8e765
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun Oct 3 14:17:24 2021 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Oct 3 19:27:50 2021 +0200
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 <serval2...@yahoo.fr>
diff --git a/desktop/source/migration/migration.cxx
b/desktop/source/migration/migration.cxx
index 92b07f754e17..d1725fd8673d 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -56,7 +56,6 @@
#include <vcl/commandinfoprovider.hxx>
using namespace osl;
-using namespace std;
using namespace com::sun::star::task;
using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
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);
diff --git a/emfio/source/reader/emfreader.cxx
b/emfio/source/reader/emfreader.cxx
index af79b261d1e7..66b281a09d33 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -34,8 +34,6 @@
#include <vcl/pngwrite.hxx>
#endif
-using namespace std;
-
// GDI-Array
#define EMR_HEADER 1
diff --git a/filter/source/xsltdialog/typedetectionimport.cxx
b/filter/source/xsltdialog/typedetectionimport.cxx
index 5d4798faa126..bba302de703c 100644
--- a/filter/source/xsltdialog/typedetectionimport.cxx
+++ b/filter/source/xsltdialog/typedetectionimport.cxx
@@ -32,7 +32,6 @@ using namespace com::sun::star::io;
using namespace com::sun::star::beans;
using namespace com::sun::star::xml::sax;
using namespace com::sun::star;
-using namespace std;
TypeDetectionImporter::TypeDetectionImporter()
{
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index 332262fdb900..acaac1bd7ba8 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -35,7 +35,6 @@
using xforms::Convert;
using com::sun::star::uno::Any;
using com::sun::star::uno::makeAny;
-using namespace std;
using namespace utl;
Convert::Convert()
diff --git a/forms/source/xforms/pathexpression.cxx
b/forms/source/xforms/pathexpression.cxx
index d7ffb6012eca..c26d13d5ad51 100644
--- a/forms/source/xforms/pathexpression.cxx
+++ b/forms/source/xforms/pathexpression.cxx
@@ -33,7 +33,6 @@
using com::sun::star::uno::Reference;
using com::sun::star::xml::dom::XNode;
using com::sun::star::xml::dom::XNodeList;
-using namespace std;
namespace xforms
diff --git a/forms/source/xforms/submission/submission_get.cxx
b/forms/source/xforms/submission/submission_get.cxx
index 880eb1d4df3e..72a9ffc1eee2 100644
--- a/forms/source/xforms/submission/submission_get.cxx
+++ b/forms/source/xforms/submission/submission_get.cxx
@@ -36,7 +36,6 @@ using namespace css::task;
using namespace css::io;
using namespace osl;
using namespace ucbhelper;
-using namespace std;
CSubmissionGet::CSubmissionGet(const OUString& aURL, const
css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
diff --git a/forms/source/xforms/submission/submission_post.cxx
b/forms/source/xforms/submission/submission_post.cxx
index b945fdd07b63..d5629857f81b 100644
--- a/forms/source/xforms/submission/submission_post.cxx
+++ b/forms/source/xforms/submission/submission_post.cxx
@@ -34,7 +34,6 @@ using namespace css::task;
using namespace css::io;
using namespace osl;
using namespace ucbhelper;
-using namespace std;
CSubmissionPost::CSubmissionPost(const OUString& aURL, const
css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
@@ -46,7 +45,7 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const
css::uno::Reference<
{
// PUT always uses application/xml
css::uno::Reference< XCommandEnvironment > aEnvironment;
- unique_ptr< CSerialization >
apSerialization(createSerialization(aInteractionHandler,aEnvironment));
+ std::unique_ptr< CSerialization >
apSerialization(createSerialization(aInteractionHandler,aEnvironment));
try {
ucbhelper::Content
aContent(m_aURLObj.GetMainURL(INetURLObject::DecodeMechanism::NONE),
aEnvironment, comphelper::getProcessComponentContext());
diff --git a/forms/source/xforms/submission/submission_put.cxx
b/forms/source/xforms/submission/submission_put.cxx
index f3f94fafa256..071e527ea226 100644
--- a/forms/source/xforms/submission/submission_put.cxx
+++ b/forms/source/xforms/submission/submission_put.cxx
@@ -33,7 +33,6 @@ using namespace css::task;
using namespace css::io;
using namespace osl;
using namespace ucbhelper;
-using namespace std;
CSubmissionPut::CSubmissionPut(const OUString& aURL, const
css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
@@ -44,7 +43,7 @@ CSubmissionPut::CSubmissionPut(const OUString& aURL, const
css::uno::Reference<
CSubmission::SubmissionResult CSubmissionPut::submit(const
css::uno::Reference< css::task::XInteractionHandler >& aInteractionHandler)
{
css::uno::Reference< XCommandEnvironment > aEnvironment;
- unique_ptr< CSerialization >
apSerialization(createSerialization(aInteractionHandler,aEnvironment));
+ std::unique_ptr< CSerialization >
apSerialization(createSerialization(aInteractionHandler,aEnvironment));
try {
ucbhelper::Content
aContent(m_aURLObj.GetMainURL(INetURLObject::DecodeMechanism::NONE),
aEnvironment, comphelper::getProcessComponentContext());
diff --git a/framework/source/uielement/fontmenucontroller.cxx
b/framework/source/uielement/fontmenucontroller.cxx
index 0ddfb458f7e0..9d44fe31803c 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -45,8 +45,6 @@ using namespace css::frame;
using namespace css::beans;
using namespace css::util;
-using namespace std;
-
static bool lcl_I18nCompareString(const OUString& rStr1, const OUString& rStr2)
{
const vcl::I18nHelper& rI18nHelper =
Application::GetSettings().GetUILocaleI18nHelper();
@@ -97,7 +95,7 @@ void FontMenuController::fillPopupMenu( const Sequence<
OUString >& rFontNameSeq
if ( !pVCLPopupMenu )
return;
- vector<OUString> aVector;
+ std::vector<OUString> aVector;
aVector.reserve(rFontNameSeq.getLength());
for ( OUString const & s : rFontNameSeq )
{
