[Libreoffice-commits] .: vcl/aqua vcl/inc vcl/os2
Julien Nabet
serval2412 at kemper.freedesktop.org
Sun Feb 27 14:05:25 PST 2011
vcl/aqua/source/app/salsys.cxx | 2 +-
vcl/aqua/source/dtrans/DataFlavorMapping.cxx | 4 +++-
vcl/aqua/source/dtrans/DragSource.cxx | 2 +-
vcl/aqua/source/dtrans/DropTarget.cxx | 3 ++-
vcl/aqua/source/dtrans/OSXTransferable.cxx | 3 ++-
vcl/aqua/source/dtrans/aqua_clipboard.cxx | 2 +-
vcl/aqua/source/dtrans/aqua_service.cxx | 3 ++-
vcl/aqua/source/gdi/salprn.cxx | 4 +++-
vcl/inc/vcl/salframe.hxx | 3 ++-
vcl/os2/source/gdi/os2layout.cxx | 2 --
10 files changed, 17 insertions(+), 11 deletions(-)
New commits:
commit 6d8db28b78bd0041a37fef9668a1c43d332246b5
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sun Feb 27 23:05:12 2011 +0100
Remove "using namespace ::rtl"
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index c279c1c..26bd56f 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.cxx
@@ -36,7 +36,7 @@
#include "saldata.hxx"
#include "rtl/ustrbuf.hxx"
-using namespace rtl;
+using ::rtl::OUString;
// =======================================================================
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index 1c9ae09..db002de 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -47,12 +47,14 @@
#include <postmac.h>
using namespace ::com::sun::star::datatransfer;
-using namespace rtl;
using namespace ::com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace cppu;
using namespace std;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+
namespace // private
{
const Type CPPUTYPE_SEQINT8 = getCppuType((Sequence<sal_Int8>*)0);
diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx
index 1b5d651..1674969 100644
--- a/vcl/aqua/source/dtrans/DragSource.cxx
+++ b/vcl/aqua/source/dtrans/DragSource.cxx
@@ -44,7 +44,6 @@
#include <memory>
-using namespace rtl;
using namespace cppu;
using namespace osl;
using namespace com::sun::star::datatransfer;
@@ -58,6 +57,7 @@ using namespace com::sun::star::lang;
using namespace comphelper;
using namespace std;
+using ::rtl::OUString;
// For OOo internal D&D we provide the Transferable without NSDragPboard
// interference as a shortcut
diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx
index 5404dc1..3809c99 100644
--- a/vcl/aqua/source/dtrans/DropTarget.cxx
+++ b/vcl/aqua/source/dtrans/DropTarget.cxx
@@ -50,7 +50,6 @@
#include <postmac.h>
-using namespace rtl;
using namespace cppu;
using namespace osl;
using namespace com::sun::star::datatransfer;
@@ -61,6 +60,8 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
using namespace comphelper;
+using ::rtl::OUString;
+
OUString dropTarget_getImplementationName()
{
return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1"));
diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/aqua/source/dtrans/OSXTransferable.cxx
index a65a66f..06696e0 100644
--- a/vcl/aqua/source/dtrans/OSXTransferable.cxx
+++ b/vcl/aqua/source/dtrans/OSXTransferable.cxx
@@ -34,7 +34,6 @@
#include "DataFlavorMapping.hxx"
-using namespace rtl;
using namespace std;
using namespace osl;
using namespace cppu;
@@ -44,6 +43,8 @@ using namespace com::sun::star::io;
using namespace com::sun::star::lang;
using namespace com::sun::star::container;
+using ::rtl::OUString;
+
const Type CPPUTYPE_SEQINT8 = getCppuType((Sequence<sal_Int8>*)0);
const Type CPPUTYPE_OUSTRING = getCppuType((OUString*)0);
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
index 4a95fc7..fee4957 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
@@ -45,10 +45,10 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
using namespace cppu;
using namespace osl;
-using namespace rtl;
using namespace std;
using namespace comphelper;
+using ::rtl::OUString;
@implementation EventListener;
diff --git a/vcl/aqua/source/dtrans/aqua_service.cxx b/vcl/aqua/source/dtrans/aqua_service.cxx
index 4fa1a2c..5c255b3 100644
--- a/vcl/aqua/source/dtrans/aqua_service.cxx
+++ b/vcl/aqua/source/dtrans/aqua_service.cxx
@@ -33,7 +33,6 @@
#include <com/sun/star/container/XSet.hpp>
#include <osl/diagnose.h>
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::registry;
using namespace cppu;
@@ -41,6 +40,8 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::datatransfer::clipboard;
using namespace aqua;
+using ::rtl::OUString;
+
namespace aqua {
Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index 13c308d..103eff8 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -49,7 +49,6 @@
#include <algorithm>
-using namespace rtl;
using namespace vcl;
using namespace com::sun::star;
using namespace com::sun::star::uno;
@@ -57,6 +56,9 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::container;
+using ::rtl::OUString;
+using ::rtl::OStringToOUString;
+
// =======================================================================
AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) :
diff --git a/vcl/inc/vcl/salframe.hxx b/vcl/inc/vcl/salframe.hxx
index 3e4671d..a359088 100644
--- a/vcl/inc/vcl/salframe.hxx
+++ b/vcl/inc/vcl/salframe.hxx
@@ -132,7 +132,8 @@ typedef sal_uInt64 SalExtStyle;
#ifdef __cplusplus
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OString;
// ------------
// - SalFrame -
diff --git a/vcl/os2/source/gdi/os2layout.cxx b/vcl/os2/source/gdi/os2layout.cxx
index 781b335..3f2d4e4 100644
--- a/vcl/os2/source/gdi/os2layout.cxx
+++ b/vcl/os2/source/gdi/os2layout.cxx
@@ -54,8 +54,6 @@ typedef boost::unordered_map<int,int> IntMap;
#define DROPPED_OUTGLYPH 0xFFFF
-using namespace rtl;
-
// =======================================================================
// OS/2 specific physical font instance
More information about the Libreoffice-commits
mailing list