(openoffice) branch AOO41X updated: Fix the serious regression from commit 1972b29432a5b05e40ec16d939ddb345b981e240, where HSQLDB database documents were getting corrupted and OpenOffice was even crashing.

[damjan]

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO41X by this push:
     new 0269a3f529 Fix the serious regression from commit 
1972b29432a5b05e40ec16d939ddb345b981e240, where HSQLDB database documents were 
getting corrupted and OpenOffice was even crashing.
0269a3f529 is described below

commit 0269a3f5294ea04729609aed284aabb982ed8e90
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: Sun Jul 5 13:11:25 2026 +0200

    Fix the serious regression from commit 
1972b29432a5b05e40ec16d939ddb345b981e240,
    where HSQLDB database documents were getting corrupted and OpenOffice was 
even
    crashing.
    
    The ZipEntry.nFileDataOffset field needed to be set to -1 like before,
    not to the nFileHeaderOffset.
    
    Patch by: me
    
    (cherry picked from commit 7f52a288cb10ed2497d68d96ab2828ed813f91a6)
---
 main/package/source/zippackage/ZipPackageFolder.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/package/source/zippackage/ZipPackageFolder.cxx 
b/main/package/source/zippackage/ZipPackageFolder.cxx
index 81f739b479..b29eb33095 100644
--- a/main/package/source/zippackage/ZipPackageFolder.cxx
+++ b/main/package/source/zippackage/ZipPackageFolder.cxx
@@ -674,7 +674,7 @@ bool ZipPackageFolder::saveChild( const ::rtl::OUString 
&rShortName, const Conte
             if ( rInfo.pStream->IsEncrypted() )
                 rInfo.pStream->setSize( nOwnStreamOrigSize );
 
-            rInfo.pStream->aEntry.nFileDataOffset = 
rInfo.pStream->aEntry.nFileHeaderOffset;
+            rInfo.pStream->aEntry.nFileDataOffset = -1;
         }
     }