[Libreoffice-commits] .: vcl/source vcl/unx vcl/win vcl/workben
Julien Nabet
serval2412 at kemper.freedesktop.org
Tue Mar 1 13:49:39 PST 2011
vcl/source/app/session.cxx | 3 ++-
vcl/source/app/settings.cxx | 3 +--
vcl/source/app/svdata.cxx | 2 +-
vcl/source/control/scrbar.cxx | 3 +--
vcl/source/gdi/base14.cxx | 4 +++-
vcl/source/gdi/bmpconv.cxx | 3 ++-
vcl/source/gdi/configsettings.cxx | 3 ++-
vcl/source/gdi/pdfwriter_impl.cxx | 9 ++++++++-
vcl/source/gdi/salnativewidgets-none.cxx | 2 +-
vcl/source/helper/xconnection.cxx | 2 +-
vcl/source/window/toolbox2.cxx | 3 ++-
vcl/source/window/window.cxx | 3 ++-
vcl/unx/gtk/app/gtkdata.cxx | 3 ++-
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 3 +--
vcl/unx/headless/svpprn.cxx | 4 +++-
vcl/unx/headless/svppspgraphics.cxx | 4 ++--
vcl/unx/source/app/i18n_status.cxx | 1 -
vcl/unx/source/app/saldisp.cxx | 3 ++-
vcl/unx/source/desktopdetect/desktopdetector.cxx | 4 ++--
vcl/unx/source/dtrans/X11_clipboard.cxx | 3 ++-
vcl/unx/source/dtrans/X11_droptarget.cxx | 3 ++-
vcl/unx/source/dtrans/X11_selection.cxx | 5 ++++-
vcl/unx/source/dtrans/X11_service.cxx | 3 ++-
vcl/unx/source/dtrans/X11_transferable.cxx | 4 ++--
vcl/unx/source/dtrans/bmp.cxx | 1 -
vcl/unx/source/dtrans/config.cxx | 3 ++-
vcl/unx/source/fontmanager/fontcache.cxx | 5 ++++-
vcl/unx/source/fontmanager/fontconfig.cxx | 4 +++-
vcl/unx/source/fontmanager/fontmanager.cxx | 10 +++++++++-
vcl/unx/source/fontmanager/helper.cxx | 7 ++++++-
vcl/unx/source/gdi/dtint.cxx | 3 ++-
vcl/unx/source/gdi/pspgraphics.cxx | 4 +++-
vcl/unx/source/gdi/salgdi3.cxx | 3 +--
vcl/unx/source/gdi/salprnpsp.cxx | 5 ++++-
vcl/unx/source/gdi/xrender_peer.cxx | 4 ++--
vcl/unx/source/plugadapt/salplug.cxx | 4 ++--
vcl/unx/source/printer/cupsmgr.cxx | 8 +++++++-
vcl/unx/source/printer/jobdata.cxx | 1 -
vcl/unx/source/printer/ppdparser.cxx | 6 +++++-
vcl/unx/source/printer/printerinfomanager.cxx | 6 +++++-
vcl/unx/source/printergfx/glyphset.cxx | 6 +++++-
vcl/unx/source/printergfx/printerjob.cxx | 6 +++++-
vcl/win/source/gdi/salgdi.cxx | 3 +--
vcl/win/source/gdi/salnativewidgets-luna.cxx | 3 ++-
vcl/win/source/gdi/salprn.cxx | 2 +-
vcl/win/source/gdi/winlayout.cxx | 4 +++-
vcl/workben/svpclient.cxx | 8 +++++++-
vcl/workben/svptest.cxx | 4 +++-
48 files changed, 132 insertions(+), 58 deletions(-)
New commits:
commit d90386875b3e6ad581244830120ac2856b38e868
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Tue Mar 1 22:45:35 2011 +0100
Remove "using namespace ::rtl"
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index c3a36fb..49b052c 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -43,7 +43,8 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::frame;
-using namespace rtl;
+
+using ::rtl::OUString;
SalSession::~SalSession()
{
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index c6cbfbc..bcc784b 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -52,8 +52,7 @@
#include <postwin.h>
#endif
-using namespace rtl;
-
+using ::rtl::OUString;
// =======================================================================
DBG_NAME( AllSettings )
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 9b5c380..b21ee99 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -71,7 +71,7 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::awt;
-using namespace rtl;
+using ::rtl::OUString;
// =======================================================================
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 4967813..d96f00e 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -39,10 +39,9 @@
#include "rtl/string.hxx"
#include "tools/rc.h"
+using ::rtl::OUString;
-using namespace rtl;
-
/* #i77549#
HACK: for scrollbars in case of thumb rect, page up and page down rect we
abuse the HitTestNativeControl interface. All theming engines but aqua
diff --git a/vcl/source/gdi/base14.cxx b/vcl/source/gdi/base14.cxx
index da30404..7aa7267 100644
--- a/vcl/source/gdi/base14.cxx
+++ b/vcl/source/gdi/base14.cxx
@@ -33,7 +33,9 @@
#include <rtl/strbuf.hxx>
using namespace vcl;
-using namespace rtl;
+
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
OString PDFWriterImpl::BuiltinFont::getNameObject() const
{
diff --git a/vcl/source/gdi/bmpconv.cxx b/vcl/source/gdi/bmpconv.cxx
index e7ca88c..5d614c7 100644
--- a/vcl/source/gdi/bmpconv.cxx
+++ b/vcl/source/gdi/bmpconv.cxx
@@ -44,7 +44,8 @@ using namespace com::sun::star::script;
using namespace com::sun::star::beans;
using namespace com::sun::star::reflection;
using namespace com::sun::star::awt;
-using namespace rtl;
+
+using ::rtl::OUString;
namespace vcl {
diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx
index d0094f1..ce5a439 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.cxx
@@ -35,7 +35,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
-using namespace rtl;
using namespace utl;
using namespace vcl;
using namespace com::sun::star::uno;
@@ -43,6 +42,8 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::container;
+using ::rtl::OUString;
+
#define SETTINGS_CONFIGNODE "VCL/Settings"
/*
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index e319ffb..8f935e0 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -70,7 +70,14 @@
#include <vcl/lineinfo.hxx>
using namespace vcl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+using ::rtl::OStringHash;
+using ::rtl::OUStringHash;
+using ::rtl::OStringBuffer;
+using ::rtl::OUStringBuffer;
#if (OSL_DEBUG_LEVEL < 2)
#define COMPRESS_PAGES
diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx
index 6ed2079..b0dcc42 100644
--- a/vcl/source/gdi/salnativewidgets-none.cxx
+++ b/vcl/source/gdi/salnativewidgets-none.cxx
@@ -31,7 +31,7 @@
#include <vcl/salgdi.hxx>
-using namespace rtl;
+using ::rtl::OUString;
/****************************************************************
* Placeholder for no native widgets
diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx
index 976af9f..9b13ffd 100644
--- a/vcl/source/helper/xconnection.cxx
+++ b/vcl/source/helper/xconnection.cxx
@@ -35,12 +35,12 @@
#include "vcl/salinst.hxx"
#include "vcl/svapp.hxx"
-using namespace rtl;
using namespace osl;
using namespace vcl;
using namespace com::sun::star::uno;
using namespace com::sun::star::awt;
+using ::rtl::OUString;
DisplayConnection::DisplayConnection()
{
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index acaca04..ce49885 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -48,7 +48,8 @@
#include <com/sun/star/lang/IllegalArgumentException.hpp>
using namespace vcl;
-using namespace rtl;
+
+using ::rtl::OUString;
// =======================================================================
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 0469c99..512dd6c 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -97,7 +97,6 @@
#include <set>
#include <typeinfo>
-using namespace rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::datatransfer::clipboard;
@@ -105,6 +104,8 @@ using namespace ::com::sun::star::datatransfer::dnd;
using namespace ::com::sun::star;
using namespace com::sun;
+using ::rtl::OUString;
+
using ::com::sun::star::awt::XTopWindow;
// =======================================================================
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 90fabe8..3a58861 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -64,9 +64,10 @@
#include <vcl/svapp.hxx>
-using namespace rtl;
using namespace vcl_sal;
+using ::rtl::OUString;
+
/***************************************************************************
* class GtkDisplay *
***************************************************************************/
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index a889209..5723841 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -59,8 +59,7 @@ GtkSalGraphics::~GtkSalGraphics()
{
}
-
-using namespace rtl;
+using ::rtl::OUString;
/*************************************
* Cached native widget objects
diff --git a/vcl/unx/headless/svpprn.cxx b/vcl/unx/headless/svpprn.cxx
index f625bad..538625d 100644
--- a/vcl/unx/headless/svpprn.cxx
+++ b/vcl/unx/headless/svpprn.cxx
@@ -45,7 +45,9 @@
#include <sys/wait.h>
using namespace psp;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
/*
* static helpers
diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx
index 954c564..f28a9d1 100644
--- a/vcl/unx/headless/svppspgraphics.cxx
+++ b/vcl/unx/headless/svppspgraphics.cxx
@@ -57,10 +57,10 @@
#include <sys/types.h>
using namespace psp;
-using namespace rtl;
using namespace basebmp;
using namespace basegfx;
-
+using ::rtl::OUString;
+using ::rtl::OString;
// ----- Implementation of PrinterBmp by means of SalBitmap/BitmapBuffer ---------------
class SalPrinterBmp : public psp::PrinterBmp
diff --git a/vcl/unx/source/app/i18n_status.cxx b/vcl/unx/source/app/i18n_status.cxx
index 98d26e4..1f425a5 100644
--- a/vcl/unx/source/app/i18n_status.cxx
+++ b/vcl/unx/source/app/i18n_status.cxx
@@ -56,7 +56,6 @@
#include <vcl/sysdata.hxx>
using namespace vcl;
-using namespace rtl;
namespace vcl {
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
index ab7aad1..b9dc889 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.cxx
@@ -97,9 +97,10 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*);
#include <osl/socket.h>
#include <poll.h>
-using namespace rtl;
using namespace vcl_sal;
+using ::rtl::OUString;
+
// -=-= #defines -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
#define PSEUDOCOLOR12
diff --git a/vcl/unx/source/desktopdetect/desktopdetector.cxx b/vcl/unx/source/desktopdetect/desktopdetector.cxx
index 5f8190c..e1065be 100644
--- a/vcl/unx/source/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/source/desktopdetect/desktopdetector.cxx
@@ -44,8 +44,8 @@
#include <unistd.h>
#include <string.h>
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OString;
enum {
DESKTOP_NONE = 0,
DESKTOP_UNKNOWN,
diff --git a/vcl/unx/source/dtrans/X11_clipboard.cxx b/vcl/unx/source/dtrans/X11_clipboard.cxx
index c50470a..279fb89 100644
--- a/vcl/unx/source/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/source/dtrans/X11_clipboard.cxx
@@ -53,9 +53,10 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::awt;
using namespace cppu;
using namespace osl;
-using namespace rtl;
using namespace x11;
+using ::rtl::OUString;
+
X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) :
::cppu::WeakComponentImplHelper4<
::com::sun::star::datatransfer::clipboard::XClipboardEx,
diff --git a/vcl/unx/source/dtrans/X11_droptarget.cxx b/vcl/unx/source/dtrans/X11_droptarget.cxx
index fdf083c..0956c92 100644
--- a/vcl/unx/source/dtrans/X11_droptarget.cxx
+++ b/vcl/unx/source/dtrans/X11_droptarget.cxx
@@ -32,12 +32,13 @@
#include <X11_selection.hxx>
using namespace x11;
-using namespace rtl;
using namespace com::sun::star::lang;
using namespace com::sun::star::awt;
using namespace com::sun::star::datatransfer;
using namespace com::sun::star::datatransfer::dnd;
+using ::rtl::OUString;
+
DropTarget::DropTarget() :
::cppu::WeakComponentImplHelper3<
XDropTarget,
diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx
index ccdb16f..df908a6 100644
--- a/vcl/unx/source/dtrans/X11_selection.cxx
+++ b/vcl/unx/source/dtrans/X11_selection.cxx
@@ -89,10 +89,13 @@ using namespace com::sun::star::awt;
using namespace com::sun::star::uno;
using namespace com::sun::star::frame;
using namespace cppu;
-using namespace rtl;
using namespace x11;
+using ::rtl::OUString;
+using ::rtl::OUStringHash;
+using ::rtl::OStringToOUString;
+
// stubs to satisfy solaris compiler's rather rigid linking warning
extern "C"
{
diff --git a/vcl/unx/source/dtrans/X11_service.cxx b/vcl/unx/source/dtrans/X11_service.cxx
index 85e646a..6b24897 100644
--- a/vcl/unx/source/dtrans/X11_service.cxx
+++ b/vcl/unx/source/dtrans/X11_service.cxx
@@ -40,13 +40,14 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/compbase1.hxx>
-using namespace rtl;
using namespace cppu;
using namespace com::sun::star::lang;
using namespace com::sun::star::datatransfer::clipboard;
using namespace com::sun::star::awt;
using namespace x11;
+using ::rtl::OUString;
+
Sequence< OUString > SAL_CALL x11::X11Clipboard_getSupportedServiceNames()
{
Sequence< OUString > aRet(1);
diff --git a/vcl/unx/source/dtrans/X11_transferable.cxx b/vcl/unx/source/dtrans/X11_transferable.cxx
index 5b5e292..946144d 100644
--- a/vcl/unx/source/dtrans/X11_transferable.cxx
+++ b/vcl/unx/source/dtrans/X11_transferable.cxx
@@ -43,11 +43,11 @@ using namespace com::sun::star::io;
using namespace com::sun::star::uno;
using namespace cppu;
using namespace osl;
-using namespace rtl;
-
using namespace x11;
+using ::rtl::OUString;
+
X11Transferable::X11Transferable(
SelectionManager& rManager,
diff --git a/vcl/unx/source/dtrans/bmp.cxx b/vcl/unx/source/dtrans/bmp.cxx
index f42cf73..6e4fb85 100644
--- a/vcl/unx/source/dtrans/bmp.cxx
+++ b/vcl/unx/source/dtrans/bmp.cxx
@@ -42,7 +42,6 @@ using namespace x11;
using namespace com::sun::star::uno;
using namespace com::sun::star::script;
using namespace com::sun::star::awt;
-using namespace rtl;
/*
* helper functions
diff --git a/vcl/unx/source/dtrans/config.cxx b/vcl/unx/source/dtrans/config.cxx
index 34eb2ea..4173c6d 100644
--- a/vcl/unx/source/dtrans/config.cxx
+++ b/vcl/unx/source/dtrans/config.cxx
@@ -57,9 +57,10 @@ public:
using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
-using namespace rtl;
using namespace x11;
+using ::rtl::OUString;
+
sal_Int32 SelectionManager::getSelectionTimeout()
{
if( m_nSelectionTimeout < 1 )
diff --git a/vcl/unx/source/fontmanager/fontcache.cxx b/vcl/unx/source/fontmanager/fontcache.cxx
index 2dbf9aa..b322761 100644
--- a/vcl/unx/source/fontmanager/fontcache.cxx
+++ b/vcl/unx/source/fontmanager/fontcache.cxx
@@ -51,10 +51,13 @@
#define CACHE_MAGIC "PspFontCacheFile format 4"
using namespace std;
-using namespace rtl;
using namespace psp;
using namespace utl;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
+
/*
* static helpers
*/
diff --git a/vcl/unx/source/fontmanager/fontconfig.cxx b/vcl/unx/source/fontmanager/fontconfig.cxx
index 04d3abc..d7a888d 100644
--- a/vcl/unx/source/fontmanager/fontconfig.cxx
+++ b/vcl/unx/source/fontmanager/fontconfig.cxx
@@ -90,7 +90,9 @@ using namespace psp;
#include <algorithm>
using namespace osl;
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OString;
namespace
{
diff --git a/vcl/unx/source/fontmanager/fontmanager.cxx b/vcl/unx/source/fontmanager/fontmanager.cxx
index 49dc803..da1d250 100644
--- a/vcl/unx/source/fontmanager/fontmanager.cxx
+++ b/vcl/unx/source/fontmanager/fontmanager.cxx
@@ -94,11 +94,19 @@ using namespace vcl;
using namespace utl;
using namespace psp;
using namespace osl;
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringHash;
+using ::rtl::OStringBuffer;
+using ::rtl::OUStringBuffer;
+using ::rtl::OUStringHash;
+using ::rtl::OStringToOUString;
+using ::rtl::OUStringToOString;
+
/*
* static helpers
*/
diff --git a/vcl/unx/source/fontmanager/helper.cxx b/vcl/unx/source/fontmanager/helper.cxx
index 88ff842..451faaf 100644
--- a/vcl/unx/source/fontmanager/helper.cxx
+++ b/vcl/unx/source/fontmanager/helper.cxx
@@ -42,7 +42,12 @@
#include "osl/process.h"
#include "rtl/bootstrap.hxx"
-using namespace rtl;
+using ::rtl::Bootstrap;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
+using ::rtl::OUStringToOString;
namespace psp {
diff --git a/vcl/unx/source/gdi/dtint.cxx b/vcl/unx/source/gdi/dtint.cxx
index 0eb07fb..3ecc423 100644
--- a/vcl/unx/source/gdi/dtint.cxx
+++ b/vcl/unx/source/gdi/dtint.cxx
@@ -64,9 +64,10 @@
#endif
-using namespace rtl;
using namespace vcl_sal;
+using ::rtl::OUString;
+
String DtIntegrator::aHomeDir;
DtIntegrator::DtIntegrator() :
diff --git a/vcl/unx/source/gdi/pspgraphics.cxx b/vcl/unx/source/gdi/pspgraphics.cxx
index ee0c2f9..6464604 100644
--- a/vcl/unx/source/gdi/pspgraphics.cxx
+++ b/vcl/unx/source/gdi/pspgraphics.cxx
@@ -56,7 +56,9 @@
#endif
using namespace psp;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OString;
// ----- Implementation of PrinterBmp by means of SalBitmap/BitmapBuffer ---------------
diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx
index 0f40002..ff876ba 100644
--- a/vcl/unx/source/gdi/salgdi3.cxx
+++ b/vcl/unx/source/gdi/salgdi3.cxx
@@ -111,8 +111,7 @@ struct _XRegion
BOX *rects;
BOX extents;
};
-using namespace rtl;
-
+using ::rtl::OUString;
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
// ----------------------------------------------------------------------------
diff --git a/vcl/unx/source/gdi/salprnpsp.cxx b/vcl/unx/source/gdi/salprnpsp.cxx
index cc4d8aa..241c4e7 100644
--- a/vcl/unx/source/gdi/salprnpsp.cxx
+++ b/vcl/unx/source/gdi/salprnpsp.cxx
@@ -63,7 +63,10 @@
#include "osl/module.h"
using namespace psp;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringHash;
+using ::rtl::OUStringToOString;
/*
* static helpers
diff --git a/vcl/unx/source/gdi/xrender_peer.cxx b/vcl/unx/source/gdi/xrender_peer.cxx
index 7558a81..3f5d310 100644
--- a/vcl/unx/source/gdi/xrender_peer.cxx
+++ b/vcl/unx/source/gdi/xrender_peer.cxx
@@ -33,8 +33,8 @@
#include <rtl/ustring.hxx>
#include <osl/module.h>
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
#include <xrender_peer.hxx>
#include <salunx.h>
diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx
index 6b8c20e..1cf2de1 100644
--- a/vcl/unx/source/plugadapt/salplug.cxx
+++ b/vcl/unx/source/plugadapt/salplug.cxx
@@ -41,8 +41,8 @@
#include <cstdio>
#include <unistd.h>
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
extern "C" {
typedef SalInstance*(*salFactoryProc)( oslModule pModule);
}
diff --git a/vcl/unx/source/printer/cupsmgr.cxx b/vcl/unx/source/printer/cupsmgr.cxx
index a03fbdf..e0416e7 100644
--- a/vcl/unx/source/printer/cupsmgr.cxx
+++ b/vcl/unx/source/printer/cupsmgr.cxx
@@ -139,7 +139,13 @@ public:
using namespace psp;
using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
+using ::rtl::OUStringHash;
+using ::rtl::OString;
/*
* CUPSWrapper class
diff --git a/vcl/unx/source/printer/jobdata.cxx b/vcl/unx/source/printer/jobdata.cxx
index a10d49a..483b79d 100644
--- a/vcl/unx/source/printer/jobdata.cxx
+++ b/vcl/unx/source/printer/jobdata.cxx
@@ -37,7 +37,6 @@
#include "sal/alloca.h"
using namespace psp;
-using namespace rtl;
JobData& JobData::operator=(const JobData& rRight)
{
diff --git a/vcl/unx/source/printer/ppdparser.cxx b/vcl/unx/source/printer/ppdparser.cxx
index 824a892..29da5aa 100644
--- a/vcl/unx/source/printer/ppdparser.cxx
+++ b/vcl/unx/source/printer/ppdparser.cxx
@@ -269,7 +269,11 @@ namespace psp
}
using namespace psp;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OStringBuffer;
+using ::rtl::OUStringHash;
+
#undef DBG_ASSERT
#if defined DBG_UTIL || (OSL_DEBUG_LEVEL > 1)
diff --git a/vcl/unx/source/printer/printerinfomanager.cxx b/vcl/unx/source/printer/printerinfomanager.cxx
index 67cf4e5..abb6600 100644
--- a/vcl/unx/source/printer/printerinfomanager.cxx
+++ b/vcl/unx/source/printer/printerinfomanager.cxx
@@ -61,9 +61,13 @@
#include <boost/unordered_set.hpp>
using namespace psp;
-using namespace rtl;
using namespace osl;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
+using ::rtl::OUStringHash;
+
namespace psp
{
class SystemQueueInfo : public Thread
diff --git a/vcl/unx/source/printergfx/glyphset.cxx b/vcl/unx/source/printergfx/glyphset.cxx
index 3144ef3..fbcbe0d 100644
--- a/vcl/unx/source/printergfx/glyphset.cxx
+++ b/vcl/unx/source/printergfx/glyphset.cxx
@@ -51,7 +51,11 @@
using namespace vcl;
using namespace psp;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
+using ::rtl::OUStringToOString;
GlyphSet::GlyphSet ()
: mnFontID (-1),
diff --git a/vcl/unx/source/printergfx/printerjob.cxx b/vcl/unx/source/printergfx/printerjob.cxx
index a3788d5..3b78a37 100644
--- a/vcl/unx/source/printergfx/printerjob.cxx
+++ b/vcl/unx/source/printergfx/printerjob.cxx
@@ -57,7 +57,11 @@
#include <vector>
using namespace psp;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
// forward declaration
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 6f024e2..55c9409 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -40,8 +40,7 @@
#include <tools/poly.hxx>
#include <rtl/strbuf.hxx>
-using namespace rtl;
-
+using ::rtl::OStringBuffer;
// =======================================================================
// comment out to prevent use of beziers on GDI functions
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 9ff5d27..aac80ed 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -45,9 +45,10 @@
#include <map>
#include <string>
-using namespace rtl;
using namespace std;
+using ::rtl::OUString;
+
typedef map< wstring, HTHEME > ThemeMap;
static ThemeMap aThemeMap;
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 28a9684..73746f1 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -97,7 +97,7 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::ui::dialogs;
-using namespace rtl;
+using ::rtl::OUString;
// =======================================================================
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index e63f4d2..735efa3 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -84,7 +84,9 @@ typedef std::set<int> IntSet;
#define DROPPED_OUTGLYPH 0xFFFF
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
// =======================================================================
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index a5dcabc..0fdd22b 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -59,11 +59,17 @@
#include <netinet/in.h>
-using namespace rtl;
using namespace cppu;
using namespace comphelper;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
+
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OStringBuffer;
// -----------------------------------------------------------------------
// Forward declaration
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 4b5c40c..d492eb2 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -47,9 +47,11 @@
#include <cppuhelper/servicefactory.hxx>
#include <cppuhelper/bootstrap.hxx>
-using namespace rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
+
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
// -----------------------------------------------------------------------
// Forward declaration
More information about the Libreoffice-commits
mailing list