summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ucb/source/core/ucbprops.cxx3
-rw-r--r--ucb/source/ucp/ftp/ftpdirp.cxx3
-rw-r--r--ucb/source/ucp/gvfs/gvfs_stream.cxx3
-rw-r--r--ucb/source/ucp/package/pkguri.cxx3
-rw-r--r--ucb/source/ucp/webdav/DateTimeHelper.cxx4
-rw-r--r--ucb/source/ucp/webdav/NeonInputStream.cxx2
-rw-r--r--ucb/source/ucp/webdav/NeonPropFindRequest.cxx5
-rw-r--r--uui/source/services.cxx3
-rw-r--r--xmloff/source/core/facreg.cxx3
-rw-r--r--xmloff/source/core/i18nmap.cxx2
-rw-r--r--xmloff/source/core/xmlcnitm.cxx3
-rw-r--r--xmloff/source/core/xmltkmap.cxx3
-rw-r--r--xmloff/source/draw/XMLNumberStyles.cxx3
-rw-r--r--xmloff/source/draw/viewcontext.cxx3
-rw-r--r--xmloff/source/style/impastp1.cxx2
-rw-r--r--xmloff/source/style/impastp2.cxx4
-rw-r--r--xmloff/source/style/impastp3.cxx3
-rw-r--r--xmlscript/source/xml_helper/xml_byteseq.cxx2
-rw-r--r--xmlscript/source/xml_helper/xml_element.cxx3
-rw-r--r--xmlscript/source/xmllib_imexp/xmllib_export.cxx3
-rw-r--r--xmlscript/source/xmlmod_imexp/xmlmod_export.cxx3
21 files changed, 39 insertions, 24 deletions
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index 2adba422c649..a35de4af8e2a 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -43,13 +43,14 @@
#include <com/sun/star/ucb/XDataContainer.hpp>
#include "ucbprops.hxx"
-using namespace rtl;
using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
using namespace com::sun::star::ucb;
using namespace com::sun::star::uno;
using namespace com::sun::star::util;
+using ::rtl::OUString;
+
//=========================================================================
//
// struct PropertyTableEntry
diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx
index 10f6bb72a390..fc39afce9f08 100644
--- a/ucb/source/ucp/ftp/ftpdirp.cxx
+++ b/ucb/source/ucp/ftp/ftpdirp.cxx
@@ -38,10 +38,9 @@
#include <osl/time.h>
-using namespace rtl;
using namespace ftp;
-
+using ::rtl::OUString;
typedef sal_uInt32 ULONG;
diff --git a/ucb/source/ucp/gvfs/gvfs_stream.cxx b/ucb/source/ucp/gvfs/gvfs_stream.cxx
index 7a2c7708cfe1..a78459ead37f 100644
--- a/ucb/source/ucp/gvfs/gvfs_stream.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_stream.cxx
@@ -35,12 +35,13 @@
#include <libgnomevfs/gnome-vfs-ops.h>
using namespace cppu;
-using namespace rtl;
using namespace com::sun::star::io;
using namespace com::sun::star::uno;
using namespace com::sun::star::ucb;
using namespace gvfs;
+using ::rtl::OUString;
+
Stream::Stream( GnomeVFSHandle *handle,
const GnomeVFSFileInfo *aInfo ) :
m_eof (sal_False),
diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx
index c9a2ad4a8021..d9038b1a0c5c 100644
--- a/ucb/source/ucp/package/pkguri.cxx
+++ b/ucb/source/ucp/package/pkguri.cxx
@@ -44,7 +44,8 @@
#include "pkguri.hxx"
using namespace package_ucp;
-using namespace rtl;
+
+using ::rtl::OUString;
//=========================================================================
//=========================================================================
diff --git a/ucb/source/ucp/webdav/DateTimeHelper.cxx b/ucb/source/ucp/webdav/DateTimeHelper.cxx
index 204a6897561c..2093699bd33e 100644
--- a/ucb/source/ucp/webdav/DateTimeHelper.cxx
+++ b/ucb/source/ucp/webdav/DateTimeHelper.cxx
@@ -35,10 +35,12 @@
#include "DateTimeHelper.hxx"
using namespace com::sun::star::util;
-using namespace rtl;
using namespace webdav_ucp;
+using ::rtl::OUString;
+using ::rtl::OString;
+
bool DateTimeHelper::ISO8601_To_DateTime (const OUString& s,
DateTime& dateTime)
{
diff --git a/ucb/source/ucp/webdav/NeonInputStream.cxx b/ucb/source/ucp/webdav/NeonInputStream.cxx
index 036268033d57..0e36b8395534 100644
--- a/ucb/source/ucp/webdav/NeonInputStream.cxx
+++ b/ucb/source/ucp/webdav/NeonInputStream.cxx
@@ -32,12 +32,10 @@
#include <rtl/memory.h>
using namespace cppu;
-using namespace rtl;
using namespace com::sun::star::io;
using namespace com::sun::star::uno;
using namespace webdav_ucp;
-
// -------------------------------------------------------------------
// Constructor
// -------------------------------------------------------------------
diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
index 629374727757..64b9963ea89c 100644
--- a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
@@ -40,12 +40,15 @@
#include "LockEntrySequence.hxx"
#include "UCBDeadPropertyValue.hxx"
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::ucb;
using namespace std;
using namespace webdav_ucp;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
+
// -------------------------------------------------------------------
namespace
{
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
index e2c5fae546f6..8063d83585f9 100644
--- a/uui/source/services.cxx
+++ b/uui/source/services.cxx
@@ -37,11 +37,12 @@
#include "requeststringresolver.hxx"
#include "passwordcontainer.hxx"
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
+using ::rtl::OUString;
+
namespace {
sal_Bool writeInfo( void * pRegistryKey,
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 130c72096a7a..b786ae3f6593 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -43,9 +43,10 @@
#include <uno/lbnames.h>
#include "xmlreg.hxx"
-using namespace rtl;
using namespace com::sun::star;
+using ::rtl::OUString;
+
#define SERVICE( className ) \
extern OUString SAL_CALL className##_getImplementationName() throw(); \
extern uno::Sequence< OUString > SAL_CALL className##_getSupportedServiceNames() throw();\
diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx
index e66b95704d3d..a2f9d0623c98 100644
--- a/xmloff/source/core/i18nmap.cxx
+++ b/xmloff/source/core/i18nmap.cxx
@@ -33,7 +33,7 @@
#include <svl/svarray.hxx>
#include "i18nmap.hxx"
-using namespace rtl;
+using ::rtl::OUString;
class SvI18NMapEntry_Impl
{
diff --git a/xmloff/source/core/xmlcnitm.cxx b/xmloff/source/core/xmlcnitm.cxx
index 4f34576399b0..17757339cd73 100644
--- a/xmloff/source/core/xmlcnitm.cxx
+++ b/xmloff/source/core/xmlcnitm.cxx
@@ -35,12 +35,13 @@
#include <xmloff/xmlcnimp.hxx>
#include "unoatrcn.hxx"
-using namespace rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::xml;
+using ::rtl::OUString;
+
typedef ::rtl::OUString *OUStringPtr;
SV_DECL_PTRARR_DEL( SvXMLAttrContainerData_Impl, OUStringPtr, 5, 5 )
SV_IMPL_PTRARR( SvXMLAttrContainerData_Impl, OUStringPtr )
diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx
index cb2c5a1e0fc6..b172c41e035a 100644
--- a/xmloff/source/core/xmltkmap.cxx
+++ b/xmloff/source/core/xmltkmap.cxx
@@ -34,9 +34,10 @@
#include <xmloff/xmltkmap.hxx>
#include <xmloff/xmltoken.hxx>
-using namespace rtl;
using namespace ::xmloff::token;
+using ::rtl::OUString;
+
class SvXMLTokenMapEntry_Impl
{
sal_uInt16 nPrefixKey;
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 842460dd6b44..4114580183e5 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -39,9 +39,10 @@
#include "sdxmlexp_impl.hxx"
#include "sdxmlimp_impl.hxx"
-using namespace rtl;
using namespace ::xmloff::token;
+using ::rtl::OUString;
+
struct SdXMLDataStyleNumber
{
enum XMLTokenEnum meNumberStyle;
diff --git a/xmloff/source/draw/viewcontext.cxx b/xmloff/source/draw/viewcontext.cxx
index 9a0ca7e3dbce..9cb21b0b03ec 100644
--- a/xmloff/source/draw/viewcontext.cxx
+++ b/xmloff/source/draw/viewcontext.cxx
@@ -36,11 +36,12 @@
#include "VisAreaContext.hxx"
using namespace com::sun::star;
-using namespace rtl;
using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_EMBEDDED_VISIBLE_AREA;
+using ::rtl::OUString;
+
//------------------------------------------------------------------
SdXMLViewSettingsContext::SdXMLViewSettingsContext( SdXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& ) :
diff --git a/xmloff/source/style/impastp1.cxx b/xmloff/source/style/impastp1.cxx
index 20e246433f6e..8cfdcb3d994a 100644
--- a/xmloff/source/style/impastp1.cxx
+++ b/xmloff/source/style/impastp1.cxx
@@ -31,7 +31,7 @@
#include <tools/debug.hxx>
#include "impastpl.hxx"
-using namespace rtl;
+using ::rtl::OUString;
//#############################################################################
//
diff --git a/xmloff/source/style/impastp2.cxx b/xmloff/source/style/impastp2.cxx
index b110a18f275a..d152fe0c70bb 100644
--- a/xmloff/source/style/impastp2.cxx
+++ b/xmloff/source/style/impastp2.cxx
@@ -32,7 +32,9 @@
#include "impastpl.hxx"
using namespace std;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
//#############################################################################
//
diff --git a/xmloff/source/style/impastp3.cxx b/xmloff/source/style/impastp3.cxx
index 07aa28f415f5..0c51db505b17 100644
--- a/xmloff/source/style/impastp3.cxx
+++ b/xmloff/source/style/impastp3.cxx
@@ -32,7 +32,8 @@
#include <xmloff/xmlprmap.hxx>
using namespace std;
-using namespace rtl;
+
+using ::rtl::OUString;
//#############################################################################
//
diff --git a/xmlscript/source/xml_helper/xml_byteseq.cxx b/xmlscript/source/xml_helper/xml_byteseq.cxx
index d23e12d671c3..e1208e8a0774 100644
--- a/xmlscript/source/xml_helper/xml_byteseq.cxx
+++ b/xmlscript/source/xml_helper/xml_byteseq.cxx
@@ -34,11 +34,11 @@
#include <xmlscript/xml_helper.hxx>
-using namespace rtl;
using namespace osl;
using namespace com::sun::star;
using namespace com::sun::star::uno;
+using ::rtl::ByteSequence;
namespace xmlscript
{
diff --git a/xmlscript/source/xml_helper/xml_element.cxx b/xmlscript/source/xml_helper/xml_element.cxx
index 1eae9b80d590..cd1fe1a0fc33 100644
--- a/xmlscript/source/xml_helper/xml_element.cxx
+++ b/xmlscript/source/xml_helper/xml_element.cxx
@@ -31,11 +31,10 @@
#include <xmlscript/xml_helper.hxx>
-using namespace rtl;
using namespace com::sun::star;
using namespace com::sun::star::uno;
-
+using ::rtl::OUString;
namespace xmlscript
{
diff --git a/xmlscript/source/xmllib_imexp/xmllib_export.cxx b/xmlscript/source/xmllib_imexp/xmllib_export.cxx
index d731fed9f10b..7684cef4fe8e 100644
--- a/xmlscript/source/xmllib_imexp/xmllib_export.cxx
+++ b/xmlscript/source/xmllib_imexp/xmllib_export.cxx
@@ -34,7 +34,8 @@
using namespace com::sun::star::uno;
using namespace com::sun::star;
-using namespace rtl;
+
+using ::rtl::OUString;
namespace xmlscript
{
diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx
index 782e6d343818..aeb39a6df1ef 100644
--- a/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx
+++ b/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx
@@ -34,7 +34,8 @@
using namespace com::sun::star::uno;
using namespace com::sun::star;
-using namespace rtl;
+
+using ::rtl::OUString;
namespace xmlscript
{