You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2012/09/18 17:34:43 UTC

svn commit: r1387217 - /incubator/ooo/trunk/main/sw/source/filter/ww8/wrtw8nds.cxx

Author: jsc
Date: Tue Sep 18 15:34:42 2012
New Revision: 1387217

URL: http://svn.apache.org/viewvc?rev=1387217&view=rev
Log:
#119831# check again the node if the bookmark belongs to it (start and end position)

Patch By: jsc
Review By: orw


Modified:
    incubator/ooo/trunk/main/sw/source/filter/ww8/wrtw8nds.cxx

Modified: incubator/ooo/trunk/main/sw/source/filter/ww8/wrtw8nds.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/filter/ww8/wrtw8nds.cxx?rev=1387217&r1=1387216&r2=1387217&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/filter/ww8/wrtw8nds.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/filter/ww8/wrtw8nds.cxx Tue Sep 18 15:34:42 2012
@@ -1684,8 +1684,8 @@ bool MSWordExportBase::GetBookmarks( con
             xub_StrLen nBEnd = pMark->GetMarkEnd().nContent.GetIndex();
 
             // Keep only the bookmars starting or ending in the snippet
-            bool bIsStartOk = ( nBStart >= nStt ) && ( nBStart <= nEnd );
-            bool bIsEndOk = ( nBEnd >= nStt ) && ( nBEnd <= nEnd );
+            bool bIsStartOk = ( pMark->GetMarkStart().nNode == nNd ) && ( nBStart >= nStt ) && ( nBStart <= nEnd );
+            bool bIsEndOk = ( pMark->GetMarkEnd().nNode == nNd ) && ( nBEnd >= nStt ) && ( nBEnd <= nEnd );
 
             if ( bIsStartOk || bIsEndOk )
                 rArr.push_back( pMark );