[Libreoffice-commits] .: connectivity/source connectivity/workben
Julien Nabet
serval2412 at kemper.freedesktop.org
Sat Feb 26 06:25:12 PST 2011
connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx | 4 +++-
connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx | 3 ++-
connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx | 1 -
connectivity/workben/iniParser/main.cxx | 6 +++++-
connectivity/workben/little/main.cxx | 3 ++-
connectivity/workben/testmoz/main.cxx | 5 ++++-
connectivity/workben/testmoz/mozthread.cxx | 4 +++-
7 files changed, 19 insertions(+), 7 deletions(-)
New commits:
commit 43ffb60be8716573a3552713483014e3770d89b5
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat Feb 26 15:24:58 2011 +0100
Remove "using namespace ::rtl"
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
index efe78e8..6cab8e3 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 54d4879..a711b42 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 e6e3944..3831017 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 c6664cc..cc7dccb 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 49e0674..53cf1c6 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 561b4d7..cb55312 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 61acbe3..4a76ce7 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;
More information about the Libreoffice-commits
mailing list