diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 0a7f268bf207..7de9fb50042a 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include @@ -4416,31 +4415,11 @@ void DomainMapper_Impl::StartOrEndBookmark( const OUString& rId ) { xCursor->goLeft( 1, false ); } - uno::Reference< container::XNamed > xBkmNamed( xBookmark, uno::UNO_QUERY_THROW ); - - bool bAllowInsert = true; - uno::Reference xRange(xCursor, uno::UNO_QUERY_THROW); - if (m_xPrevBookmark.is()) - { - uno::Reference xTextRangeCompare(xRange->getText(), uno::UNO_QUERY_THROW); - if (xTextRangeCompare->compareRegionStarts(m_xPrevBookmark, xRange) == 0 && - xTextRangeCompare->compareRegionEnds(m_xPrevBookmark, xRange) == 0) - { - SAL_WARN("writerfilter", "Cannot insert bookmark " << aBookmarkIter->second.m_sBookmarkName - << " because another one is already inserted at this point"); - bAllowInsert = false; - } - } - - if (bAllowInsert) - { - assert(!aBookmarkIter->second.m_sBookmarkName.isEmpty()); - //todo: make sure the name is not used already! - xBkmNamed->setName( aBookmarkIter->second.m_sBookmarkName ); - xTextAppend->insertTextContent(xRange, xBookmark, !xCursor->isCollapsed()); - m_xPrevBookmark = xRange; - } + assert(!aBookmarkIter->second.m_sBookmarkName.isEmpty()); + //todo: make sure the name is not used already! + xBkmNamed->setName( aBookmarkIter->second.m_sBookmarkName ); + xTextAppend->insertTextContent( uno::Reference< text::XTextRange >( xCursor, uno::UNO_QUERY_THROW), xBookmark, !xCursor->isCollapsed() ); } m_aBookmarkMap.erase( aBookmarkIter ); m_sCurrentBkmkId.clear(); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index c218f53559f5..11e58cd9ff1f 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -349,8 +349,6 @@ private: LineNumberSettings m_aLineNumberSettings; BookmarkMap_t m_aBookmarkMap; - /// Detect attempt to insert multiple bookmarks at the same position - css::uno::Reference m_xPrevBookmark; OUString m_sCurrentBkmkId; OUString m_sCurrentBkmkName;