[Libreoffice-commits] .: sw/source

Cédric Bosdonnat cbosdo at kemper.freedesktop.org
Thu Feb 10 08:04:32 PST 2011


 sw/source/filter/ww8/wrtww8.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d98a2abfc58bb380e3552e8501433854d5bc77e6
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Thu Feb 10 15:14:36 2011 +0100

    fdo#34064: adapt length of FFData

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index de4cc33..6a2f8f1 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3607,7 +3607,6 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
         + sizeof(aFldData)
         + sizeof( aFldHeader.version ) + sizeof( aFldHeader.bits ) + sizeof( aFldHeader.cch ) + sizeof( aFldHeader.hps )
         + 2*ffname.getLength() + 4
-        + 2*ffdeftext.getLength() + 4
         + 2*ffformat.getLength() + 4
         + 2*ffhelptext.getLength() + 4
         + 2*ffstattext.getLength() + 4
@@ -3615,6 +3614,8 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
         + 2*ffexitmcr.getLength() + 4;
     if ( type )
         slen += 2; // wDef
+    else
+        slen += 2*ffdeftext.getLength() + 4; //xstzTextDef
     if ( type==2 ) {
         slen += 2; // sttb ( fExtend )
         slen += 4; // for num of list items


More information about the Libreoffice-commits mailing list