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

[Jürgen Schmidt]

 sw/source/filter/ww8/wrtw8nds.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d56497365f36aa385f74ca5bb665f1ea541b52ef
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Tue Sep 18 14:34:42 2012 +0000

    Resolves: #i119831# check again the node if the bookmark belongs to it
    
    (start and end position)
    
    Patch By: jsc
    Review By: orw
    
    (cherry picked from commit 016331f9cc330abca8ea3bedd1be9f50cd68dc18)
    
    Change-Id: I7ad4a10be855806aeb9fc6fef5fbfba377671fc8

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 83bd794..85d6b11 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1634,8 +1634,8 @@ bool MSWordExportBase::GetBookmarks( const SwTxtNode& rNd, xub_StrLen nStt,
             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 );
 
             IFieldmark* pFieldmark = dynamic_cast<IFieldmark*>(pMark);
             if (pFieldmark && pFieldmark->GetFieldname() == ODF_COMMENTRANGE)