diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2021-10-03 14:02:58 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2021-10-03 22:16:55 +0200 |
| commit | 28480639b4d2ad29d48b98ab9fb7a3755cb9d19e (patch) | |
| tree | aba70713dc40bf5ba0ca1d8b2b5042eb51b1ff6a /package/source | |
| parent | 117fdcf8d37ee764ebe74a8d410ab323254d95f1 (diff) | |
drop 'using namespace std' in package
Change-Id: Ifa9f5c310a8be988c1058644540ac52f160bc156
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123018
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'package/source')
| -rw-r--r-- | package/source/manifest/ManifestImport.cxx | 3 | ||||
| -rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index 76c0be4ea36f..3cab72abacfe 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -31,7 +31,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::beans; using namespace com::sun::star; -using namespace std; constexpr OUStringLiteral gsFileEntryElement ( u"" ELEMENT_FILE_ENTRY ); @@ -106,7 +105,7 @@ constexpr OUStringLiteral gsAES256_URL ( u"" AES256_URL ); constexpr OUStringLiteral gsPBKDF2_Name ( u"" PBKDF2_NAME ); constexpr OUStringLiteral gsPBKDF2_URL ( u"" PBKDF2_URL ); -ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManVector ) +ManifestImport::ManifestImport( std::vector < Sequence < PropertyValue > > & rNewManVector ) : bIgnoreEncryptData ( false ) , bPgpEncryption ( false ) , nDerivedKeySize( 0 ) diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index d70c2bae27a4..8a74267d755f 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -81,7 +81,6 @@ #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> -using namespace std; using namespace osl; using namespace cppu; using namespace ucbhelper; @@ -1044,7 +1043,7 @@ void ZipPackage::WriteMimetypeMagicFile( ZipOutputStream& aZipOut ) } } -void ZipPackage::WriteManifest( ZipOutputStream& aZipOut, const vector< uno::Sequence < PropertyValue > >& aManList ) +void ZipPackage::WriteManifest( ZipOutputStream& aZipOut, const std::vector< uno::Sequence < PropertyValue > >& aManList ) { // Write the manifest uno::Reference < XManifestWriter > xWriter = ManifestWriter::create( m_xContext ); @@ -1071,7 +1070,7 @@ void ZipPackage::WriteManifest( ZipOutputStream& aZipOut, const vector< uno::Seq aZipOut.rawCloseEntry(); } -void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< uno::Sequence < PropertyValue > >& aManList ) +void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const std::vector< uno::Sequence < PropertyValue > >& aManList ) { ZipEntry* pEntry = new ZipEntry; rtl::Reference<ZipPackageBuffer> pBuffer = new ZipPackageBuffer; @@ -1245,7 +1244,7 @@ uno::Reference< io::XInputStream > ZipPackage::writeTempFile() } // Create a vector to store data for the manifest.xml file - vector < uno::Sequence < PropertyValue > > aManList; + std::vector < uno::Sequence < PropertyValue > > aManList; static constexpr OUStringLiteral sMediaType(u"MediaType"); static constexpr OUStringLiteral sVersion(u"Version"); |