[Libreoffice-commits] .: rsc/source sax/source svl/source svtools/source svtools/workben tools/source
Julien Nabet
serval2412 at kemper.freedesktop.org
Sun Feb 27 08:05:43 PST 2011
rsc/source/parser/rscdb.cxx | 3 ++-
rsc/source/parser/rsclex.cxx | 4 +++-
rsc/source/rsc/rsc.cxx | 7 +++++--
rsc/source/tools/rschash.cxx | 3 ++-
rsc/source/tools/rsctools.cxx | 3 ++-
sax/source/expatwrap/xml2utf.cxx | 3 ++-
sax/source/tools/converter.cxx | 4 +++-
svl/source/config/asiancfg.cxx | 3 ++-
svl/source/config/srchcfg.cxx | 3 ++-
svl/source/misc/lngmisc.cxx | 4 ++--
svtools/source/config/accessibilityoptions.cxx | 2 +-
svtools/source/config/colorcfg.cxx | 3 ++-
svtools/source/config/extcolorcfg.cxx | 3 ++-
svtools/source/config/fontsubstconfig.cxx | 3 ++-
svtools/source/config/helpopt.cxx | 3 ++-
svtools/source/config/htmlcfg.cxx | 3 ++-
svtools/source/svrtf/rtfout.cxx | 3 ++-
svtools/workben/cui/loadlib.cxx | 2 +-
tools/source/fsys/dirent.cxx | 3 ++-
tools/source/memtools/multisel.cxx | 2 +-
tools/source/rc/resmgr.cxx | 6 +++++-
tools/source/testtoolloader/testtoolloader.cxx | 3 +--
22 files changed, 48 insertions(+), 25 deletions(-)
New commits:
commit ec7514786b14161964c5e3d78afe0ddb8db941c3
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sun Feb 27 17:05:28 2011 +0100
Remove "using namespace ::rtl"
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index ee4a7e1..4e0b8e3 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -48,7 +48,8 @@
#include <rscdb.hxx>
#include <rscrsc.hxx>
-using namespace rtl;
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
/*************************************************************************
|*
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index fbea2e3..103c921 100644
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.cxx
@@ -51,7 +51,9 @@
#include <rtl/textenc.h>
#include <tools/list.hxx>
-using namespace rtl;
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
+using ::rtl::OStringHash;
const char* StringContainer::putString( const char* pString )
{
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 4a67e05..1ac556e 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_rsc.hxx"
/****************************************************************/
-/* Include File */
+/* Include File */
/****************************************************************/
#include <stdlib.h>
@@ -68,7 +68,10 @@
#include <vector>
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
+using ::rtl::OStringToOUString;
/*************** F o r w a r d s *****************************************/
/*************** G l o b a l e V a r i a b l e n **********************/
diff --git a/rsc/source/tools/rschash.cxx b/rsc/source/tools/rschash.cxx
index 2456ea5..cefed47 100644
--- a/rsc/source/tools/rschash.cxx
+++ b/rsc/source/tools/rschash.cxx
@@ -30,7 +30,8 @@
#include "precompiled_rsc.hxx"
#include <rschash.hxx>
-using namespace rtl;
+using ::rtl::OString;
+using ::rtl::OStringHash;
AtomContainer::AtomContainer()
{
diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index d758c83..81a7f69 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.cxx
@@ -56,7 +56,8 @@
#define ONLY_NEW
#endif
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
/****************** C o d e **********************************************/
/*************************************************************************
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index 05c2a9b..f35ad6b 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -35,10 +35,11 @@
#include <com/sun/star/io/XInputStream.hpp>
-using namespace rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::io;
+using ::rtl::OString;
+
#include "xml2utf.hxx"
namespace sax_expatwrap {
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 70622b2..9efb584 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -37,12 +37,14 @@
#include <rtl/math.hxx>
#include "sax/tools/converter.hxx"
-using namespace rtl;
using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::util;
using namespace ::com::sun::star::i18n;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+
namespace sax {
static const sal_Char* gpsMM = "mm";
diff --git a/svl/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx
index 2d3211c..11c1f54 100644
--- a/svl/source/config/asiancfg.cxx
+++ b/svl/source/config/asiancfg.cxx
@@ -39,12 +39,13 @@
//-----------------------------------------------------------------------------
using namespace utl;
-using namespace rtl;
using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
+using ::rtl::OUString;
+
#define C2U(cChar) OUString(RTL_CONSTASCII_USTRINGPARAM(cChar))
//-----------------------------------------------------------------------------
diff --git a/svl/source/config/srchcfg.cxx b/svl/source/config/srchcfg.cxx
index faf540f..abe150e 100644
--- a/svl/source/config/srchcfg.cxx
+++ b/svl/source/config/srchcfg.cxx
@@ -39,11 +39,12 @@
//-----------------------------------------------------------------------------
using namespace utl;
-using namespace rtl;
using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
+using ::rtl::OUString;
+
#define C2U(cChar) OUString(RTL_CONSTASCII_USTRINGPARAM(cChar))
//-----------------------------------------------------------------------------
diff --git a/svl/source/misc/lngmisc.cxx b/svl/source/misc/lngmisc.cxx
index 5b8feae..1eb2a56 100644
--- a/svl/source/misc/lngmisc.cxx
+++ b/svl/source/misc/lngmisc.cxx
@@ -35,8 +35,8 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/ustring.hxx>
-
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
namespace linguistic
{
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 226d02c..3858649 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -52,8 +52,8 @@
#include <itemholder2.hxx>
using namespace utl;
-using namespace rtl;
using namespace com::sun::star::uno;
+
namespace css = com::sun::star;
#define HELP_TIP_TIMEOUT 0xffff // max. timeout setting to pretend a non-timeout
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 659d939..c98c885 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -54,9 +54,10 @@
//-----------------------------------------------------------------------------
using namespace utl;
-using namespace rtl;
using namespace com::sun::star;
+using ::rtl::OUString;
+
namespace svtools
{
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index b0a5521..f080ed5 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -54,9 +54,10 @@
//-----------------------------------------------------------------------------
using namespace utl;
-using namespace rtl;
using namespace com::sun::star;
+using ::rtl::OUString;
+
namespace svtools
{
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index e32c5f6..2601e7a 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -40,11 +40,12 @@
#include <rtl/logfile.hxx>
using namespace utl;
-using namespace rtl;
using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
+using ::rtl::OUString;
+
#define C2U(cChar) OUString::createFromAscii(cChar)
const sal_Char cReplacement[] = "Replacement";
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 5c20cd6..9500e09 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -43,10 +43,11 @@
#include "itemholder2.hxx"
using namespace utl;
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star;
+using ::rtl::OUString;
+
static SvtHelpOptions_Impl* pOptions = NULL;
static sal_Int32 nRefCount = 0;
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
index 181c61b..765d7c4 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -49,9 +49,10 @@
#define HTMLCFG_NUMBERS_ENGLISH_US 0x100
using namespace utl;
-using namespace rtl;
using namespace com::sun::star::uno;
+using ::rtl::OUString;
+
static SvxHtmlOptions* pOptions = 0;
#define C2U(cChar) OUString::createFromAscii(cChar)
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx
index 25c4de1..042d21d 100644
--- a/svtools/source/svrtf/rtfout.cxx
+++ b/svtools/source/svrtf/rtfout.cxx
@@ -36,7 +36,8 @@
#include <rtfkeywd.hxx>
#include <rtfout.hxx>
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OString;
#if defined(UNX)
const sal_Char RTFOutFuncs::sNewLine = '\012';
diff --git a/svtools/workben/cui/loadlib.cxx b/svtools/workben/cui/loadlib.cxx
index 5adcd7f..43583ab 100644
--- a/svtools/workben/cui/loadlib.cxx
+++ b/svtools/workben/cui/loadlib.cxx
@@ -37,7 +37,7 @@
#include <osl/module.h>
#include <rtl/ustring.hxx>
-using namespace rtl;
+using ::rtl::OUString;
extern "C" {
struct VersionInfo
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 35cd762..2d4bc99 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -63,7 +63,8 @@
using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
int ApiRet2ToSolarError_Impl( int nApiRet );
diff --git a/tools/source/memtools/multisel.cxx b/tools/source/memtools/multisel.cxx
index c23819a..68e1860 100644
--- a/tools/source/memtools/multisel.cxx
+++ b/tools/source/memtools/multisel.cxx
@@ -47,7 +47,7 @@
#define DBG(x)
#endif
-using namespace rtl;
+using ::rtl::OUString;
//==================================================================
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index bc1fb90..a4502ba 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -69,7 +69,11 @@
#define SEARCH_PATH_DELIMITER_STRING ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SEARCH_PATH_DELIMITER_CHAR_STRING ) )
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OUStringHash;
+
using namespace osl;
// for thread safety
diff --git a/tools/source/testtoolloader/testtoolloader.cxx b/tools/source/testtoolloader/testtoolloader.cxx
index c0e60ca..886b89e 100644
--- a/tools/source/testtoolloader/testtoolloader.cxx
+++ b/tools/source/testtoolloader/testtoolloader.cxx
@@ -39,8 +39,7 @@
#include <comphelper/uieventslogger.hxx>
-using namespace rtl;
-
+using ::rtl::OUString;
namespace tools
{
typedef void ( *pfunc_CreateRemoteControl)();
More information about the Libreoffice-commits
mailing list