summaryrefslogtreecommitdiff
path: root/desktop/source
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2011-02-26 15:34:48 +0100
committerJulien Nabet <serval2412@yahoo.fr>2011-02-26 15:34:48 +0100
commit68c7be65bab421d4b31fd0e8caba9d43abcc244d (patch)
treee17835a625c3fd149aa3e6fcc73d6fdb5f1271eb /desktop/source
parent5e18a28608bce9b9816d576a39b3699e06121203 (diff)
Remove "using namespace ::rtl"
Diffstat (limited to 'desktop/source')
-rw-r--r--desktop/source/app/appinit.cxx3
-rw-r--r--desktop/source/app/checkinstall.cxx3
-rw-r--r--desktop/source/app/cmdlineargs.cxx3
-rw-r--r--desktop/source/app/desktopcontext.cxx3
-rw-r--r--desktop/source/app/langselect.cxx5
-rw-r--r--desktop/source/app/officeipcthread.cxx5
-rw-r--r--desktop/source/migration/migration.cxx4
-rw-r--r--desktop/source/migration/services/jvmfwk.cxx3
-rw-r--r--desktop/source/so_comp/evaluation.cxx3
-rw-r--r--desktop/source/so_comp/oemjob.cxx5
-rw-r--r--desktop/source/so_comp/services.cxx3
-rw-r--r--desktop/source/splash/services_spl.cxx3
12 files changed, 31 insertions, 12 deletions
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 065b2040c051..3ae9d220245e 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -82,7 +82,6 @@
#define DESKTOP_TEMPDIRNAME "soffice.tmp"
-using namespace rtl;
using namespace desktop;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -90,6 +89,8 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::registry;
using namespace ::com::sun::star::ucb;
+using ::rtl::OUString;
+
namespace desktop
{
diff --git a/desktop/source/app/checkinstall.cxx b/desktop/source/app/checkinstall.cxx
index 0777eda34592..c0e853d9eef5 100644
--- a/desktop/source/app/checkinstall.cxx
+++ b/desktop/source/app/checkinstall.cxx
@@ -39,11 +39,12 @@
#include <vcl/msgbox.hxx>
#include <tools/date.hxx>
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
+using ::rtl::OUString;
+
namespace desktop
{
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index d0bb6c3d87be..6798e8ede85a 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -43,11 +43,12 @@
#include <cstdio>
-using namespace rtl;
using namespace com::sun::star::lang;
using namespace com::sun::star::uri;
using namespace com::sun::star::uno;
+using ::rtl::OUString;
+
namespace desktop
{
diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx
index bed77fae9f69..2a8ed7ef628c 100644
--- a/desktop/source/app/desktopcontext.cxx
+++ b/desktop/source/app/desktopcontext.cxx
@@ -33,10 +33,11 @@
#include <vcl/svapp.hxx>
#include <svtools/javainteractionhandler.hxx>
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::task;
+using ::rtl::OUString;
+
namespace desktop
{
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index 11c5c6a25919..d70703103967 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -54,13 +54,16 @@
#include <osl/process.h>
#include <osl/file.hxx>
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::container;
using namespace com::sun::star::beans;
using namespace com::sun::star::util;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OString;
+
namespace desktop {
static char const SOFFICE_BOOTSTRAP[] = "Bootstrap";
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index d7ccd88e12eb..f699463ec089 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -53,12 +53,15 @@
#include "rtl/process.h"
#include "tools/getprocessworkingdir.hxx"
-using namespace rtl;
using namespace desktop;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::frame;
+using ::rtl::OString;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+
const char *OfficeIPCThread::sc_aTerminationSequence = "InternalIPC::TerminateThread";
const int OfficeIPCThread::sc_nTSeqLength = 28;
const char *OfficeIPCThread::sc_aShowSequence = "-tofront";
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 86296ba19ac2..8505a64064bf 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -65,7 +65,6 @@
#include <com/sun/star/ui/XUIConfigurationStorage.hpp>
#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
-using namespace rtl;
using namespace osl;
using namespace std;
using namespace com::sun::star::task;
@@ -76,6 +75,9 @@ using namespace com::sun::star::container;
using com::sun::star::uno::Exception;
using namespace com::sun::star;
+using ::rtl::OUString;
+using ::rtl::OString;
+
namespace desktop {
static const ::rtl::OUString ITEM_DESCRIPTOR_COMMANDURL(RTL_CONSTASCII_USTRINGPARAM("CommandURL"));
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index 14fa46b2cc2d..05c359c500a0 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -52,6 +52,8 @@
#include <stdio.h>
#include "osl/thread.hxx"
+using ::rtl::OUString;
+
#define OUSTR(x) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x ))
#define SERVICE_NAME "com.sun.star.migration.Java"
@@ -61,7 +63,6 @@
#define USER_CLASS_PATH 2
namespace css = com::sun::star;
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
diff --git a/desktop/source/so_comp/evaluation.cxx b/desktop/source/so_comp/evaluation.cxx
index a27f9b062cf1..8890d26462ec 100644
--- a/desktop/source/so_comp/evaluation.cxx
+++ b/desktop/source/so_comp/evaluation.cxx
@@ -43,12 +43,13 @@
#include "../app/desktop.hrc"
-using namespace rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::registry;
+using ::rtl::OUString;
+
namespace desktop {
static SOEvaluation* pSOEval=0;
diff --git a/desktop/source/so_comp/oemjob.cxx b/desktop/source/so_comp/oemjob.cxx
index 48b7ec3bd970..bdb45e5eb0a7 100644
--- a/desktop/source/so_comp/oemjob.cxx
+++ b/desktop/source/so_comp/oemjob.cxx
@@ -43,7 +43,6 @@
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
-using namespace rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
@@ -51,6 +50,10 @@ using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::util;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::Bootstrap;
+
namespace desktop{
char const OEM_PRELOAD_SECTION[] = "Bootstrap";
diff --git a/desktop/source/so_comp/services.cxx b/desktop/source/so_comp/services.cxx
index 1eedd4d47bda..177b5fb3ff12 100644
--- a/desktop/source/so_comp/services.cxx
+++ b/desktop/source/so_comp/services.cxx
@@ -42,13 +42,14 @@
#include <string.h>
-using namespace rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::registry;
using namespace ::desktop;
+using ::rtl::OUString;
+
static const char* pServices[] =
{
SOEvaluation::serviceName,
diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx
index b63f89792a29..d79adf8725d5 100644
--- a/desktop/source/splash/services_spl.cxx
+++ b/desktop/source/splash/services_spl.cxx
@@ -37,13 +37,14 @@
#include "splash.hxx"
-using namespace rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::registry;
using namespace ::desktop;
+using ::rtl::OUString;
+
static const char* pServices[] =
{
SplashScreen::serviceName,