mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drop 'using namespace std' in package

Browse Source 
Change-Id: Ifa9f5c310a8be988c1058644540ac52f160bc156
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123018
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
This commit is contained in:
Julien Nabet
2021-10-03 14:02:58 +02:00
parent 117fdcf8d3
commit 28480639b4
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package/source/manifest/ManifestImport.cxx
View File

@@ -31,7 +31,6 @@
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::beans; using namespace com::sun::star::beans;
using namespace com::sun::star; using namespace com::sun::star;
using namespace std;
constexpr OUStringLiteral gsFileEntryElement ( u"" ELEMENT_FILE_ENTRY ); 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_Name ( u"" PBKDF2_NAME );
constexpr OUStringLiteral gsPBKDF2_URL ( u"" PBKDF2_URL ); constexpr OUStringLiteral gsPBKDF2_URL ( u"" PBKDF2_URL );
ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManVector ) ManifestImport::ManifestImport( std::vector < Sequence < PropertyValue > > & rNewManVector )
: bIgnoreEncryptData ( false ) : bIgnoreEncryptData ( false )
, bPgpEncryption ( false ) , bPgpEncryption ( false )
, nDerivedKeySize( 0 ) , nDerivedKeySize( 0 )

7
package/source/zippackage/ZipPackage.cxx
View File

@@ -81,7 +81,6 @@
#include <comphelper/sequence.hxx> #include <comphelper/sequence.hxx>
#include <comphelper/servicehelper.hxx> #include <comphelper/servicehelper.hxx>
using namespace std;
using namespace osl; using namespace osl;
using namespace cppu; using namespace cppu;
using namespace ucbhelper; 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 // Write the manifest
uno::Reference < XManifestWriter > xWriter = ManifestWriter::create( m_xContext ); uno::Reference < XManifestWriter > xWriter = ManifestWriter::create( m_xContext );
@@ -1071,7 +1070,7 @@ void ZipPackage::WriteManifest( ZipOutputStream& aZipOut, const vector< uno::Seq
aZipOut.rawCloseEntry(); 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; ZipEntry* pEntry = new ZipEntry;
rtl::Reference<ZipPackageBuffer> pBuffer = new ZipPackageBuffer; 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 // 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 sMediaType(u"MediaType");
static constexpr OUStringLiteral sVersion(u"Version"); static constexpr OUStringLiteral sVersion(u"Version");