diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 13:30:27 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 13:30:27 +0000 |
commit | 9707be00bae15b76769a5fc83898f01129c8a7e9 (patch) | |
tree | c27ccf41356a7674ec77be0a425aa66e105293f4 /shell | |
parent | 9464a9cfb32a77e888cd53ada539c26520aca9ff (diff) |
INTEGRATION: CWS desktintgr02 (1.2.8); FILE MERGED
2004/08/14 11:33:02 tra 1.2.8.2: #i24335#allocate enough space for the longest zip content name including the final 0 in GetDirectory
2004/07/29 09:14:06 deuce 1.2.8.1: Issue number: 21110
Submitted by: Gorden Lin {gorden.lin@sun.com}
Reviewed by: Tino Rachui {tino.rachui@sun.com}
Diffstat (limited to 'shell')
-rw-r--r-- | shell/source/all/zipfile/zipfile.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/shell/source/all/zipfile/zipfile.cxx b/shell/source/all/zipfile/zipfile.cxx index f327611b394d..c12acfa91757 100644 --- a/shell/source/all/zipfile/zipfile.cxx +++ b/shell/source/all/zipfile/zipfile.cxx @@ -2,9 +2,9 @@ * * $RCSfile: zipfile.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2004-04-07 10:58:16 $ + * last change: $Author: hr $ $Date: 2004-09-08 14:30:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,7 +86,7 @@ IOException if the specified file doesn't exist AccessViolationException if read access to the file is denied */ -bool ZipFile::IsZipFile(const std::string& FileName) +bool ZipFile::IsZipFile(const std::string& /*FileName*/) { return true; } @@ -106,7 +106,7 @@ bool ZipFile::IsZipFile(const std::string& FileName) IOException if the specified file doesn't exist or is no zip file AccessViolationException if read access to the file is denied */ -bool ZipFile::IsValidZipFileVersionNumber(const std::string& FileName) +bool ZipFile::IsValidZipFileVersionNumber(const std::string& /*FileName*/) { return true; } @@ -179,7 +179,7 @@ ZipFile::DirectoryPtr_t ZipFile::GetDirectory() const { DirectoryPtr_t dir(new Directory_t()); - long lmax = GetFileLongestFileNameLength(); + long lmax = GetFileLongestFileNameLength() + 1; char* szFileName = reinterpret_cast<char*>(_alloca(lmax)); if (!szFileName) |