summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--hwpfilter/source/hwpeq.cxx25
-rw-r--r--i18npool/source/localedata/LocaleNode.cxx7
-rw-r--r--io/source/stm/opump.cxx1
-rw-r--r--jvmaccess/workbench/javainfo/javainfotest.cxx5
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx7
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx2
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx9
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx2
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx35
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx7
10 files changed, 44 insertions, 56 deletions
diff --git a/hwpfilter/source/hwpeq.cxx b/hwpfilter/source/hwpeq.cxx
index f2325508fc9f..a19bee24acbb 100644
--- a/hwpfilter/source/hwpeq.cxx
+++ b/hwpfilter/source/hwpeq.cxx
@@ -24,7 +24,6 @@
// DVO: always use standard headers:
#include <istream>
#include <sstream>
-using namespace std;
#include "mzstring.h"
#include "hwpeq.h"
@@ -65,8 +64,8 @@ static bool IS_BINARY(std::istream::int_type ch) {
// sub and sup script status
enum { SCRIPT_NONE, SCRIPT_SUB, SCRIPT_SUP, SCRIPT_ALL};
-static int eq_word(MzString& outs, istream *strm, int script = SCRIPT_NONE);
-static bool eq_sentence(MzString& outs, istream *strm, const char *end = nullptr);
+static int eq_word(MzString& outs, std::istream *strm, int script = SCRIPT_NONE);
+static bool eq_sentence(MzString& outs, std::istream *strm, const char *end = nullptr);
namespace {
@@ -462,10 +461,10 @@ namespace {
struct eq_stack {
MzString white;
MzString token;
- istream *strm;
+ std::istream *strm;
eq_stack() { strm = nullptr; };
- bool state(istream const *s) {
+ bool state(std::istream const *s) {
if( strm != s) { white = nullptr; token = nullptr; }
return token.length() != 0;
}
@@ -475,7 +474,7 @@ struct eq_stack {
static eq_stack *stk = nullptr;
-static void push_token(MzString const &white, MzString const &token, istream *strm)
+static void push_token(MzString const &white, MzString const &token, std::istream *strm)
{
// one time stack
assert(stk->token.length() == 0);
@@ -490,7 +489,7 @@ static void push_token(MzString const &white, MzString const &token, istream *st
*
* control char, control sequence, binary sequence,
* alphabet string, single character */
-static int next_token(MzString &white, MzString &token, istream *strm)
+static int next_token(MzString &white, MzString &token, std::istream *strm)
{
std::istream::int_type ch = 0;
@@ -571,7 +570,7 @@ static int next_token(MzString &white, MzString &token, istream *strm)
return token.length();
}
-static std::istream::int_type read_white_space(MzString& outs, istream *strm)
+static std::istream::int_type read_white_space(MzString& outs, std::istream *strm)
{
std::istream::int_type result;
@@ -609,7 +608,7 @@ static std::istream::int_type read_white_space(MzString& outs, istream *strm)
a over b -> {a} over {b}
*/
-static int eq_word(MzString& outs, istream *strm, int status)
+static int eq_word(MzString& outs, std::istream *strm, int status)
{
MzString token, white, state;
int result;
@@ -677,7 +676,7 @@ static int eq_word(MzString& outs, istream *strm, int status)
return result;
}
-static bool eq_sentence(MzString& outs, istream *strm, const char *end)
+static bool eq_sentence(MzString& outs, std::istream *strm, const char *end)
{
MzString state;
MzString white, token;
@@ -706,7 +705,7 @@ static bool eq_sentence(MzString& outs, istream *strm, const char *end)
return multiline;
}
-static char eq2ltxconv(MzString& sstr, istream *strm, const char *sentinel)
+static char eq2ltxconv(MzString& sstr, std::istream *strm, const char *sentinel)
{
MzString white, token;
char key[256];
@@ -784,9 +783,9 @@ void eq2latex(MzString& outs, char const *s)
MzString tstr;
- istringstream tstrm(s);
+ std::istringstream tstrm(s);
bool eqnarray = eq_sentence(tstr, &tstrm);
- istringstream strm(tstr.c_str());
+ std::istringstream strm(tstr.c_str());
if( eqnarray )
outs << "\\begin{array}{rllll}" << ENDL;
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 8c23e3a29b21..e1443b1e1d0f 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -41,7 +41,6 @@ typedef ::o3tl::sorted_vector< OUString > NameSet;
typedef ::o3tl::sorted_vector< sal_Int16 > ValueSet;
namespace cssi = ::com::sun::star::i18n;
-using namespace std;
LocaleNode::LocaleNode (const OUString& name, const Reference< XAttributeList > & attr)
: aName(name)
@@ -1212,10 +1211,10 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
}
// Check for duplicates.
- for (vector<OUString>::const_iterator aIt = theDateAcceptancePatterns.begin();
+ for (std::vector<OUString>::const_iterator aIt = theDateAcceptancePatterns.begin();
aIt != theDateAcceptancePatterns.end(); ++aIt)
{
- for (vector<OUString>::iterator aComp = theDateAcceptancePatterns.begin();
+ for (std::vector<OUString>::iterator aComp = theDateAcceptancePatterns.begin();
aComp != theDateAcceptancePatterns.end(); /*nop*/)
{
if (aIt != aComp && *aIt == *aComp)
@@ -2254,7 +2253,7 @@ void LCOutlineNumberingLevelNode::generateCode (const OFileWriter &of) const
// record each attribute of each level of each style in a static C++ variable.
// determine number of styles and number of levels per style on the fly.
sal_Int32 nStyles = getNumberOfChildren();
- vector<sal_Int32> nLevels; // may be different for each style?
+ std::vector<sal_Int32> nLevels; // may be different for each style?
for( sal_Int32 i = 0; i < nStyles; i++ )
{
LocaleNode* p = getChildAt( i );
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index bef9aa2d3f1c..c6cb22cb4816 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -35,7 +35,6 @@
#include <tools/diagnose_ex.h>
using namespace osl;
-using namespace std;
using namespace cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/jvmaccess/workbench/javainfo/javainfotest.cxx b/jvmaccess/workbench/javainfo/javainfotest.cxx
index 115019da1d74..b07db0105f9a 100644
--- a/jvmaccess/workbench/javainfo/javainfotest.cxx
+++ b/jvmaccess/workbench/javainfo/javainfotest.cxx
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <vector>
-using namespace std;
using namespace osl;
using jvmaccess::JavaInfo;
@@ -189,9 +188,9 @@ bool test_createAllInfo()
{
printf("\ntest JavaInfo::createAllInfo\n" \
"! Compare output with values in registry, PATH, JAVA_HOME, LD_LIBRARY_PATH !\n\n");
- vector<JavaInfo> vec;
+ std::vector<JavaInfo> vec;
JavaInfo::createAllInfo(&vec);
- for(vector<JavaInfo>::size_type i= 0; i < vec.size(); i++)
+ for(std::vector<JavaInfo>::size_type i= 0; i < vec.size(); i++)
printInfo(vec[i]);
return true;
}
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index 0e3682e9d99d..99e07bda8c41 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -22,7 +22,6 @@
#include "gnujre.hxx"
#include "util.hxx"
-using namespace std;
using namespace osl;
using ::rtl::Reference;
@@ -90,7 +89,7 @@ char const* const* GnuInfo::getLibraryPaths(int* /*size*/)
return nullptr;
}
-bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
+bool GnuInfo::initialize(std::vector<std::pair<OUString, OUString> > props)
{
//get java.vendor, java.version, java.home
//from system properties
@@ -163,7 +162,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
int size = 0;
char const* const* arRtPaths = getRuntimePaths( & size);
- vector<OUString> libpaths = getVectorFromCharArray(arRtPaths, size);
+ std::vector<OUString> libpaths = getVectorFromCharArray(arRtPaths, size);
bool bRt = false;
for (auto const& libpath : libpaths)
@@ -245,7 +244,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
OSL_ASSERT(!m_sHome.isEmpty());
size = 0;
char const * const * arLDPaths = getLibraryPaths( & size);
- vector<OUString> ld_paths = getVectorFromCharArray(arLDPaths, size);
+ std::vector<OUString> ld_paths = getVectorFromCharArray(arLDPaths, size);
bool bLdPath = true;
int c = 0;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index fd2468edf65e..5c7f3ba9afc8 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -20,8 +20,6 @@
#include "otherjre.hxx"
-using namespace std;
-
using ::rtl::Reference;
namespace jfw_plugin
{
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 5df7ef298795..d3b9b92a5b5e 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -95,7 +95,6 @@
#endif
using namespace osl;
-using namespace std;
using namespace jfw_plugin;
@@ -343,9 +342,9 @@ javaPluginError jfw_plugin_getAllJavaInfos(
assert(parJavaInfo);
//Find all JREs
- vector<rtl::Reference<VendorBase> > vecInfos =
+ std::vector<rtl::Reference<VendorBase> > vecInfos =
addAllJREInfos(checkJavaHomeAndPath, infos);
- vector<rtl::Reference<VendorBase> > vecVerifiedInfos;
+ std::vector<rtl::Reference<VendorBase> > vecVerifiedInfos;
for (auto const& vecInfo : vecInfos)
{
@@ -438,10 +437,10 @@ javaPluginError jfw_plugin_getJavaInfosFromPath(
std::vector<rtl::Reference<jfw_plugin::VendorBase>> & infos)
{
// find JREs from PATH
- vector<rtl::Reference<VendorBase>> vecInfosFromPath;
+ std::vector<rtl::Reference<VendorBase>> vecInfosFromPath;
addJavaInfosFromPath(infos, vecInfosFromPath);
- vector<std::unique_ptr<JavaInfo>> vecVerifiedInfos;
+ std::vector<std::unique_ptr<JavaInfo>> vecVerifiedInfos;
// copy infos of JREs that meet version requirements to vecVerifiedInfos
for (auto const& infosFromPath : vecInfosFromPath)
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 4f1e95fb4580..a0f8cbee1f3e 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -22,8 +22,6 @@
#include "sunversion.hxx"
#include "diagnostics.h"
-using namespace std;
-
namespace jfw_plugin
{
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index bc66d68de052..743db3a9ce13 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -51,7 +51,6 @@
#endif
using namespace osl;
-using namespace std;
using ::rtl::Reference;
@@ -110,8 +109,8 @@ char const *g_arSearchPaths[] = {
namespace jfw_plugin
{
#if defined(_WIN32)
-static bool getSDKInfoFromRegistry(vector<OUString> & vecHome);
-static bool getJREInfoFromRegistry(vector<OUString>& vecJavaHome);
+static bool getSDKInfoFromRegistry(std::vector<OUString> & vecHome);
+static bool getJREInfoFromRegistry(std::vector<OUString>& vecJavaHome);
#endif
static bool decodeOutput(const OString& s, OUString* out);
@@ -511,7 +510,7 @@ bool decodeOutput(const OString& s, OUString* out)
#if defined(_WIN32)
static bool getJavaInfoFromRegistry(const wchar_t* szRegKey,
- vector<OUString>& vecJavaHome)
+ std::vector<OUString>& vecJavaHome)
{
HKEY hRoot;
if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szRegKey, 0, KEY_ENUMERATE_SUB_KEYS, &hRoot)
@@ -582,12 +581,12 @@ static bool getJavaInfoFromRegistry(const wchar_t* szRegKey,
}
-bool getSDKInfoFromRegistry(vector<OUString> & vecHome)
+bool getSDKInfoFromRegistry(std::vector<OUString> & vecHome)
{
return getJavaInfoFromRegistry(HKEY_SUN_SDK, vecHome);
}
-bool getJREInfoFromRegistry(vector<OUString>& vecJavaHome)
+bool getJREInfoFromRegistry(std::vector<OUString>& vecJavaHome)
{
return getJavaInfoFromRegistry(HKEY_SUN_JRE, vecJavaHome);
}
@@ -633,7 +632,7 @@ static void addJavaInfoFromWinReg(
#endif // _WIN32
-void bubbleSortVersion(vector<rtl::Reference<VendorBase> >& vec)
+void bubbleSortVersion(std::vector<rtl::Reference<VendorBase> >& vec)
{
if(vec.empty())
return;
@@ -684,7 +683,7 @@ void bubbleSortVersion(vector<rtl::Reference<VendorBase> >& vec)
void addJREInfoFromBinPath(
- const OUString& path, vector<rtl::Reference<VendorBase>> & allInfos,
+ const OUString& path, std::vector<rtl::Reference<VendorBase>> & allInfos,
std::vector<rtl::Reference<VendorBase>> & addedInfos)
{
// file:///c:/jre/bin
@@ -693,7 +692,7 @@ void addJREInfoFromBinPath(
for ( sal_Int32 pos = 0;
gVendorMap[pos].sVendorName != nullptr; ++pos )
{
- vector<OUString> vecPaths;
+ std::vector<OUString> vecPaths;
getJavaExePaths_func pFunc = gVendorMap[pos].getJavaFunc;
int size = 0;
@@ -738,11 +737,11 @@ void addJREInfoFromBinPath(
}
}
-vector<Reference<VendorBase> > addAllJREInfos(
+std::vector<Reference<VendorBase> > addAllJREInfos(
bool checkJavaHomeAndPath,
std::vector<rtl::Reference<VendorBase>> & allInfos)
{
- vector<Reference<VendorBase> > addedInfos;
+ std::vector<Reference<VendorBase> > addedInfos;
#if defined(_WIN32)
// Get Javas from the registry
@@ -765,9 +764,9 @@ vector<Reference<VendorBase> > addAllJREInfos(
}
-vector<OUString> getVectorFromCharArray(char const * const * ar, int size)
+std::vector<OUString> getVectorFromCharArray(char const * const * ar, int size)
{
- vector<OUString> vec;
+ std::vector<OUString> vec;
for( int i = 0; i < size; i++)
{
OUString s(ar[i], strlen(ar[i]), RTL_TEXTENCODING_UTF8);
@@ -826,11 +825,11 @@ rtl::Reference<VendorBase> getJREInfoByPath(
const OUString& path)
{
rtl::Reference<VendorBase> ret;
- static vector<OUString> vecBadPaths;
+ static std::vector<OUString> vecBadPaths;
- static map<OUString, rtl::Reference<VendorBase> > mapJREs;
+ static std::map<OUString, rtl::Reference<VendorBase> > mapJREs;
OUString sFilePath;
- vector<pair<OUString, OUString> > props;
+ std::vector<std::pair<OUString, OUString> > props;
OUString sResolvedDir = resolveDirPath(path);
// If this path is invalid then there is no chance to find a JRE here
@@ -855,7 +854,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
for ( sal_Int32 pos = 0;
gVendorMap[pos].sVendorName != nullptr; ++pos )
{
- vector<OUString> vecPaths;
+ std::vector<OUString> vecPaths;
getJavaExePaths_func pFunc = gVendorMap[pos].getJavaFunc;
int size = 0;
@@ -1011,7 +1010,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
}
Reference<VendorBase> createInstance(createInstance_func pFunc,
- const vector<pair<OUString, OUString> >& properties)
+ const std::vector<std::pair<OUString, OUString> >& properties)
{
Reference<VendorBase> aBase = (*pFunc)();
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index 4bfc1fd90af0..e9c26778a461 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -23,7 +23,6 @@
#include <vendorbase.hxx>
#include "util.hxx"
-using namespace std;
using namespace osl;
@@ -36,7 +35,7 @@ VendorBase::VendorBase()
{
}
-bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
+bool VendorBase::initialize(std::vector<std::pair<OUString, OUString> > props)
{
//get java.vendor, java.version, java.home
//from system properties
@@ -97,7 +96,7 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
int size = 0;
char const* const* arRtPaths = getRuntimePaths( & size);
- vector<OUString> libpaths = getVectorFromCharArray(arRtPaths, size);
+ std::vector<OUString> libpaths = getVectorFromCharArray(arRtPaths, size);
bool bRt = false;
for (auto const& libpath : libpaths)
@@ -120,7 +119,7 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
OSL_ASSERT(!m_sHome.isEmpty());
size = 0;
char const * const * arLDPaths = getLibraryPaths( & size);
- vector<OUString> ld_paths = getVectorFromCharArray(arLDPaths, size);
+ std::vector<OUString> ld_paths = getVectorFromCharArray(arLDPaths, size);
bool bLdPath = true;
int c = 0;
generated by cgit (git 2.34.1) at 2024-05-29 08:40:26 +0000