[Libreoffice-commits] core.git: sw/qa sw/source

[Caolán McNamara]

 dev/null                         |binary
 sw/source/filter/ww8/ww8scan.cxx |   17 -----------------
 sw/source/filter/ww8/ww8scan.hxx |    1 -
 3 files changed, 18 deletions(-)

New commits:
commit 6d21cbd1238556535ec1bb1adf35b25bc8eb898b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 24 12:36:06 2015 +0100

    Revert "guard against hangs with bogus unsorted plcfs"
    
    This reverts commit f3db01f313ac06f70bec7584f48a380ab832ca75.
    
    <= maybe, need to double check

diff --git a/sw/qa/core/data/ww5/pass/hang-1.doc b/sw/qa/core/data/ww5/pass/hang-1.doc
deleted file mode 100644
index 6033724..0000000
Binary files a/sw/qa/core/data/ww5/pass/hang-1.doc and /dev/null differ
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 05e2be9..313dd78 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2101,8 +2101,6 @@ void WW8PLCF::ReadPLCF(SvStream& rSt, WW8_FC nFilePos, sal_uInt32 nPLCF)
 #endif // OSL_BIGENDIAN
         // Pointer to content array
         pPLCF_Contents = reinterpret_cast<sal_uInt8*>(&pPLCF_PosArray[nIMax + 1]);
-
-        TruncToSortedRange();
     }
 
     OSL_ENSURE(bValid, "Document has corrupt PLCF, ignoring it");
@@ -2122,21 +2120,6 @@ void WW8PLCF::MakeFailedPLCF()
     pPLCF_Contents = reinterpret_cast<sal_uInt8*>(&pPLCF_PosArray[nIMax + 1]);
 }
 
-void WW8PLCF::TruncToSortedRange()
-{
-    //Docs state that: ... all Plcs ... are sorted in ascending order.
-    //So ensure that here for broken documents.
-    for (auto nI = 0; nI < nIMax; ++nI)
-    {
-        if (pPLCF_PosArray[nI] >= pPLCF_PosArray[nI+1])
-        {
-            SAL_WARN("sw.ww8", "Document has unsorted PLCF, truncated to sorted portion");
-            nIMax = nI;
-            break;
-        }
-    }
-}
-
 void WW8PLCF::GeneratePLCF(SvStream& rSt, sal_Int32 nPN, sal_Int32 ncpN)
 {
     OSL_ENSURE( nIMax < ncpN, "Pcl.Fkp: Why is PLCF too big?" );
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 54e8165..53e5d47 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -291,7 +291,6 @@ private:
 
     void MakeFailedPLCF();
 
-    void TruncToSortedRange();
 public:
     WW8PLCF(SvStream& rSt, WW8_FC nFilePos, sal_Int32 nPLCF, int nStruct,
         WW8_CP nStartPos = -1);