[Libreoffice-commits] .: filter/source

Julien Nabet serval2412 at kemper.freedesktop.org
Tue Mar 1 13:59:56 PST 2011 

 filter/source/flash/impswfdialog.cxx                 |    3 ++-
 filter/source/placeware/Base64Codec.cxx              |    4 ++--
 filter/source/placeware/tempfile.cxx                 |    3 +--
 filter/source/placeware/zip.cxx                      |    3 +--
 filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx  |    3 ++-
 filter/source/xsltdialog/typedetectionexport.cxx     |    3 ++-
 filter/source/xsltdialog/typedetectionimport.cxx     |    3 ++-
 filter/source/xsltdialog/xmlfileview.cxx             |    3 ++-
 filter/source/xsltdialog/xmlfilterjar.cxx            |    4 +++-
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |    4 +++-
 filter/source/xsltdialog/xmlfiltertabdialog.cxx      |    3 ++-
 filter/source/xsltdialog/xmlfiltertabpagebasic.cxx   |    3 +--
 filter/source/xsltdialog/xmlfiltertestdialog.cxx     |    3 ++-
 13 files changed, 25 insertions(+), 17 deletions(-)

New commits:
commit 25ff9e79eb2038ed422856e1f6e8f919bc930d9d
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Mar 1 22:59:41 2011 +0100

    Remove "using namespace ::rtl"

diff --git a/filter/source/flash/impswfdialog.cxx b/filter/source/flash/impswfdialog.cxx
index 87f6a42..e77ffe3 100644
--- a/filter/source/flash/impswfdialog.cxx
+++ b/filter/source/flash/impswfdialog.cxx
@@ -32,10 +32,11 @@
 #include "impswfdialog.hxx"
 #include "impswfdialog.hrc"
 
-using namespace rtl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 
+using ::rtl::OUString;
+
 // ----------------
 // - ImpPDFDialog -
 // ----------------
diff --git a/filter/source/placeware/Base64Codec.cxx b/filter/source/placeware/Base64Codec.cxx
index fa24308..b921e70 100644
--- a/filter/source/placeware/Base64Codec.cxx
+++ b/filter/source/placeware/Base64Codec.cxx
@@ -31,10 +31,10 @@
 #include "Base64Codec.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
-using namespace rtl;
 using namespace osl;
 using namespace com::sun::star;
-
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
 const
   sal_Char aBase64EncodeTable[] =
     { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
diff --git a/filter/source/placeware/tempfile.cxx b/filter/source/placeware/tempfile.cxx
index 5e16bb0..de38d6b 100644
--- a/filter/source/placeware/tempfile.cxx
+++ b/filter/source/placeware/tempfile.cxx
@@ -131,8 +131,7 @@ oslFileError SAL_CALL my_getTempDirURL( rtl_uString** pustrTempDir )
 
 #include "tempfile.hxx"
 
-using namespace rtl;
-
+using ::rtl::OUString;
 TempFile::TempFile( const OUString& rTempFileURL )
 :osl::File( rTempFileURL ), maURL( rTempFileURL )
 {
diff --git a/filter/source/placeware/zip.cxx b/filter/source/placeware/zip.cxx
index 627e747..832cae2 100644
--- a/filter/source/placeware/zip.cxx
+++ b/filter/source/placeware/zip.cxx
@@ -38,8 +38,7 @@
 #include "zip.hxx"
 #include "zipfile.hxx"
 
-using namespace rtl;
-
+using ::rtl::OString;
 /** this struct describes one entry in a zip file */
 struct ZipEntry
 {
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index a204c8e..fabcefe 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -61,7 +61,6 @@
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/propertysetinfo.hxx>
 
-using namespace rtl;
 using namespace comphelper;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -75,6 +74,8 @@ using namespace com::sun::star::xml::sax;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::task;
 
+using ::rtl::OUString;
+
 #define MAP_LEN(x) x, sizeof(x) - 1
 
 Reference< com::sun::star::frame::XModel > xModel;
diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx
index 103f732..ce03086 100644
--- a/filter/source/xsltdialog/typedetectionexport.cxx
+++ b/filter/source/xsltdialog/typedetectionexport.cxx
@@ -39,13 +39,14 @@
 
 #include <comphelper/attributelist.hxx>
 
-using namespace rtl;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::io;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::xml::sax;
 
+using ::rtl::OUString;
+
 TypeDetectionExporter::TypeDetectionExporter( Reference< XMultiServiceFactory >& xMSF )
 : mxMSF( xMSF )
 {
diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx
index a5618dc..f11e8a2 100644
--- a/filter/source/xsltdialog/typedetectionimport.cxx
+++ b/filter/source/xsltdialog/typedetectionimport.cxx
@@ -43,9 +43,10 @@ using namespace com::sun::star::io;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::xml::sax;
 using namespace com::sun::star;
-using namespace rtl;
 using namespace std;
 
+using ::rtl::OUString;
+
 TypeDetectionImporter::TypeDetectionImporter( Reference< XMultiServiceFactory >& xMSF )
 :	mxMSF(xMSF),
     sRootNode( RTL_CONSTASCII_USTRINGPARAM( "oor:component-data" ) ),
diff --git a/filter/source/xsltdialog/xmlfileview.cxx b/filter/source/xsltdialog/xmlfileview.cxx
index 06bd047..88ec4b4 100644
--- a/filter/source/xsltdialog/xmlfileview.cxx
+++ b/filter/source/xsltdialog/xmlfileview.cxx
@@ -54,7 +54,6 @@
 #include "xmlfileview.hrc"
 #include "xmlfilterhelpids.hrc"
 
-using namespace rtl;
 using namespace osl;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
@@ -63,6 +62,8 @@ using namespace com::sun::star::io;
 using namespace com::sun::star::xml;
 using namespace com::sun::star::xml::sax;
 
+using ::rtl::OUString;
+
 
 #define MAX_SYNTAX_HIGHLIGHT 20
 #define MAX_HIGHLIGHTTIME 200
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index dca723f..46a9cb8 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -57,7 +57,6 @@
 #include "typedetectionexport.hxx"
 #include "typedetectionimport.hxx"
 
-using namespace rtl;
 using namespace osl;
 using namespace comphelper;
 using namespace com::sun::star;
@@ -69,6 +68,9 @@ using namespace com::sun::star::container;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::io;
 
+using ::rtl::OUString;
+using ::rtl::Uri;
+
 XMLFilterJarHelper::XMLFilterJarHelper( Reference< XMultiServiceFactory >& xMSF )
 : mxMSF( xMSF ),
     sVndSunStarPackage( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) ),
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index a8ecd39..b2817de 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -54,7 +54,6 @@
 #include "xmlfilterjar.hxx"
 #include "xmlfilterhelpids.hrc"
 
-using namespace rtl;
 using namespace osl;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
@@ -64,6 +63,9 @@ using namespace com::sun::star::container;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::util;
 
+using ::rtl::OUString;
+using ::rtl::Uri;
+
 ResMgr* XMLFilterSettingsDialog::mpResMgr = NULL;
 
 XMLFilterSettingsDialog::XMLFilterSettingsDialog( Window* pParent, ResMgr& rResMgr, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxMSF ) :
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index 2238513..2075d16 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -45,12 +45,13 @@
 #include "xmlfiltersettingsdialog.hrc"
 #include "xmlfilterhelpids.hrc"
 
-using namespace rtl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::container;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
 
+using ::rtl::OUString;
+
 XMLFilterTabDialog::XMLFilterTabDialog( Window *pParent, ResMgr& rResMgr, const Reference< XMultiServiceFactory >& rxMSF, const filter_info_impl* pInfo ) :
     TabDialog( pParent, ResId( DLG_XML_FILTER_TABDIALOG, rResMgr ) ),
     mxMSF( rxMSF ),
diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
index f5557c5..99d67a7 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
@@ -36,8 +36,7 @@
 #include "xmlfiltersettingsdialog.hxx"
 #include "xmlfilterhelpids.hrc"
 
-using namespace rtl;
-
+using ::rtl::OUString;
 XMLFilterTabPageBasic::XMLFilterTabPageBasic( Window* pParent, ResMgr& rResMgr ) :
     TabPage( pParent, ResId( RID_XML_FILTER_TABPAGE_BASIC, rResMgr ) ),
     maFTFilterName( this, ResId( FT_XML_FILTER_NAME, rResMgr ) ),
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index dcac5ed..770a8a3 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -60,7 +60,6 @@
 #include "xmlfileview.hxx"
 
 
-using namespace rtl;
 using namespace utl;
 using namespace osl;
 using namespace comphelper;
@@ -75,6 +74,8 @@ using namespace com::sun::star::io;
 using namespace com::sun::star::xml;
 using namespace com::sun::star::xml::sax;
 
+using ::rtl::OUString;
+
 class GlobalEventListenerImpl : public ::cppu::WeakImplHelper1< com::sun::star::document::XEventListener >
 {
 public:

More information about the Libreoffice-commits mailing list