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

[Caolán McNamara]

 sw/source/filter/ww8/ww8graf.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 7324aa6886d459c36f6ed98261327ca9759efcdc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 16 13:43:01 2014 +0000

    Related: #i123653# skip ranges that end before starting point
    
    fix assert on loading ooo123653-1, we don't care about ranges that end before
    the starting point we are interested in
    
    Change-Id: I46ddf882ce4099dbcd77c62569c5c51f1ce5aa76

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 0ab8038..c1f39df 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -597,7 +597,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
     pPlcxMan = new WW8PLCFMan(pSBase, eType, nStartCp, true);
 
     WW8_CP nStart = pPlcxMan->Where();
-    WW8_CP nNext, nEnd, nStartReplace=0;
+    WW8_CP nNext, nStartReplace=0;
 
     bool bDoingSymbol = false;
     sal_Unicode cReplaceSymbol = cSymbol;
@@ -616,6 +616,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
         WW8_CP nTxtStart = nStart;
         if (nTxtStart < nStartCp)
             nTxtStart = nStartCp;
+
         // get position of next SPRM
         bool bStartAttr = pPlcxMan->Get(&aRes);
         nAktColl = pPlcxMan->GetColl();
@@ -696,9 +697,9 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
         pPlcxMan->advance();
         nNext = pPlcxMan->Where();
 
-        if( (nNext != nStart) && !bONLYnPicLocFc )
+        const WW8_CP nEnd = ( nNext < nEndCp ) ? nNext : nEndCp;
+        if (!bONLYnPicLocFc && nNext != nStart && nEnd >= nStartCp)
         {
-            nEnd = ( nNext < nEndCp ) ? nNext : nEndCp;
             SfxItemPool *pEditPool = pS->GetPool();
 
             // Here read current properties and convert them into pS