From fdc03569ba14198aef950594242c7e088649dc33 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 bf4083576..8d8f20dbb 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 a4c4baadf..af34b499b 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 1e261d2cb..756dc6b1a 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 5bb52af1a..15da8c20e 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 9d5c2d164..6cd22a836 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 22a483aff..6a824dafa 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 4554057d2..543ba7b9a 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 v1.2.3