[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-2' - sw/source

[Justin Luth]

 sw/source/core/crsr/crossrefbookmark.cxx |    2 +-
 sw/source/filter/ww8/ww8par5.cxx         |   11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 18b9bb8bafc3946305e2b011f5f100cb34fea959
Author: Justin Luth <justin_luth at sil.org>
Date:   Sat Mar 14 18:40:24 2015 +0300

    tdf#89482 fix __refheading__ regression, set only CrossRefs as TOC.
    
    bugfix tdf#68963 marked all __refheading__ bookmarks at TOC, but
    those crossreferences were deleted if they are not recorded in
    aReferencedTOCBookmarks.  Redesigned the fix to include _Toc in the
    crossreference name that is auto-generated, which is how MSWord
    differentiates the markers.y
    
    Change-Id: Ie11b90b1b933d275e4d59ee89f22ff527eb6c2ba
    Reviewed-on: https://gerrit.libreoffice.org/14870
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx
index 700a3f2..67a25d0 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -72,7 +72,7 @@ namespace sw { namespace mark
         const vcl::KeyCode& rCode,
         const OUString& rName,
         const OUString& rShortName)
-        : CrossRefBookmark(rPaM, rCode, rName, rShortName, IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix())
+        : CrossRefBookmark(rPaM, rCode, rName, rShortName, IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix()+"_Toc")
     { }
 
     bool CrossRefHeadingBookmark::IsLegalName(const OUString& rName)
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 246d3f6..bbde7d7 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -102,7 +102,7 @@ namespace
     // #120879# - helper method to identify a bookmark name to match the internal TOC bookmark naming convention
     bool IsTOCBookmarkName( const ::rtl::OUString& rName )
     {
-        return rName.startsWith("_Toc") || rName.startsWith(IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix());
+        return rName.startsWith("_Toc") || rName.startsWith(IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix()+"_Toc");
     }
 
     ::rtl::OUString EnsureTOCBookmarkName( const ::rtl::OUString& rName )
@@ -1970,6 +1970,15 @@ eF_ResT SwWW8ImplReader::Read_F_Ref( WW8FieldDesc*, OUString& rStr )
 
     OUString sBkmName(GetMappedBookmark(sOrigBkmName));
 
+    // #i120879# add cross reference bookmark name prefix, if it
+    // matches internal TOC bookmark naming convention
+    if ( IsTOCBookmarkName( sBkmName ) )
+    {
+        sBkmName = EnsureTOCBookmarkName(sBkmName);
+        // track <sBookmarkName> as referenced TOC bookmark.
+        pReffedStck->aReferencedTOCBookmarks.insert( sBkmName );
+    }
+
     SwGetRefField aFld(
         (SwGetRefFieldType*)rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD ),
         sBkmName,REF_BOOKMARK,0,eFormat);