diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-03-23 15:36:37 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-03-23 15:36:37 +0000 |
| commit | a90774683ad9f7e053f427619fcd2d6ee97ea5fa (patch) | |
| tree | 27cf6b41c048064c9b6309041491bb5922a55eb9 /package/source/zippackage | |
| parent | ddab0ce7a201c26351925db49ea435f2d7a6170a (diff) | |
CWS-TOOLING: integrate CWS dba31j_DEV300
2009-03-11 12:24:24 +0100 iha r269311 : #i100102# report donut charts crash on load
2009-03-11 10:44:35 +0100 oj r269302 : #i100102# export meta.xml
2009-03-11 07:35:03 +0100 oj r269296 : #i99686# not used anymore
2009-03-11 07:34:27 +0100 oj r269295 : #i99686# not used anymore
2009-03-11 07:33:57 +0100 oj r269294 : #i99686# change storage usage
2009-03-10 15:21:41 +0100 mav r269275 : #i99686# test additional scenario
2009-03-10 08:37:10 +0100 mav r269239 : #i100040# calculate the name length correctly
2009-03-10 08:25:16 +0100 mav r269236 : #i99686# workaround to prevent crash while disposing the hierarchical stream
2009-03-10 07:14:05 +0100 oj r269235 : #i99686# fix usage of storage api
2009-03-10 07:13:17 +0100 oj r269234 : #i99686# fix usage of storage api
2009-03-09 13:33:26 +0100 fs r269085 : #i100012#
2009-03-09 13:11:08 +0100 fs r269081 : #i100036# don't store sub documents which have not been touched
2009-03-09 11:21:17 +0100 fs r269070 : #i100040# don't silence errors in impl_storeToStorage_throw
2009-03-09 10:28:48 +0100 oj r269065 : #i100036# throw exception when no activeConnection exists
Diffstat (limited to 'package/source/zippackage')
| -rw-r--r-- | package/source/zippackage/ZipPackageFolder.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index d6f115a3a09b..1d5e900e28fe 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -271,7 +271,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr // it is an empty subfolder, use workaround to store it ZipEntry* pTempEntry = new ZipEntry(); ZipPackageFolder::copyZipEntry ( *pTempEntry, aEntry ); - pTempEntry->nNameLen = (sal_Int16)rPath.getLength(); + pTempEntry->nNameLen = (sal_Int16)( ::rtl::OUStringToOString( rPath, RTL_TEXTENCODING_UTF8 ).getLength() ); pTempEntry->nExtraLen = -1; pTempEntry->sName = rPath; @@ -333,7 +333,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr ZipPackageFolder::copyZipEntry ( *pTempEntry, pStream->aEntry ); pTempEntry->sName = rPath + rShortName; - pTempEntry->nNameLen = (sal_Int16)( pTempEntry->sName.getLength() ); + pTempEntry->nNameLen = (sal_Int16)( ::rtl::OUStringToOString( pTempEntry->sName, RTL_TEXTENCODING_UTF8 ).getLength() ); sal_Bool bToBeEncrypted = pStream->IsToBeEncrypted() && (bHaveEncryptionKey || pStream->HasOwnKey()); sal_Bool bToBeCompressed = bToBeEncrypted ? sal_True : pStream->IsToBeCompressed(); |