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

[Caolán McNamara]

 sw/qa/core/data/ww8/pass/hang-8.doc |binary
 sw/source/core/doc/docredln.cxx     |    1 -
 sw/source/filter/ww8/ww8scan.cxx    |   13 +++++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit ed7d22049596ac91ad75bfad1a5675c13714e203
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 2 20:44:06 2015 +0100

    doc para property ranges cannot be 0 length
    
    Change-Id: If946204873343d8bbc0c1d391ca2c65d8b2f8561

diff --git a/sw/qa/core/data/ww8/pass/hang-8.doc b/sw/qa/core/data/ww8/pass/hang-8.doc
new file mode 100644
index 0000000..4f0e30e
Binary files /dev/null and b/sw/qa/core/data/ww8/pass/hang-8.doc differ
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index ed6431a..27822fa 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -4351,6 +4351,19 @@ bool WW8PLCFx_AtnBook::getIsEnd() const
 // if we don't expect trouble thereby.
 void WW8PLCFMan::AdjustEnds( WW8PLCFxDesc& rDesc )
 {
+    // might be necessary to do this for pChp and/or pSep as well,
+    // but its definitely the case for paragraphs that EndPos > StartPos
+    // for a well formed paragraph as those always have a paragraph
+    // <cr> in them
+    if (&rDesc == pPap && rDesc.bRealLineEnd)
+    {
+        if (rDesc.nStartPos == rDesc.nEndPos && rDesc.nEndPos != WW8_CP_MAX)
+        {
+            SAL_WARN("sw.ww8", "WW8PLCFxDesc End same as Start, abandoning to avoid looping");
+            rDesc.nEndPos = WW8_CP_MAX;
+        }
+    }
+
     //Store old end position for supercool new property finder that uses
     //cp instead of fc's as nature intended
     rDesc.nOrigEndPos = rDesc.nEndPos;
commit 43bcb7b05b1e950e2af15b00d7ede218b4f3edff
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 2 16:22:16 2015 +0100

    -Wundefined-bool-conversion
    
    'this' pointer cannot be null in well-defined C++ code; pointer may be assumed
    to always convert to true [-Wundefined-bool-conversion]
    
    Change-Id: Iafffb9ea81387ea19fb9c0a4c6ba929215ace3fa

diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 0a71de7..1cbb2b5 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -1360,7 +1360,6 @@ void SwRangeRedline::MoveFromSection(size_t nMyPos)
         SwDoc* pDoc = GetDoc();
         const SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
         std::vector<SwPosition*> aBeforeArr, aBehindArr;
-        OSL_ENSURE( this, "this is not in the array?" );
         bool bBreak = false;
         SwRedlineTable::size_type n;