tdf#94804 sw: allow duplicate heading cross reference bookmarks

... in ODF import, so that reference fields do not break that reference
numbering cross reference bookmarks that were corrupted by commit
679faffc.

This used to work by accident before commit
9d0c51da fixed it to actually check for
duplicates properly.

Change-Id: I5ed58eda7f3f2ce470a778852f6dda7a14356860

sw/inc/IDocumentMarkAccess.hxx

@@ -77,7 +77,7 @@ class IDocumentMarkAccess
         */
         virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM,
             const OUString& rProposedName,
-            MarkType eMark) =0;
+            MarkType eMark, bool = false) = 0;
 
         virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM,
             const OUString& rName,

sw/qa/extras/odfexport/odfexport.cxx

@@ -25,6 +25,7 @@
 #include <officecfg/Office/Common.hxx>
 #include <com/sun/star/document/XEmbeddedObjectSupplier.hpp>
 #include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp>
+#include <com/sun/star/text/XTextField.hpp>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/fileformat.h>
 
@@ -409,6 +410,35 @@ DECLARE_ODFEXPORT_TEST(testTextframeGradient, "textframe-gradient.odt")
     CPPUNIT_ASSERT_EQUAL(awt::GradientStyle_AXIAL, aGradient.Style);
 }
 
+DECLARE_ODFEXPORT_TEST(testDuplicateCrossRefHeadingBookmark, "CrossRefHeadingBookmark.fodt")
+{
+    // the file contains invalid duplicate heading cross reference bookmarks
+    // but we have to round trip them, tdf#94804
+
+    uno::Reference<text::XBookmarksSupplier> xBookmarksSupplier(mxComponent,
+        uno::UNO_QUERY);
+    uno::Reference<container::XNameAccess> xBookmarks(
+        xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY);
+    uno::Reference<text::XTextContent> xBookmark1(
+        xBookmarks->getByName("__RefHeading__8284_1826734303"), uno::UNO_QUERY);
+    CPPUNIT_ASSERT(xBookmark1.is());
+    uno::Reference<text::XTextContent> xBookmark2(
+        xBookmarks->getByName("__RefHeading__1673_25705824"), uno::UNO_QUERY);
+    CPPUNIT_ASSERT(xBookmark2.is());
+
+    uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent, uno::UNO_QUERY);
+    uno::Reference<util::XRefreshable>(xTextFieldsSupplier->getTextFields(), uno::UNO_QUERY)->refresh();
+
+    uno::Reference<container::XEnumerationAccess> xFieldsAccess(xTextFieldsSupplier->getTextFields());
+    uno::Reference<container::XEnumeration> xFields(xFieldsAccess->createEnumeration());
+    uno::Any aField1 = xFields->nextElement();
+    uno::Reference<text::XTextField> xField1(aField1, uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("1.1"), xField1->getPresentation(false));
+    uno::Any aField2 = xFields->nextElement();
+    uno::Reference<text::XTextField> xField2(aField2, uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(OUString("1.1"), xField2->getPresentation(false));
+}
+
 DECLARE_ODFEXPORT_TEST(testFdo60769, "fdo60769.odt")
 {
     // Test multi-paragraph comment range feature.

sw/source/core/doc/docbm.cxx

@@ -349,7 +349,8 @@ namespace sw { namespace mark
 
     ::sw::mark::IMark* MarkManager::makeMark(const SwPaM& rPaM,
         const OUString& rName,
-        const IDocumentMarkAccess::MarkType eType)
+        const IDocumentMarkAccess::MarkType eType,
+        bool const isHorribleHackIgnoreDuplicates)
     {
 #if 0
         {
@@ -372,7 +373,8 @@ namespace sw { namespace mark
             " - more than USHRT_MAX marks are not supported correctly");
         // There should only be one CrossRefBookmark per Textnode per Type
         if ((eType == MarkType::CROSSREF_NUMITEM_BOOKMARK || eType == MarkType::CROSSREF_HEADING_BOOKMARK)
-            && (lcl_FindMarkAtPos(m_vBookmarks, *rPaM.Start(), eType) != m_vBookmarks.end()))
+            && (lcl_FindMarkAtPos(m_vBookmarks, *rPaM.Start(), eType) != m_vBookmarks.end())
+            && !isHorribleHackIgnoreDuplicates)
         {   // this can happen via UNO API
             SAL_WARN("sw.core", "MarkManager::makeMark(..)"
                 " - refusing to create duplicate CrossRefBookmark");

sw/source/core/inc/MarkManager.hxx

@@ -37,7 +37,7 @@ namespace sw {
         public:
             MarkManager(/*[in/out]*/ SwDoc& rDoc);
             // IDocumentMarkAccess
-            virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const OUString& rName, IDocumentMarkAccess::MarkType eMark) override;
+            virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const OUString& rName, IDocumentMarkAccess::MarkType eMark, bool = false) override;
 
             virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM,
                 const OUString& rName,

sw/source/core/unocore/unobkm.cxx

@@ -226,6 +226,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
     SwUnoInternalPaM aPam(*m_pImpl->m_pDoc);
     ::sw::XTextRangeToSwPaM(aPam, xTextRange);
     UnoActionContext aCont(m_pImpl->m_pDoc);
+    bool isHorribleHackIgnoreDuplicates(false);
     if (m_pImpl->m_sMarkName.isEmpty())
     {
          m_pImpl->m_sMarkName = "Bookmark";
@@ -240,10 +241,16 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
         IDocumentMarkAccess::IsLegalPaMForCrossRefHeadingBookmark( aPam ) )
     {
         eType = IDocumentMarkAccess::MarkType::CROSSREF_HEADING_BOOKMARK;
+        // tdf#94804 LO 4.2-5.0 create invalid duplicates that must be preserved
+        // note: do not check meta:generator, may be preserved by other versions
+        if (m_pImpl->m_pDoc->IsInXMLImport())
+        {
+            isHorribleHackIgnoreDuplicates = true;
+        }
     }
     m_pImpl->registerInMark(*this,
         m_pImpl->m_pDoc->getIDocumentMarkAccess()->makeMark(
-            aPam, m_pImpl->m_sMarkName, eType));
+            aPam, m_pImpl->m_sMarkName, eType, isHorribleHackIgnoreDuplicates));
     // #i81002#
     // Check, if bookmark has been created.
     // E.g., the creation of a cross-reference bookmark is suppress,