sw/qa/core/Test-BigPtrArray.cxx | 2 --
sw/source/core/crsr/crbm.cxx | 2 --
sw/source/core/doc/dbgoutsw.cxx | 6 ++----
sw/source/core/tox/tox.cxx | 3 ---
sw/source/core/undo/SwRewriter.cxx | 4 +---
sw/source/filter/ww8/ww8par5.cxx | 1 -
sw/source/uibase/docvw/FrameControlsManager.cxx | 2 --
7 files changed, 3 insertions(+), 17 deletions(-)
New commits:
commit 3c51d5d80c9932e6d13dd09c8fe2ceeeeb741656
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Mon Oct 4 21:10:50 2021 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Tue Oct 5 18:55:41 2021 +0200
drop 'using namespace std' in sw
Change-Id: Idb2350c32d9fba55e9ad8db7aa4c1a280f03ca6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123068
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx
index 24c09a493d26..3234b26f17eb 100644
--- a/sw/qa/core/Test-BigPtrArray.cxx
+++ b/sw/qa/core/Test-BigPtrArray.cxx
@@ -25,8 +25,6 @@
#include <bparr.hxx>
-using namespace std;
-
namespace /* private */
{
const sal_uLong NUM_ENTRIES = 10;
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index 30d2d6b7eb01..9e2027a2ceba 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -26,8 +26,6 @@
#include <IDocumentMarkAccess.hxx>
#include <IDocumentSettingAccess.hxx>
-using namespace std;
-
namespace
{
struct CursorStateHelper
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 227ebbb82a36..8fafec98634c 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -44,8 +44,6 @@
#include <iostream>
#include <cstdio>
-using namespace std;
-
static OString aDbgOutResult;
bool bDbgOutStdErr = false;
bool bDbgOutPrintAttrSet = false;
@@ -92,9 +90,9 @@ const char * dbg_out(std::u16string_view aStr)
return aDbgOutResult.getStr();
}
-static map<sal_uInt16,OUString> & GetItemWhichMap()
+static std::map<sal_uInt16,OUString> & GetItemWhichMap()
{
- static map<sal_uInt16,OUString> aItemWhichMap
+ static std::map<sal_uInt16,OUString> aItemWhichMap
{
{ RES_CHRATR_CASEMAP , "CHRATR_CASEMAP" },
{ RES_CHRATR_CHARSETCOLOR , "CHRATR_CHARSETCOLOR" },
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 0af14542e2de..a196db61e46e 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -42,9 +42,6 @@
#include <string_view>
-using namespace std;
-
-
const sal_Unicode C_NUM_REPL = '@';
const sal_Unicode C_END_PAGE_NUM = '~';
diff --git a/sw/source/core/undo/SwRewriter.cxx
b/sw/source/core/undo/SwRewriter.cxx
index b35a31a912b5..58e6d06e9e1f 100644
--- a/sw/source/core/undo/SwRewriter.cxx
+++ b/sw/source/core/undo/SwRewriter.cxx
@@ -20,15 +20,13 @@
#include <algorithm>
#include <SwRewriter.hxx>
-using namespace std;
-
SwRewriter::SwRewriter() {}
void SwRewriter::AddRule(SwUndoArg eWhat, const OUString& rWith)
{
SwRewriteRule aRule(eWhat, rWith);
- vector<SwRewriteRule>::iterator aIt
+ std::vector<SwRewriteRule>::iterator aIt
= find_if(mRules.begin(), mRules.end(),
[&aRule](SwRewriteRule const& a) { return a.first ==
aRule.first; });
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 3c548b64eeb8..57758aa15f7f 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -94,7 +94,6 @@ using namespace ::com::sun::star;
using namespace msfilter::util;
using namespace sw::util;
using namespace sw::mark;
-using namespace std; // #i24377#
using namespace nsSwDocInfoSubType;
// Bookmarks
diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx
b/sw/source/uibase/docvw/FrameControlsManager.cxx
index d83207c7e6fa..75ad1b600ed9 100644
--- a/sw/source/uibase/docvw/FrameControlsManager.cxx
+++ b/sw/source/uibase/docvw/FrameControlsManager.cxx
@@ -25,8 +25,6 @@
#include <vcl/svapp.hxx>
#include <vcl/weldutils.hxx>
-using namespace std;
-
SwFrameControlsManager::SwFrameControlsManager( SwEditWin* pEditWin ) :
m_pEditWin( pEditWin )
{
