[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/qa sw/source

[Zolnai Tamás]

 sw/qa/extras/ww8export/data/fdo59530.doc |binary
 sw/source/filter/ww8/wrtw8sty.cxx        |    7 -------
 2 files changed, 7 deletions(-)

New commits:
commit 5ea7f28bb9f787a1650e0d126e28ffb543c2a363
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Mon Jan 6 15:59:50 2014 +0100

    cp#2013101510000026: fix file coruption caused by comments' doc export
    
    Plcfbkl contains only character positions. The Plcfbkf is that one
    which contains additional informations.
    
    Change-Id: I9bd8eec5c8e64d9d757764dae51bcb866456cdc9
    (cherry picked from commit 3ed870e237a0b7b95f48bfb8192fe7d5c2957a03)

diff --git a/sw/qa/extras/ww8export/data/fdo59530.doc b/sw/qa/extras/ww8export/data/fdo59530.doc
index 921fbca..90bd4ce 100644
Binary files a/sw/qa/extras/ww8export/data/fdo59530.doc and b/sw/qa/extras/ww8export/data/fdo59530.doc differ
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 0b5422c..7b27efd 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -2238,13 +2238,6 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
                         }
                         SwWW8Writer::WriteLong( *rWrt.pTableStrm, aRangeEndPos[i-1] + 1);
 
-                        // Commented text ranges additional informations (Plcfbkl.aFBKF)
-                        for ( i = 0; i < aRangeEndPos.size(); ++i )
-                        {
-                            SwWW8Writer::WriteShort( *rWrt.pTableStrm, i ); // FBKF.ibkl
-                            SwWW8Writer::WriteShort( *rWrt.pTableStrm, 0 ); // FBKF.bkc
-                        }
-
                         nFcStart = rWrt.pTableStrm->Tell();
                         rFib.lcbPlcfAtnbkl = nFcStart - rFib.fcPlcfAtnbkl;