[Libreoffice-commits] .: binfilter/bf_sw binfilter/bf_xmloff binfilter/filter
Julien Nabet
serval2412 at kemper.freedesktop.org
Fri Mar 4 14:25:56 PST 2011
binfilter/bf_sw/source/core/fields/sw_ddefld.cxx | 5 +----
binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx | 2 +-
binfilter/bf_sw/source/filter/xml/sw_xmlitmpr.cxx | 2 +-
binfilter/bf_sw/source/ui/app/sw_docsh.cxx | 2 +-
binfilter/bf_sw/source/ui/config/sw_dbconfig.cxx | 2 +-
binfilter/bf_sw/source/ui/config/sw_fontcfg.cxx | 3 ++-
binfilter/bf_sw/source/ui/config/sw_modcfg.cxx | 3 ++-
binfilter/bf_sw/source/ui/config/sw_prtopt.cxx | 2 +-
binfilter/bf_sw/source/ui/config/sw_usrpref.cxx | 3 ++-
binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx | 2 +-
binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx | 1 -
binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx | 3 ++-
binfilter/bf_xmloff/source/chart/xmloff_SchXMLImport.cxx | 2 +-
binfilter/bf_xmloff/source/chart/xmloff_SchXMLParagraphContext.cxx | 2 +-
binfilter/bf_xmloff/source/core/xmloff_facreg.cxx | 2 +-
binfilter/bf_xmloff/source/core/xmloff_i18nmap.cxx | 3 +--
binfilter/bf_xmloff/source/core/xmloff_xmlcnitm.cxx | 2 +-
binfilter/bf_xmloff/source/core/xmloff_xmltkmap.cxx | 2 +-
binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx | 9 ++-------
binfilter/bf_xmloff/source/draw/xmloff_XMLNumberStyles.cxx | 2 +-
binfilter/bf_xmloff/source/draw/xmloff_viewcontext.cxx | 2 +-
binfilter/bf_xmloff/source/style/xmloff_impastp1.cxx | 3 +--
binfilter/bf_xmloff/source/style/xmloff_impastp2.cxx | 3 ++-
binfilter/bf_xmloff/source/style/xmloff_impastp3.cxx | 2 +-
binfilter/filter/source/bf_migrate/bf_migratefilter.cxx | 2 +-
25 files changed, 30 insertions(+), 36 deletions(-)
New commits:
commit d3ea6df259c3dbf750db315c293876a11633ec29
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Fri Mar 4 23:25:46 2011 +0100
Remove "using namespace ::rtl"
diff --git a/binfilter/bf_sw/source/core/fields/sw_ddefld.cxx b/binfilter/bf_sw/source/core/fields/sw_ddefld.cxx
index 709f8bb..29c1b03 100644
--- a/binfilter/bf_sw/source/core/fields/sw_ddefld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_ddefld.cxx
@@ -44,8 +44,7 @@ namespace binfilter {
extern String& GetString( const ::com::sun::star::uno::Any& rAny, String& rStr );
-using namespace rtl;
-
+using ::rtl::OUString;
#ifdef PM2
#define DDE_TXT_ENCODING RTL_TEXTENCODING_IBM_850
#else
@@ -180,9 +179,7 @@ BOOL SwDDEFieldType::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMId ) c
rVal <<= OUString(GetCmd().GetToken(nPart-1, ::binfilter::cTokenSeperator));
return TRUE;
}
-/* -----------------------------28.08.00 16:23--------------------------------
- ---------------------------------------------------------------------------*/
BOOL SwDDEFieldType::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMId )
{
BYTE nPart = 0;
diff --git a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
index eec56c8..e4ce97c 100644
--- a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
+++ b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
@@ -64,8 +64,8 @@
namespace binfilter {
using namespace utl;
-using namespace rtl;
using namespace ::com::sun::star::uno;
+using ::rtl::OUString;
SwRead ReadRtf = 0, ReadAscii = 0, ReadSwg = 0, ReadSw3 = 0,
ReadHTML = 0, ReadXML = 0;
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlitmpr.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlitmpr.cxx
index 246abd1..ef78056 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlitmpr.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlitmpr.cxx
@@ -30,9 +30,9 @@
#include "xmlitmap.hxx"
namespace binfilter {
-using namespace rtl;
using ::binfilter::xmloff::token::IsXMLToken;
using ::binfilter::xmloff::token::XML_TOKEN_INVALID;
+using ::rtl::OUString;
// TODO: optimize this!
diff --git a/binfilter/bf_sw/source/ui/app/sw_docsh.cxx b/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
index 071c389..7d8d6d9 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docsh.cxx
@@ -78,8 +78,8 @@
#include <bf_svtools/moduleoptions.hxx>
-using namespace rtl;
using namespace ::com::sun::star::uno;
+using ::rtl::OUString;
namespace binfilter {
using namespace ::com::sun::star::uno;
diff --git a/binfilter/bf_sw/source/ui/config/sw_dbconfig.cxx b/binfilter/bf_sw/source/ui/config/sw_dbconfig.cxx
index e4f6dfb..c0c97b1 100644
--- a/binfilter/bf_sw/source/ui/config/sw_dbconfig.cxx
+++ b/binfilter/bf_sw/source/ui/config/sw_dbconfig.cxx
@@ -38,8 +38,8 @@
#include <swdbdata.hxx>
namespace binfilter {
using namespace utl;
-using namespace rtl;
using namespace ::com::sun::star::uno;
+using ::rtl::OUString;
/*N*/ #define C2U(cChar) OUString::createFromAscii(cChar)
/*--------------------------------------------------------------------
diff --git a/binfilter/bf_sw/source/ui/config/sw_fontcfg.cxx b/binfilter/bf_sw/source/ui/config/sw_fontcfg.cxx
index d75a0dc..74e91a8 100644
--- a/binfilter/bf_sw/source/ui/config/sw_fontcfg.cxx
+++ b/binfilter/bf_sw/source/ui/config/sw_fontcfg.cxx
@@ -42,9 +42,10 @@
namespace binfilter {
using namespace utl;
-using namespace rtl;
using namespace ::com::sun::star::uno;
+using ::rtl::OUString;
+
/*N*/ #define C2S(cChar) String::CreateFromAscii(cChar)
/*N*/ #define C2U(cChar) OUString::createFromAscii(cChar)
diff --git a/binfilter/bf_sw/source/ui/config/sw_modcfg.cxx b/binfilter/bf_sw/source/ui/config/sw_modcfg.cxx
index 06abd8c..a140568 100644
--- a/binfilter/bf_sw/source/ui/config/sw_modcfg.cxx
+++ b/binfilter/bf_sw/source/ui/config/sw_modcfg.cxx
@@ -43,9 +43,10 @@
namespace binfilter {
using namespace utl;
-using namespace rtl;
using namespace ::com::sun::star::uno;
+using ::rtl::OUString;
+
#define C2U(cChar) OUString::createFromAscii(cChar)
#define GLOB_NAME_CALC 0
#define GLOB_NAME_IMPRESS 1
diff --git a/binfilter/bf_sw/source/ui/config/sw_prtopt.cxx b/binfilter/bf_sw/source/ui/config/sw_prtopt.cxx
index ba81db7..4acccbe 100644
--- a/binfilter/bf_sw/source/ui/config/sw_prtopt.cxx
+++ b/binfilter/bf_sw/source/ui/config/sw_prtopt.cxx
@@ -38,8 +38,8 @@
namespace binfilter {
using namespace utl;
-using namespace rtl;
using namespace ::com::sun::star::uno;
+using ::rtl::OUString;
/*N*/ #define C2U(cChar) OUString::createFromAscii(cChar)
/*--------------------------------------------------------------------
diff --git a/binfilter/bf_sw/source/ui/config/sw_usrpref.cxx b/binfilter/bf_sw/source/ui/config/sw_usrpref.cxx
index a27a13a..80aa1e4 100644
--- a/binfilter/bf_sw/source/ui/config/sw_usrpref.cxx
+++ b/binfilter/bf_sw/source/ui/config/sw_usrpref.cxx
@@ -44,10 +44,11 @@
namespace binfilter {
using namespace utl;
-using namespace rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
+using ::rtl::OUString;
+
/*N*/ #define C2U(cChar) OUString::createFromAscii(cChar)
/*N*/ #define C2S(cChar) String::CreateFromAscii(cChar)
diff --git a/binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx b/binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx
index f7fe5a8..5dad526 100644
--- a/binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx
+++ b/binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx
@@ -44,8 +44,8 @@ namespace binfilter {
#endif
using namespace utl;
-using namespace rtl;
using namespace ::com::sun::star::uno;
+using ::rtl::OUString;
#define C2U(cChar) OUString::createFromAscii(cChar)
diff --git a/binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx b/binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx
index b040cbe..7b95e23 100644
--- a/binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx
+++ b/binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx
@@ -42,7 +42,6 @@
#include <fldmgr.hxx>
#include <fldui.hrc>
namespace binfilter {
-using namespace rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx b/binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx
index dc88aaf..d1c4450 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx
@@ -37,10 +37,11 @@
#include <SwXFilterOptions.hxx>
namespace binfilter {
-using namespace rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
+using ::rtl::OUString;
+
// writer documents
extern uno::Sequence< OUString > SAL_CALL SwTextDocument_getSupportedServiceNames() throw();
extern OUString SAL_CALL SwTextDocument_getImplementationName() throw();
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLImport.cxx b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLImport.cxx
index 12f02bb..c085cd5 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLImport.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLImport.cxx
@@ -39,9 +39,9 @@
#include <com/sun/star/chart/ChartDataRowSource.hpp>
namespace binfilter {
-using namespace rtl;
using namespace ::com::sun::star;
using namespace ::binfilter::xmloff::token;
+using ::rtl::OUString;
/* ----------------------------------------
TokenMaps for distinguishing different
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLParagraphContext.cxx b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLParagraphContext.cxx
index f2b25ac..1c0ad69 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLParagraphContext.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLParagraphContext.cxx
@@ -32,8 +32,8 @@
#include "xmltoken.hxx"
namespace binfilter {
-using namespace rtl;
using namespace ::com::sun::star;
+using ::rtl::OUString;
SchXMLParagraphContext::SchXMLParagraphContext( SvXMLImport& rInImport,
const OUString& rLocalName,
diff --git a/binfilter/bf_xmloff/source/core/xmloff_facreg.cxx b/binfilter/bf_xmloff/source/core/xmloff_facreg.cxx
index b5ba4e8..adfd538 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_facreg.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_facreg.cxx
@@ -37,8 +37,8 @@
#include <uno/lbnames.h>
namespace binfilter {
-using namespace rtl;
using namespace ::com::sun::star;
+using ::rtl::OUString;
// impress import
extern uno::Sequence< OUString > SAL_CALL SdImpressXMLImport_getSupportedServiceNames() throw();
diff --git a/binfilter/bf_xmloff/source/core/xmloff_i18nmap.cxx b/binfilter/bf_xmloff/source/core/xmloff_i18nmap.cxx
index 88d57b5..90cdb0b 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_i18nmap.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_i18nmap.cxx
@@ -35,8 +35,7 @@
#include "i18nmap.hxx"
namespace binfilter {
-using namespace rtl;
-
+using ::rtl::OUString;
class SvI18NMapEntry_Impl
{
USHORT nKind;
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmlcnitm.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmlcnitm.cxx
index 87c4e7a..7f1ec92 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmlcnitm.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmlcnitm.cxx
@@ -32,11 +32,11 @@
#include "xmlcnimp.hxx"
namespace binfilter {
-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 )
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmltkmap.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmltkmap.cxx
index 43ffe20..a40b0d5 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmltkmap.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmltkmap.cxx
@@ -36,8 +36,8 @@
namespace binfilter {
-using namespace rtl;
using namespace ::binfilter::xmloff::token;
+using ::rtl::OUString;
class SvXMLTokenMapEntry_Impl
{
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
index fe3914e..2d1f296 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
@@ -55,13 +55,14 @@
#include <bf_goodies/vector3d.hxx>
namespace binfilter {
-using namespace rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::style;
using namespace ::binfilter::xmloff::token;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
const sal_Int8 XML_MAXDIGITSCOUNT_TIME = 11;
const sal_Int8 XML_MAXDIGITSCOUNT_DATETIME = 6;
@@ -72,12 +73,6 @@ OUString SvXMLUnitConverter::msXML_false;
void SvXMLUnitConverter::createNumTypeInfo() const
{
- // #110680#
- //Reference< lang::XMultiServiceFactory > xServiceFactory =
- // comphelper::getProcessServiceFactory();
- //OSL_ENSURE( xServiceFactory.is(),
- // "XMLUnitConverter: got no service factory" );
-
if( mxServiceFactory.is() )
{
((SvXMLUnitConverter *)this)->xNumTypeInfo =
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_XMLNumberStyles.cxx b/binfilter/bf_xmloff/source/draw/xmloff_XMLNumberStyles.cxx
index 4eced96..a6a345b 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_XMLNumberStyles.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_XMLNumberStyles.cxx
@@ -42,8 +42,8 @@
#include "sdxmlimp_impl.hxx"
namespace binfilter {
-using namespace rtl;
using namespace ::binfilter::xmloff::token;
+using ::rtl::OUString;
struct SdXMLDataStyleNumber
{
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_viewcontext.cxx b/binfilter/bf_xmloff/source/draw/xmloff_viewcontext.cxx
index dc1ecd1..c515525 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_viewcontext.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_viewcontext.cxx
@@ -34,10 +34,10 @@
namespace binfilter {
using namespace ::com::sun::star;
-using namespace rtl;
using ::binfilter::xmloff::token::IsXMLToken;
using ::binfilter::xmloff::token::XML_EMBEDDED_VISIBLE_AREA;
+using ::rtl::OUString;
//------------------------------------------------------------------
diff --git a/binfilter/bf_xmloff/source/style/xmloff_impastp1.cxx b/binfilter/bf_xmloff/source/style/xmloff_impastp1.cxx
index 89895f0..b1c9eba 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_impastp1.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_impastp1.cxx
@@ -30,8 +30,7 @@
#include "impastpl.hxx"
namespace binfilter {
-using namespace rtl;
-
+using ::rtl::OUString;
//#############################################################################
//
// Class XMLFamilyData_Impl
diff --git a/binfilter/bf_xmloff/source/style/xmloff_impastp2.cxx b/binfilter/bf_xmloff/source/style/xmloff_impastp2.cxx
index 8be0580..4ddf4a8 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_impastp2.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_impastp2.cxx
@@ -32,7 +32,8 @@
namespace binfilter {
using namespace std;
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
//#############################################################################
//
diff --git a/binfilter/bf_xmloff/source/style/xmloff_impastp3.cxx b/binfilter/bf_xmloff/source/style/xmloff_impastp3.cxx
index 125028a..03efd26 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_impastp3.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_impastp3.cxx
@@ -30,7 +30,7 @@
namespace binfilter {
using namespace std;
-using namespace rtl;
+using ::rtl::OUString;
//#############################################################################
//
diff --git a/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx b/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx
index e59f6a4..f762223 100644
--- a/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx
+++ b/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx
@@ -41,7 +41,6 @@
namespace binfilter {
-using namespace rtl;
using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -53,6 +52,7 @@ using namespace com::sun::star::xml::sax;
using namespace com::sun::star::frame;
using namespace com::sun::star::task;
using namespace com::sun::star::util;
+using ::rtl::OUString;
const OUString sServiceNameTextDocument(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument"));
const OUString sServiceNameGlobalDocument(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.GlobalDocument"));
More information about the Libreoffice-commits
mailing list