diff options
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx | 4 | ||||
-rw-r--r-- | connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx | 3 | ||||
-rw-r--r-- | connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx | 1 | ||||
-rw-r--r-- | connectivity/workben/iniParser/main.cxx | 6 | ||||
-rw-r--r-- | connectivity/workben/little/main.cxx | 3 | ||||
-rw-r--r-- | connectivity/workben/testmoz/main.cxx | 5 | ||||
-rw-r--r-- | connectivity/workben/testmoz/mozthread.cxx | 4 |
7 files changed, 19 insertions, 7 deletions
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx index 9fb0588ef26e..57ff62261213 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx @@ -31,7 +31,6 @@ #include <rtl/ustring.hxx> #include <com/sun/star/io/IOException.hpp> #include <osl/process.h> -using namespace rtl; #include <map> #include <list> @@ -40,6 +39,9 @@ using namespace rtl; #include <stdio.h> #endif +using ::rtl::OUString; +using ::rtl::OString; + struct ini_NameValue { rtl::OUString sName; diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx index 71620b07475f..bb751a4c100f 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx @@ -41,7 +41,8 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::mozilla; -using namespace rtl; + +using ::rtl::OUString; // Interfaces Needed diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx index d3627772369b..d50097e5c65d 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx @@ -40,7 +40,6 @@ using namespace connectivity::mozab; -using namespace rtl; bool MNameMapper::ltstr::operator()( const ::rtl::OUString &s1, const ::rtl::OUString &s2) const diff --git a/connectivity/workben/iniParser/main.cxx b/connectivity/workben/iniParser/main.cxx index fa0987b15b89..a994e2d6ff1c 100644 --- a/connectivity/workben/iniParser/main.cxx +++ b/connectivity/workben/iniParser/main.cxx @@ -32,11 +32,15 @@ #include <stdio.h> #include <com/sun/star/io/IOException.hpp> #include <osl/process.h> -using namespace rtl; #include <map> #include <list> +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringToOUString; +using ::rtl::OUStringToOString; + struct ini_NameValue { rtl::OUString sName; diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx index e975c38e0c69..2123a22fd69a 100644 --- a/connectivity/workben/little/main.cxx +++ b/connectivity/workben/little/main.cxx @@ -50,9 +50,10 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::beans; -using namespace rtl; using namespace cppu; +using ::rtl::OUString; + #if (defined UNX) || (defined OS2) void main( int argc, char * argv[] ) diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx index 8de0163edab6..deca6f637ab4 100644 --- a/connectivity/workben/testmoz/main.cxx +++ b/connectivity/workben/testmoz/main.cxx @@ -73,7 +73,6 @@ using namespace comphelper; using namespace cppu; -using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; @@ -87,6 +86,10 @@ using namespace com::sun::star::sdbcx; using namespace ::com::sun::star::container; using namespace com::sun::star::registry; +using ::rtl::OUString; +using ::rtl::OUStringBuffer; +using ::rtl::OUStringToOString; + #define OUtoCStr( x ) (OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US ).getStr()) Reference< XContentProviderManager > globalUcb; #define PRINTSTR(x) printf("%s",x); diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx index 3ea344e1d071..b05d132c1ac0 100644 --- a/connectivity/workben/testmoz/mozthread.cxx +++ b/connectivity/workben/testmoz/mozthread.cxx @@ -78,7 +78,6 @@ using namespace comphelper; using namespace cppu; -using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; @@ -92,6 +91,9 @@ using namespace com::sun::star::sdbcx; using namespace ::com::sun::star::container; using namespace com::sun::star::registry; +using ::rtl::OUString; +using ::rtl::OUStringToOString; + extern Reference< XMultiServiceFactory > InitializeFac( void ); Reference< XMultiServiceFactory > mMgr; |