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

[Serge Krot]

 sw/source/filter/ww8/docxattributeoutput.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 1818bffa3e97a47f5bdde0bca9ea6679b93543d2
Author: Serge Krot <Serge.Krot at cib.de>
Date:   Fri Oct 13 11:06:14 2017 +0200

    tdf#66398 Fix copy-paste: call start() bookmark instead of end()
    
    Change-Id: I63bde881507dc3c5d123bbcf96b63027522ea569
    Reviewed-on: https://gerrit.libreoffice.org/43365
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index e2e000c00bc0..9f2e11da3a61 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1752,10 +1752,9 @@ void DocxAttributeOutput::EndField_Impl( FieldInfos& rInfos )
     }
 
     // Write the bookmark start if any
-    OUString aBkmName( m_sFieldBkm );
-    if ( !aBkmName.isEmpty() )
+    if ( !m_sFieldBkm.isEmpty() )
     {
-        DoWriteBookmarkTagEnd(aBkmName);
+        DoWriteBookmarkTagStart(m_sFieldBkm);
     }
 
     if (rInfos.pField ) // For hyperlinks and TOX
@@ -1779,9 +1778,9 @@ void DocxAttributeOutput::EndField_Impl( FieldInfos& rInfos )
     }
 
     // Write the bookmark end if any
-    if ( !aBkmName.isEmpty() )
+    if ( !m_sFieldBkm.isEmpty() )
     {
-        DoWriteBookmarkTagEnd(aBkmName);
+        DoWriteBookmarkTagEnd(m_sFieldBkm);
 
         m_nNextBookmarkId++;
     }