[Libreoffice-commits] .: unotools/source
Julien Nabet
serval2412 at kemper.freedesktop.org
Sun Feb 27 09:47:45 PST 2011
unotools/source/config/accelcfg.cxx | 3 ++-
unotools/source/config/configmgr.cxx | 3 ++-
unotools/source/config/defaultoptions.cxx | 3 ++-
unotools/source/config/fltrcfg.cxx | 3 ++-
unotools/source/config/fontcfg.cxx | 3 ++-
unotools/source/config/lingucfg.cxx | 4 +++-
unotools/source/config/misccfg.cxx | 3 ++-
unotools/source/config/optionsdlg.cxx | 3 ++-
unotools/source/config/pathoptions.cxx | 5 ++++-
unotools/source/config/saveopt.cxx | 4 +++-
unotools/source/config/searchopt.cxx | 3 ++-
unotools/source/config/sourceviewconfig.cxx | 4 +++-
unotools/source/config/syslocaleoptions.cxx | 2 +-
unotools/source/config/undoopt.cxx | 2 +-
unotools/source/config/useroptions.cxx | 2 +-
unotools/source/config/xmlaccelcfg.cxx | 3 ++-
unotools/source/ucbhelper/ucbhelper.cxx | 3 ++-
17 files changed, 36 insertions(+), 17 deletions(-)
New commits:
commit 53291d73caf69d3da36a69cb22bda61ace7305df
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sun Feb 27 18:47:31 2011 +0100
Remove "using namespace ::rtl"
diff --git a/unotools/source/config/accelcfg.cxx b/unotools/source/config/accelcfg.cxx
index fa8ada3..157f97e 100644
--- a/unotools/source/config/accelcfg.cxx
+++ b/unotools/source/config/accelcfg.cxx
@@ -54,11 +54,12 @@
using namespace utl;
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::io;
using namespace com::sun::star::xml::sax;
+using ::rtl::OUString;
+
static SvtAcceleratorConfig_Impl* pOptions = NULL;
static sal_Int32 nRefCount = 0;
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index 58c02e4..bd26514 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -50,12 +50,13 @@
//-----------------------------------------------------------------------------
using namespace utl;
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::container;
+using ::rtl::OUString;
+
#define UNISTRING(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
//-----------------------------------------------------------------------------
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index bfce714..ce61e85 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -47,9 +47,10 @@
using namespace osl;
using namespace utl;
-using namespace rtl;
using namespace com::sun::star::uno;
+using ::rtl::OUString;
+
// define ----------------------------------------------------------------
#define ASCII_STR(s) OUString( RTL_CONSTASCII_USTRINGPARAM(s) )
diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx
index fff0308..5998c18 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -37,9 +37,10 @@
#include <com/sun/star/uno/Sequence.hxx>
using namespace utl;
-using namespace rtl;
using namespace com::sun::star::uno;
+using ::rtl::OUString;
+
#define C2U(cChar) OUString(RTL_CONSTASCII_USTRINGPARAM(cChar))
// -----------------------------------------------------------------------
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index bf3eb75..83ee25b 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -51,13 +51,14 @@
#define DEFAULTFONT_CONFIGNODE "VCL/DefaultFonts"
#define SUBSTFONT_CONFIGNODE "VCL/FontSubstitutions"
-using namespace rtl;
using namespace utl;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::container;
+using ::rtl::OUString;
+
static DefaultFontConfiguration* mpDefaultFontConfiguration = 0;
static FontSubstConfiguration* mpFontSubstConfiguration = 0;
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index fe2519e..493284f 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -51,9 +51,11 @@
#include <itemholder1.hxx>
-using namespace rtl;
using namespace com::sun::star;
+using ::rtl::OUString;
+using ::rtl::Uri;
+
#define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x ))
#define EXPAND_PROTOCOL "vnd.sun.star.expand:"
#define FILE_PROTOCOL "file:///"
diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx
index 2364773..44b9330 100644
--- a/unotools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.cxx
@@ -46,9 +46,10 @@
#define DEF_INCH 2540L
#define DEF_RELTWIP 1440L
-using namespace rtl;
using namespace com::sun::star::uno;
+using ::rtl::OUString;
+
namespace utl
{
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index 80ffa83..8e35666 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -42,10 +42,11 @@
#include "itemholder1.hxx"
using namespace utl;
-using namespace rtl;
using namespace com::sun::star::beans ;
using namespace com::sun::star::uno;
+using ::rtl::OUString;
+
#define CFG_FILENAME OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.OptionsDialog" ) )
#define ROOT_NODE OUString( RTL_CONSTASCII_USTRINGPARAM( "OptionsDialogGroups" ) )
#define PAGES_NODE OUString( RTL_CONSTASCII_USTRINGPARAM( "Pages" ) )
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 8a30996..ca38736 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -59,12 +59,15 @@
using namespace osl;
using namespace utl;
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
using namespace com::sun::star::util;
using namespace com::sun::star::lang;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
+
// define ----------------------------------------------------------------
#define SEARCHPATH_DELIMITER ';'
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 9501fbc..c683d40 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -44,8 +44,10 @@
#include "itemholder1.hxx"
using namespace utl;
-using namespace rtl;
using namespace com::sun::star::uno;
+
+using ::rtl::OUString;
+
namespace css = ::com::sun::star;
class SvtSaveOptions_Impl;
diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx
index 76ab13e..8635d0a 100644
--- a/unotools/source/config/searchopt.cxx
+++ b/unotools/source/config/searchopt.cxx
@@ -40,11 +40,12 @@
#include <sal/macros.h>
-using namespace rtl;
using namespace utl;
using namespace com::sun::star::uno;
using namespace com::sun::star::i18n;
+using ::rtl::OUString;
+
#define MAX_FLAGS_OFFSET 25
//////////////////////////////////////////////////////////////////////
diff --git a/unotools/source/config/sourceviewconfig.cxx b/unotools/source/config/sourceviewconfig.cxx
index 5253437..3d47a08 100644
--- a/unotools/source/config/sourceviewconfig.cxx
+++ b/unotools/source/config/sourceviewconfig.cxx
@@ -38,8 +38,10 @@
#include <itemholder1.hxx>
using namespace utl;
-using namespace rtl;
using namespace com::sun::star::uno;
+
+using ::rtl::OUString;
+
namespace utl
{
class SourceViewConfig_Impl : public utl::ConfigItem
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index c9a0125..96b6977 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -47,10 +47,10 @@
using namespace osl;
using namespace utl;
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
+using ::rtl::OUString;
SvtSysLocaleOptions_Impl* SvtSysLocaleOptions::pOptions = NULL;
sal_Int32 SvtSysLocaleOptions::nRefCount = 0;
diff --git a/unotools/source/config/undoopt.cxx b/unotools/source/config/undoopt.cxx
index d7e2fd6..149ed7b 100644
--- a/unotools/source/config/undoopt.cxx
+++ b/unotools/source/config/undoopt.cxx
@@ -42,8 +42,8 @@
#include "itemholder1.hxx"
using namespace utl;
-using namespace rtl;
using namespace com::sun::star::uno;
+using ::rtl::OUString;
static SvtUndoOptions_Impl* pOptions = NULL;
static sal_Int32 nRefCount = 0;
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index 288ec45..5901056 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -55,9 +55,9 @@
#include <unotools/loghelper.hxx>
using namespace utl;
-using namespace rtl;
using namespace com::sun::star;
using namespace com::sun::star::uno;
+using ::rtl::OUString;
namespace css = ::com::sun::star;
diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx
index f1af3e4..f9b0a6c 100644
--- a/unotools/source/config/xmlaccelcfg.cxx
+++ b/unotools/source/config/xmlaccelcfg.cxx
@@ -35,10 +35,11 @@
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <cppuhelper/implbase1.hxx>
-using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::xml::sax;
+using ::rtl::OUString;
+
#define ELEMENT_ACCELERATORLIST "acceleratorlist"
#define ELEMENT_ACCELERATORITEM "item"
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index d311c60..789fe3f 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -76,10 +76,11 @@ using namespace com::sun::star::sdbc;
using namespace com::sun::star::task;
using namespace com::sun::star::uno;
using namespace com::sun::star::ucb;
-using namespace rtl;
using namespace comphelper;
using namespace osl;
+using ::rtl::OUString;
+
typedef ::std::vector< OUString* > StringList_Impl;
#define CONVERT_DATETIME( aUnoDT, aToolsDT ) \
More information about the Libreoffice-commits
mailing list