Prefer using declarations over using directives

Change-Id: I1316fc4ae1d4dab91684bdc059f5c69c5e0c401a

10 files changed, 26 insertions, 16 deletions

diff --git a/cppuhelper/source/access_control.cxx b/cppuhelper/source/access_control.cxx
index 5c39d73c99d7..1df5d2d21c30 100644
--- a/cppuhelper/source/access_control.cxx
+++ b/cppuhelper/source/access_control.cxx
@@ -25,12 +25,12 @@
 #include <com/sun/star/io/FilePermission.hpp>
 #include <com/sun/star/connection/SocketPermission.hpp>
 
-
-using namespace ::rtl;
 using namespace ::osl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
+using rtl::OUString;
+
 namespace
 {
     inline OUString str_ac_singleton()
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 2de4b5643211..81d34202db26 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -44,12 +44,13 @@
 
 #define ARLEN(x) sizeof (x) / sizeof *(x)
 
-
-using namespace ::rtl;
 using namespace ::osl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
+using rtl::Bootstrap;
+using rtl::OUString;
+
 namespace cppu
 {
 
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 7d417788238f..f75891238832 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -60,12 +60,14 @@
 #define TDMGR_SINGLETON "/singletons/com.sun.star.reflection.theTypeDescriptionManager"
 #define AC_SINGLETON "/singletons/com.sun.star.security.theAccessController"
 
-
 using namespace ::osl;
-using namespace ::rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 
+using rtl::OUString;
+using rtl::OUStringBuffer;
+using rtl::OUStringHash;
+
 namespace cppu
 {
 
diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index d63b9bed8c38..a7de5c8deff2 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -29,8 +29,6 @@
 
 #include "cppuhelper/exc_hlp.hxx"
 
-
-using namespace ::rtl;
 using namespace ::osl;
 using namespace ::cppu;
 using namespace ::com::sun::star;
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index 4816c4a63832..24a3b27f7471 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/cppuhelper/source/implbase.cxx
@@ -27,10 +27,11 @@
 #include "com/sun/star/uno/RuntimeException.hpp"
 
 using namespace ::osl;
-using namespace ::rtl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
+using rtl::OUString;
+
 namespace
 {
     class theImplHelperInitMutex : public rtl::Static<Mutex, theImplHelperInitMutex>{};
diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx
index b5818074821b..30e4d08e6cc4 100644
--- a/cppuhelper/source/implbase_ex.cxx
+++ b/cppuhelper/source/implbase_ex.cxx
@@ -30,10 +30,13 @@
 
 using namespace ::cppu;
 using namespace ::osl;
-using namespace ::rtl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
+using rtl::OString;
+using rtl::OUString;
+using rtl::OUStringBuffer;
+
 namespace cppu
 {
 
diff --git a/cppuhelper/source/implementationentry.cxx b/cppuhelper/source/implementationentry.cxx
index 1ee5136e5439..b6d9dd42c9b0 100644
--- a/cppuhelper/source/implementationentry.cxx
+++ b/cppuhelper/source/implementationentry.cxx
@@ -20,11 +20,13 @@
 #include <cppuhelper/implementationentry.hxx>
 #include <rtl/ustrbuf.hxx>
 
-using namespace ::rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
 
+using rtl::OUString;
+using rtl::OUStringBuffer;
+
 namespace cppu {
 
 sal_Bool component_writeInfoHelper(
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index 72ff90a4114e..24708d91da19 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -38,12 +38,13 @@
 #define SERVICE_NAME_B "com.sun.star.lang.BootstrapMacroExpander"
 #define IMPL_NAME "com.sun.star.lang.comp.cppuhelper.BootstrapMacroExpander"
 
-
-using namespace ::rtl;
 using namespace ::osl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
+using rtl::Bootstrap;
+using rtl::OUString;
+
 namespace cppu
 {
 
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index db741ada70db..1ec25490ea9b 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -43,12 +43,14 @@
 #include <osl/detail/ios-bootstrap.h>
 #endif
 
-
-using namespace ::rtl;
 using namespace ::osl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
+using rtl::OString;
+using rtl::OUString;
+using rtl::OUStringBuffer;
+
 namespace cppu
 {
 
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index f838adfdd8c7..76c6558202b5 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -51,11 +51,11 @@
 
 #include "boost/scoped_array.hpp"
 
-using namespace ::rtl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::reflection;
 
+using rtl::OUString;
 
 namespace cppu
 {