From 933e22880b2d5d9c6dd6e3e05c30d6f0ced55508 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Wed, 2 Mar 2011 21:53:12 +0100 Subject: Remove "using namespace ::rtl" --- bridges/source/cpp_uno/cc50_solaris_intel/except.cxx | 7 +++++-- bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx | 3 ++- bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx | 8 ++++++-- bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx | 3 ++- bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx | 5 ++++- bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx | 5 ++++- bridges/source/remote/urp/urp_threadid.cxx | 3 ++- 7 files changed, 25 insertions(+), 9 deletions(-) (limited to 'bridges') diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx index 8f13ad0d8654..1af3b7ac1352 100644 --- a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx @@ -49,7 +49,11 @@ #include // need a += operator for OString and sal_Char -namespace rtl +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringBuffer; +using ::rtl::OUStringToOString; +using ::rtl::OStringToOUString; { inline OString& operator+=( OString& rString, sal_Char cAdd ) { @@ -62,7 +66,6 @@ namespace rtl using namespace std; using namespace osl; -using namespace rtl; using namespace com::sun::star::uno; namespace CPPU_CURRENT_NAMESPACE diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx index b72ebc0ac1f3..287ca5deadd7 100644 --- a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx @@ -42,9 +42,10 @@ #include "cc50_solaris_intel.hxx" -using namespace rtl; using namespace com::sun::star::uno; +using ::rtl::OUString; + namespace { diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx index 916a42bb75e5..d0e8a4fc8bbb 100644 --- a/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx @@ -50,7 +50,12 @@ #include // need a += operator for OString and sal_Char -namespace rtl +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringBuffer; +using ::rtl::OUStringToOString; +using ::rtl::OStringToOUString; + { inline OString& operator+=( OString& rString, sal_Char cAdd ) { @@ -63,7 +68,6 @@ namespace rtl using namespace std; using namespace osl; -using namespace rtl; using namespace com::sun::star::uno; namespace CPPU_CURRENT_NAMESPACE diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx index 6a0c7d2eec7f..9d0d139850ec 100644 --- a/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx @@ -42,9 +42,10 @@ #include "cc50_solaris_sparc.hxx" -using namespace rtl; using namespace com::sun::star::uno; +using ::rtl::OUString; + namespace { diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx index ffce7fa008d4..f99e60d0d6fd 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx @@ -39,9 +39,12 @@ #include "share.hxx" -using namespace rtl; using namespace com::sun::star::uno; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OUStringToOString; + namespace { //================================================================================================== diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx index c7636bb5b191..81dbb5dcea53 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx @@ -41,9 +41,12 @@ #include -using namespace rtl; using namespace com::sun::star::uno; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OUStringToOString; + namespace { //================================================================================================== diff --git a/bridges/source/remote/urp/urp_threadid.cxx b/bridges/source/remote/urp/urp_threadid.cxx index e603a73bab83..5c991e142eef 100644 --- a/bridges/source/remote/urp/urp_threadid.cxx +++ b/bridges/source/remote/urp/urp_threadid.cxx @@ -32,7 +32,8 @@ #include -using namespace rtl; +using ::rtl::OString; +using ::rtl::OStringBuffer; namespace bridges_urp { -- cgit