summaryrefslogtreecommitdiff
path: root/extensions/source
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2011-02-26 01:14:41 +0100
committerJulien Nabet <serval2412@yahoo.fr>2011-02-26 01:14:41 +0100
commit02db19983224c7cb1c46ac943528c31f6f76e148 (patch)
treeea020eebf19fa81e3087b4828d70148fe607109c /extensions/source
parentbf369174717f9123c5d0bd0a638f8da8495ee9b1 (diff)
Remove "using namespace ::rtl"
Diffstat (limited to 'extensions/source')
-rw-r--r--extensions/source/bibliography/bibbeam.cxx3
-rw-r--r--extensions/source/bibliography/bibconfig.cxx3
-rw-r--r--extensions/source/bibliography/framectr.cxx3
-rw-r--r--extensions/source/nsplugin/source/so_instance.cxx4
-rw-r--r--extensions/source/ole/ole2uno.hxx3
-rw-r--r--extensions/source/ole/oleobjw.cxx3
-rw-r--r--extensions/source/ole/oleobjw.hxx2
-rw-r--r--extensions/source/ole/servprov.cxx3
-rw-r--r--extensions/source/ole/servreg.cxx3
-rw-r--r--extensions/source/ole/unoobjw.cxx3
-rw-r--r--extensions/source/plugin/aqua/macmgr.cxx8
-rw-r--r--extensions/source/plugin/aqua/sysplug.cxx4
-rw-r--r--extensions/source/plugin/base/nfuncs.cxx5
-rw-r--r--extensions/source/plugin/base/xplugin.cxx4
-rw-r--r--extensions/source/plugin/unx/unxmgr.cxx6
-rw-r--r--extensions/source/plugin/win/sysplug.cxx4
-rw-r--r--extensions/source/plugin/win/winmgr.cxx6
-rw-r--r--extensions/source/resource/resource.cxx6
-rw-r--r--extensions/source/scanner/scanner.hxx3
19 files changed, 54 insertions, 22 deletions
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index be923bd66a1b..a4dd71df31ba 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -46,11 +46,12 @@
#include "datman.hxx"
#include "bibtools.hxx"
-using namespace rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::uno;
+using ::rtl::OUString;
+
#define C2U(cChar) OUString::createFromAscii(cChar)
#define PROPERTY_FRAME 1
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index c86369f834b6..7e317986e00f 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -39,12 +39,13 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
-using namespace rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
+using ::rtl::OUString;
+
typedef Mapping* MappingPtr;
SV_DECL_PTRARR_DEL(MappingArray, MappingPtr, 2, 2)
SV_IMPL_PTRARR(MappingArray, MappingPtr);
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 9fa7ead8b73b..659e4fdc7b35 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -65,12 +65,13 @@
using namespace osl;
using namespace cppu;
-using namespace rtl;
using namespace com::sun::star::sdbc;
using namespace com::sun::star::frame;
using namespace com::sun::star::uno;
using namespace com::sun::star;
+using ::rtl::OUString;
+
#define C2U(cChar) OUString::createFromAscii(cChar)
struct DispatchInfo
diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx
index 742bedecc0e7..658d73a59180 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -64,9 +64,11 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::connection;
using namespace cppu;
-using namespace rtl;
using namespace com::sun::star;
+using ::rtl::OUString;
+using ::rtl::OString;
+
char SoPluginInstance::sSO_Dir[] = {0};
Reference< XMultiServiceFactory > SoPluginInstance::mxRemoteMSF = Reference< XMultiServiceFactory >(NULL);
diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx
index 8763208bda10..55ca3104bd64 100644
--- a/extensions/source/ole/ole2uno.hxx
+++ b/extensions/source/ole/ole2uno.hxx
@@ -91,10 +91,9 @@ using namespace com::sun::star::registry;
using namespace com::sun::star::reflection;
using namespace com::sun::star::beans;
using namespace osl;
-using namespace rtl;
using namespace std;
-
+using ::rtl::OUString;
namespace ole_adapter
{
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 8b9ea5e50886..5c74aff9e191 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -69,7 +69,6 @@
using namespace std;
using namespace boost;
using namespace osl;
-using namespace rtl;
using namespace cppu;
using namespace com::sun::star::script;
using namespace com::sun::star::lang;
@@ -77,6 +76,8 @@ using namespace com::sun::star::bridge;
using namespace com::sun::star::bridge::oleautomation;
using namespace com::sun::star::bridge::ModelDependent;
+using ::rtl::OUString;
+
#define JSCRIPT_ID_PROPERTY L"_environment"
#define JSCRIPT_ID L"jscript"
namespace ole_adapter
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index ecfed6825814..b9e0ca21cd56 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -65,12 +65,12 @@
#include "unoconversionutilities.hxx"
#include "windata.hxx"
using namespace cppu;
-using namespace rtl;
using namespace std;
using namespace com::sun::star::lang;
using namespace com::sun::star::bridge;
using namespace com::sun::star::bridge::oleautomation;
+using ::rtl::OUString;
namespace ole_adapter
{
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index 958a6c8de913..a72b6bc5845f 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -56,14 +56,13 @@ extern CComModule _Module;
using namespace cppu;
-using namespace rtl;
using namespace osl;
using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
using namespace com::sun::star::bridge;
using namespace com::sun::star::bridge::ModelDependent;
-
+using ::rtl::OUString;
namespace ole_adapter
{
diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx
index 7311f965ca8d..6284bc1f8246 100644
--- a/extensions/source/ole/servreg.cxx
+++ b/extensions/source/ole/servreg.cxx
@@ -34,10 +34,11 @@
#include "servprov.hxx"
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-using namespace rtl;
using namespace ole_adapter;
using namespace cppu;
+using ::rtl::OUString;
+
namespace ole_adapter
{
rtl_StandardModuleCount globalModuleCount= MODULE_COUNT_INIT;
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 622ddf5894fa..96cc39625512 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -66,7 +66,6 @@
#include "servprov.hxx"
using namespace std;
-using namespace rtl;
using namespace osl;
using namespace cppu;
using namespace com::sun::star::uno;
@@ -77,7 +76,7 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::bridge::ModelDependent;
using namespace com::sun::star::reflection;
-
+using ::rtl::OUString;
#if _MSC_VER < 1200
extern "C" const GUID IID_IDispatchEx;
diff --git a/extensions/source/plugin/aqua/macmgr.cxx b/extensions/source/plugin/aqua/macmgr.cxx
index 2d7d87c93fd0..2a67cc994b8e 100644
--- a/extensions/source/plugin/aqua/macmgr.cxx
+++ b/extensions/source/plugin/aqua/macmgr.cxx
@@ -33,11 +33,17 @@
#include "osl/file.h"
#include "osl/module.hxx"
-using namespace rtl;
using namespace std;
using namespace com::sun::star::uno;
using namespace com::sun::star::plugin;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OStringBuffer;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
+
namespace plugstringhelper
{
diff --git a/extensions/source/plugin/aqua/sysplug.cxx b/extensions/source/plugin/aqua/sysplug.cxx
index 39e3fc5cc4c4..f4896f119382 100644
--- a/extensions/source/plugin/aqua/sysplug.cxx
+++ b/extensions/source/plugin/aqua/sysplug.cxx
@@ -38,9 +38,11 @@ extern NPNetscapeFuncs aNPNFuncs;
#include <tools/debug.hxx>
-using namespace rtl;
using namespace plugstringhelper;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+
#if OSL_DEBUG_LEVEL > 1
void TRACE( char const * s );
void TRACEN( char const * s, long n );
diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx
index 094772501f1d..24e9939cb2ad 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -84,9 +84,12 @@ void TRACES( char const* s, char const* s2 )
#define TRACES(x,s)
#endif
-using namespace rtl;
using namespace com::sun::star::lang;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
+
NPNetscapeFuncs aNPNFuncs =
{
sizeof( NPNetscapeFuncs ),
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index c479a4002f67..1eac4dd9c983 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -60,9 +60,11 @@ using namespace com::sun::star;
using namespace com::sun::star::io;
using namespace com::sun::star::beans;
using namespace com::sun::star::plugin;
-using namespace rtl;
using namespace osl;
+using ::rtl::OUString;
+using ::rtl::OString;
+
class PluginDisposer : public salhelper::Timer
{
private:
diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx
index 20c91bfba8b8..3ec32edd795b 100644
--- a/extensions/source/plugin/unx/unxmgr.cxx
+++ b/extensions/source/plugin/unx/unxmgr.cxx
@@ -46,11 +46,15 @@
#include <vcl/svapp.hxx>
#include <plugin/impl.hxx>
-using namespace rtl;
using namespace std;
using namespace com::sun::star::uno;
using namespace com::sun::star::plugin;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
+using ::rtl::OStringToOUString;
+
// Unix specific implementation
static bool CheckPlugin( const ByteString& rPath, list< PluginDescription* >& rDescriptions )
{
diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx
index 5e244768a980..149dce3067d5 100644
--- a/extensions/source/plugin/win/sysplug.cxx
+++ b/extensions/source/plugin/win/sysplug.cxx
@@ -51,7 +51,9 @@ extern NPNetscapeFuncs aNPNFuncs;
#include <tools/debug.hxx>
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
#if OSL_DEBUG_LEVEL > 1
void TRACE( char const * s );
diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx
index 04859d46b4e2..b754383139a4 100644
--- a/extensions/source/plugin/win/winmgr.cxx
+++ b/extensions/source/plugin/win/winmgr.cxx
@@ -56,12 +56,16 @@
#include <algorithm>
-using namespace rtl;
using namespace std;
using namespace osl;
using namespace com::sun::star::uno;
using namespace com::sun::star::plugin;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
+using ::rtl::OUStringToOString;
+
typedef map< OString, OUString, less< OString > > PluginLocationMap;
//__________________________________________________________________________________________________
diff --git a/extensions/source/resource/resource.cxx b/extensions/source/resource/resource.cxx
index 7c0a0fd60616..55fd5944bbbd 100644
--- a/extensions/source/resource/resource.cxx
+++ b/extensions/source/resource/resource.cxx
@@ -51,7 +51,6 @@
#include <rtl/ustring.hxx>
#include <rtl/strbuf.hxx>
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
@@ -59,6 +58,11 @@ using namespace com::sun::star::script;
using namespace com::sun::star::beans;
using namespace com::sun::star::reflection;
+using ::rtl::OUString;
+using ::rtl::OStringBuffer;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
+
//------------------------------------------------------------------------
//------------------------------------------------------------------------
//------------------------------------------------------------------------
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index 52bba3113938..15af9d83f144 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -42,11 +42,12 @@
#include <com/sun/star/scanner/XScannerManager.hpp>
#include <com/sun/star/scanner/ScannerException.hpp>
-using namespace rtl;
using namespace cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::scanner;
+using ::rtl::OUString;
+
// -----------
// - Defines -
// -----------