[Libreoffice-commits] .: package/source

Julien Nabet serval2412 at kemper.freedesktop.org
Fri Feb 25 16:34:31 PST 2011


 package/source/manifest/Base64Codec.cxx    |    3 ++-
 package/source/manifest/ManifestExport.cxx |    4 +++-
 package/source/manifest/ManifestImport.cxx |    3 ++-
 package/source/zipapi/CRC32.cxx            |    1 -
 package/source/zipapi/EntryInputStream.cxx |    3 ++-
 package/source/zippackage/ZipPackage.cxx   |    4 +++-
 6 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 33f74a75cdeb329d9795f2c04cb957cc172e528f
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Feb 26 01:34:14 2011 +0100

    Remove "using namespace ::rtl"

diff --git a/package/source/manifest/Base64Codec.cxx b/package/source/manifest/Base64Codec.cxx
index 9c2d4d3..1438d86 100644
--- a/package/source/manifest/Base64Codec.cxx
+++ b/package/source/manifest/Base64Codec.cxx
@@ -31,10 +31,11 @@
 #include "Base64Codec.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
-using namespace rtl;
 using namespace osl;
 using namespace com::sun::star;
 
+using ::rtl::OUStringBuffer;
+
 const
   sal_Char aBase64EncodeTable[] =
     { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx
index 6283e5f..d5986f1 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -40,11 +40,13 @@
 #include <comphelper/documentconstants.hxx>
 #include <comphelper/attributelist.hxx>
 
-using namespace rtl;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::xml::sax;
 
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+
 ManifestExport::ManifestExport(Reference < XDocumentHandler > xHandler,  const Sequence < Sequence < PropertyValue > > &rManList )
 {
     const OUString sFileEntryElement   	( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_FILE_ENTRY ) );
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index 063291f..2f99d66 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -37,9 +37,10 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 using namespace com::sun::star;
-using namespace rtl;
 using namespace std;
 
+using ::rtl::OUString;
+
 // ---------------------------------------------------
 ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManVector )
 : nNumProperty ( 0 )
diff --git a/package/source/zipapi/CRC32.cxx b/package/source/zipapi/CRC32.cxx
index 6e15614..bf2fff6 100644
--- a/package/source/zipapi/CRC32.cxx
+++ b/package/source/zipapi/CRC32.cxx
@@ -39,7 +39,6 @@
 #include <PackageConstants.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 
-using namespace rtl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::io;
 
diff --git a/package/source/zipapi/EntryInputStream.cxx b/package/source/zipapi/EntryInputStream.cxx
index 945f634..00ae61f 100644
--- a/package/source/zipapi/EntryInputStream.cxx
+++ b/package/source/zipapi/EntryInputStream.cxx
@@ -34,12 +34,13 @@
 #include <rtl/digest.h>
 #include <memory.h> // for memcpy
 
-using namespace rtl;
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::packages::zip;
 using namespace com::sun::star::packages::zip::ZipConstants;
 
+using ::rtl::OUString;
+
 /** Provides access to the compressed data in a zipfile. 
  *
  * uncompresses the stream into memory and seeks on it 'in memory'
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 39ddc80..099fd13 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -84,7 +84,6 @@
 #include <comphelper/ofopxmlhelper.hxx>
 #include <comphelper/documentconstants.hxx>
 
-using namespace rtl;
 using namespace std;
 using namespace osl;
 using namespace cppu;
@@ -103,6 +102,9 @@ using namespace com::sun::star::packages::zip;
 using namespace com::sun::star::packages::manifest;
 using namespace com::sun::star::packages::zip::ZipConstants;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+
 #define LOGFILE_AUTHOR "mg115289"
 
 


More information about the Libreoffice-commits mailing list