CWS-TOOLING: integrate CWS swrefactormarks2

2009-04-09 12:51:41 +0200 b_michaelsen  r270689 : #i94949# cleaned up assertions after rebasing
2009-04-08 17:37:08 +0200 b_michaelsen  r270658 : fixing sw/source/ui/utlui/makefile.mk
2009-04-07 17:56:54 +0200 b_michaelsen  r270606 : added bookctrl.cxx to EXCEPTIONFILES, because this is needed for stl on unxsols4
2009-04-07 17:05:20 +0200 b_michaelsen  r270603 : added crbm.cxx to EXCEPTIONFILES, because this is needed for stl on unxsols4
2009-04-02 23:44:38 +0200 b_michaelsen  r270436 : CWS-TOOLING: rebase CWS swrefactormarks2 to trunk@270033 (milestone: DEV300:m45)
2009-02-27 16:25:31 +0100 b_michaelsen  r268606 : #i94949# fixed Windows buildbreaker
2009-02-25 18:01:13 +0100 b_michaelsen  r268464 : #i94949# Bookmarktest document filter roundtrips
2009-02-24 18:23:55 +0100 b_michaelsen  r268404 : #i94949# Bookmark unittests
2009-02-23 19:47:44 +0100 b_michaelsen  r268370 : #i94949# added unittest for bookmarks
2009-02-23 12:22:07 +0100 b_michaelsen  r268348 : #i94949# fixing CheckCrossReferences testcase
2009-02-20 18:12:50 +0100 b_michaelsen  r268335 : #i94949# fixing SwXTextRange
2009-02-18 18:32:57 +0100 b_michaelsen  r268252 : #i94949# deregistering DdeBookmarks on delete
2009-02-18 18:29:08 +0100 b_michaelsen  r268251 : fixing dbgoutsw.cxx for debug builds
2009-02-16 18:42:43 +0100 b_michaelsen  r267834 : CWS-TOOLING: rebase CWS swrefactormarks2 to trunk@267171 (milestone: DEV300:m41)
2009-02-12 15:32:02 +0100 b_michaelsen  r267667 : #i94949 fixed crossrefbookmark naming
2009-02-11 18:30:08 +0100 b_michaelsen  r267624 : #94949# fixing bookmark navigation
2009-02-11 13:55:26 +0100 b_michaelsen  r267599 : #i94949# fixed bookmark naming
2009-02-10 17:53:05 +0100 b_michaelsen  r267571 : #i94949# renamed HasOtherMarkPos to IsExpanded
2009-02-10 17:23:01 +0100 b_michaelsen  r267564 : #i94949# renamed ::sw::bookmark namespace to more fitting ::sw::mark
2009-02-10 16:16:32 +0100 b_michaelsen  r267553 : #i94949# creating only CrossRefBookmark per Txtnode
2009-02-10 12:14:05 +0100 b_michaelsen  r267547 : #i94949# fixed bookmark count in navigator
2009-02-09 19:12:18 +0100 b_michaelsen  r267532 : #i94949# lcl_CopyBookmarks(..) - handle marks on boundaries correctly
2009-02-09 17:32:45 +0100 b_michaelsen  r267524 : #i94949# setting the refobject of the DdeBookmark in Sin SwServerObject::SetDdeBookmark(..)
2009-02-09 17:22:15 +0100 b_michaelsen  r267523 : #i94949# trying to harden SwServerObject
2009-02-09 16:47:32 +0100 b_michaelsen  r267521 : #i94949# lcl_CopyBookmarks(..): try to get the source mark name, if possible
2009-02-09 16:05:42 +0100 b_michaelsen  r267519 : #i94949# clearing the OtherMarkPos if PaM has no mark in repositionMark(..), swapping inverted bookmarks without hissing an assertion
2009-02-09 15:55:38 +0100 b_michaelsen  r267518 : #i94949# checking for out-of-bounds in SwView::ExecuteStatusLine(..)
2009-02-09 15:23:47 +0100 b_michaelsen  r267517 : #i94949# using an UNO_BOOKMARK in ui/dbui/dbinsdlg.cxx
2009-02-09 14:14:47 +0100 b_michaelsen  r267514 : #i94949# IDocumentMarkAccess::GetType(..) asserts on unknown type
2009-02-09 14:04:25 +0100 b_michaelsen  r267513 : #i94949# using rtl strings instead of tools-strings in CrossRefBookmarks
2009-02-09 13:55:01 +0100 b_michaelsen  r267510 : #i94949# using empty string for UnoMark construction
2009-02-09 13:46:46 +0100 b_michaelsen  r267509 : #i94949# removed superfluous #includes, removed superfluous member DdeBookmark::bGenerateName, initialized DdeBookmark::m_aRefObj removed superfluous local _FindItem::ClearObj
2009-02-06 14:38:37 +0100 b_michaelsen  r267462 : #i94949# fixing FN_STAT_BOOKMARK dispatches
2009-02-05 18:05:07 +0100 b_michaelsen  r267436 : #i94949# removing superfluous #includes
2009-02-04 15:51:31 +0100 b_michaelsen  r267391 : fixing resync merge error
2009-02-02 19:39:55 +0100 b_michaelsen  r267294 : #i94949# bookmark performance
2009-01-30 19:30:51 +0100 b_michaelsen  r267229 : #i94949# throwing IllegalArgumentException, if appropriate
2009-01-30 19:29:56 +0100 b_michaelsen  r267228 : #i94949# refactored lcl_FillBookmarkArray, comments, constness
2009-01-30 19:23:49 +0100 b_michaelsen  r267227 : #i94949# refactored lcl_FillBookmarkArray, comments, constness
2009-01-30 19:16:06 +0100 b_michaelsen  r267226 : #i94949# refactored lcl_FillBookmarkArray
2009-01-30 17:59:27 +0100 b_michaelsen  r267222 : #i94949# removed superficial #include
2009-01-30 17:50:02 +0100 b_michaelsen  r267220 : #i94949# SwXTextRange remembers its UNO bookmark
2009-01-29 20:19:58 +0100 b_michaelsen  r267168 : #i94949# implemented IDocumentMarkAccess::findBookmark
2009-01-29 17:22:17 +0100 b_michaelsen  r267162 : #i94949# implemented renameMark in Markmanager
2009-01-29 14:17:10 +0100 b_michaelsen  r267134 : #i94949# cleanup in SwXBookmark, whitespace
2009-01-29 13:21:54 +0100 b_michaelsen  r267125 : #i94949# cleanup in SwXBookmark, whitespace
2009-01-29 13:06:10 +0100 b_michaelsen  r267120 : #i94949# cleanup in SwXBookmark, whitespace
2009-01-29 13:00:09 +0100 b_michaelsen  r267118 : #i94949# cleanup in SwXBookmark, whitespace
2009-01-29 10:35:10 +0100 b_michaelsen  r267101 : #i94949# renamed SetCrsrToBkmk to SetCrsrToMark, moving to start/end of doc if no more bookmarks can be found
2009-01-28 17:05:36 +0100 b_michaelsen  r267070 : #i94949# fixed order in aProvNamesId in unocoll.cxx
2009-01-28 15:46:13 +0100 b_michaelsen  r267063 : #i94949# documentation
2009-01-28 15:36:59 +0100 b_michaelsen  r267062 : #i94949# removing superficial #include
2009-01-28 15:30:36 +0100 b_michaelsen  r267061 : #i94949# basic code conventions
2009-01-28 11:14:30 +0100 b_michaelsen  r267039 : #i94949# comparing to the actual name of the new mark
2009-01-26 15:22:25 +0100 b_michaelsen  r266927 : #i94949# performance fixes
2009-01-14 21:16:56 +0100 b_michaelsen  r266332 : #i94949# fixing linux x86-64 compiler warnings
2009-01-14 19:52:06 +0100 b_michaelsen  r266331 : #i94949# fixing some compiler warnings
2008-12-15 13:04:49 +0100 b_michaelsen  r265474 : #i94949# fixed microsoft compiler warnings
2008-12-12 18:26:02 +0100 b_michaelsen  r265434 : #i94949# fixed pro platform buildbreakers
2008-12-11 17:51:24 +0100 b_michaelsen  r265342 : CWS-TOOLING: rebase CWS swrefactormarks2 to trunk@264807 (milestone: DEV300:m37)
2008-12-09 18:30:59 +0100 b_michaelsen  r265134 : #i94949# fixed IDocumentMarkAccess::GetType for new mark inheritance tree
2008-12-09 16:56:26 +0100 b_michaelsen  r265118 : #i94949# fixed deleteMark optimization
2008-12-09 14:55:58 +0100 b_michaelsen  r265092 : #i94949# DdeLink and DdeBookmark
2008-12-05 18:28:05 +0100 b_michaelsen  r264914 : #i94949# fixed InitDoc in bookmarks
2008-12-02 02:23:51 +0100 b_michaelsen  r264649 : #i94949# removed obsolete naming proposal code in SwXTextRange, fixed navigator reminders to forget the oldest reminder when the pool is empty
2008-12-02 02:05:19 +0100 b_michaelsen  r264648 : #i94949# using bisect search for delete
2008-12-02 01:58:16 +0100 b_michaelsen  r264647 : #i94949# using bisect search for delete
2008-12-02 01:37:33 +0100 b_michaelsen  r264646 : #i94949# using bisect search for delete
2008-12-02 01:03:29 +0100 b_michaelsen  r264645 : #i94949# fixed deleteMark crash
2008-12-01 20:55:00 +0100 b_michaelsen  r264638 : #i94949# removed crossrefs from ui enumerations
2008-12-01 15:48:12 +0100 b_michaelsen  r264613 : #i94949# removed superfluous local functions
2008-12-01 15:01:19 +0100 b_michaelsen  r264608 : #i94949# optimized insertion of new marks
2008-12-01 14:33:21 +0100 b_michaelsen  r264603 : #i94949# simplified code finding Fieldmark for a position
2008-12-01 14:05:55 +0100 b_michaelsen  r264598 : #i94949# fixed reverse travelling through marks, removed obsolete getUniqueMarkName()
2008-11-27 18:48:15 +0100 b_michaelsen  r264515 : #i94949# fixed _SaveCntntIdx and friends
2008-11-27 15:59:49 +0100 b_michaelsen  r264500 : #i94949# fix Mark position only in ctor
2008-11-27 15:52:28 +0100 b_michaelsen  r264497 : #i94949# fixed Bug in SwXBookmark, was using pDoc too early
2008-11-26 14:54:22 +0100 b_michaelsen  r264396 : #i94949# fixed documentation, simplified  navigator reminder code
2008-11-24 20:45:51 +0100 b_michaelsen  r264266 : #i94949# removed last obsolete getUniqueMarkName calls
2008-11-24 20:21:35 +0100 b_michaelsen  r264265 : #i94949# fixed typo in IDocumentMarkAccess, removed obsolete getUniqueMarkName calls
2008-11-24 18:34:32 +0100 b_michaelsen  r264264 : #i94949# repositioning of Marks, removed possibility to delete marks by name in the core, refactoring of navigator reminder generation
2008-11-21 14:08:49 +0100 b_michaelsen  r264137 : #i94949# simplified makeMark
2008-11-21 12:07:09 +0100 b_michaelsen  r264120 : #i94949# moved ShortName and KeyCode from IMark to IBookmark
2008-11-19 12:50:49 +0100 b_michaelsen  r263981 : #i94949# starting refactoring of bookmark naming
2008-11-19 11:31:08 +0100 b_michaelsen  r263972 : #i94949# getting rid of obsolete dynamic casts
2008-11-18 19:06:09 +0100 b_michaelsen  r263795 : #i94949# getting rid of index based mark access, IDocumentMarkAccess already provides iterators
2008-11-18 17:50:18 +0100 b_michaelsen  r263792 : #i94949# getting rid of index based mark access, IDocumentMarkAccess already provides iterators
2008-11-18 16:48:20 +0100 b_michaelsen  r263783 : #i94949# removed methods from crsrsh which are already available directly via IDocumentMarkAccess
2008-11-18 11:31:35 +0100 b_michaelsen  r263753 : #i94949# cleaning up mark code in crsrsh
2008-11-17 10:15:25 +0100 b_michaelsen  r263705 : #i94949# removed possible integer overflow
2008-11-14 18:48:45 +0100 b_michaelsen  r263695 : #i94949# management of mark names in MarkManager
2008-11-14 18:23:40 +0100 b_michaelsen  r263693 : #i94949# using polymorphism to do mark-specific setup in SwDoc
2008-11-14 16:27:09 +0100 b_michaelsen  r263684 : #i94949# got rid of makeCrossRefBookmark
2008-11-14 13:03:32 +0100 b_michaelsen  r263674 : #i94949# refactored Correction methods
2008-11-13 12:27:55 +0100 b_michaelsen  r263631 : #i94949# got rid of old-style tools assertions in new code
2008-11-12 16:58:16 +0100 b_michaelsen  r263608 : #i94949# added assertion for unique names
2008-11-12 16:55:18 +0100 b_michaelsen  r263607 : #i94949# maked XFormField deprecated
2008-11-12 13:04:29 +0100 b_michaelsen  r263587 : #i94949# replaced IDocumentMarkAccess::GetType with simple dynamic_cast where possible
2008-11-11 18:45:53 +0100 b_michaelsen  r263572 : #i94949# cleaned up SwHstryBookmark
2008-11-11 13:48:18 +0100 b_michaelsen  r263557 : #i94949# removed dynamic_casts to SwModify by inheriting IMark from it
2008-11-11 11:26:28 +0100 b_michaelsen  r263548 : #i94949# fixed SwXBookmark
2008-11-10 17:01:19 +0100 b_michaelsen  r263529 : #i94949# fixed DdeBookmarks in clipboard
2008-11-10 16:44:52 +0100 b_michaelsen  r263527 : #i94949# formatting
2008-11-10 16:29:16 +0100 b_michaelsen  r263526 : #i94949# fixing unoobj.cxx
2008-11-10 16:23:50 +0100 b_michaelsen  r263525 : #i94949# cleaning up crossrefbookmark.cxx/.hxx
2008-11-10 16:02:08 +0100 b_michaelsen  r263524 : #i94949# Pdf Export should only generate 'real' bookmarks
2008-11-10 15:33:58 +0100 b_michaelsen  r263521 : #i94949# removed const_casts
2008-11-10 15:12:06 +0100 b_michaelsen  r263520 : #i94949# moved _DelBookmarks into MarksManager
2008-11-07 18:48:38 +0100 b_michaelsen  r263480 : #i94949# using iterator interface
2008-11-07 18:41:46 +0100 b_michaelsen  r263478 : #i94949# using iterator interface
2008-11-07 18:07:41 +0100 b_michaelsen  r263477 : #i94949# using iterator interface
2008-11-07 17:54:41 +0100 b_michaelsen  r263476 : #i94949# using iterator interface
2008-11-07 17:44:41 +0100 b_michaelsen  r263475 : #i94949# moved correction methods into MarkManager
2008-11-06 18:47:28 +0100 b_michaelsen  r263404 : #i94949# getting rid of superfluous const_casts
2008-11-06 17:58:01 +0100 b_michaelsen  r263403 : #i94949# no more setting of mark positions outside of the core
2008-11-06 17:08:37 +0100 b_michaelsen  r263401 : #i94949# removed setters from IMark
2008-11-06 13:55:25 +0100 b_michaelsen  r263383 : #i94949 SwDoc does not implement IDocumentMarkAccess anymore
2008-11-04 18:17:03 +0100 b_michaelsen  r263333 : #i94949# began removing IDocumentMarkAccess from SwDoc
2008-11-04 16:48:34 +0100 b_michaelsen  r263330 : removing dead code (SwBitArray) found by mst
2008-11-04 16:29:32 +0100 b_michaelsen  r263329 : removing dead code (SwBitArray) found by mst
2008-11-04 14:57:48 +0100 b_michaelsen  r263326 : removing dead code (SwBitArray) found by mst
2008-11-04 14:50:18 +0100 b_michaelsen  r263325 : #i94949# stricter typing in IDocumentMarkAccess
2008-10-24 15:16:27 +0200 b_michaelsen  r262647 : #i94949# renamed ::sw::bookmark::SimpleMark to NavigatorReminder to fit the IDocumentMarkAccess enum
2008-10-24 15:10:10 +0200 b_michaelsen  r262646 : #i94949# only 'real' bookmark implement IBookmark, Marks also get removed from m_vFieldmarks on delete/clear
2008-10-24 13:06:23 +0200 b_michaelsen  r262636 : #i94949# Fieldmark tabnavigation
2008-10-23 12:16:36 +0200 b_michaelsen  r262619 : #i94949# Fieldmark classes and filters
2008-10-22 13:17:18 +0200 b_michaelsen  r262597 : #i94949# writer import fixes
2008-10-21 11:30:38 +0200 b_michaelsen  r262565 : #i94949# renamed methods containing Bookmark in the generic IMark interface
2008-10-20 14:09:02 +0200 b_michaelsen  r262318 : #i94949# fixed SwDoc::CorrRel
2008-10-16 22:45:13 +0200 b_michaelsen  r262273 : #i94949 simplified Before/After methods
2008-10-16 21:40:57 +0200 b_michaelsen  r262271 : #i94949 renamed SimpleMark to NavigatorReminder
2008-10-16 21:15:23 +0200 b_michaelsen  r262270 : #i94949 using shared_ptr only in MarkManager
2008-10-16 17:46:37 +0200 b_michaelsen  r262269 : #i94949# getFieldmarkBefore and getFieldmarkAfter
2008-10-16 17:12:13 +0200 b_michaelsen  r262265 : #i94949# cleanup in crbm.cxx
2008-10-16 12:49:01 +0200 b_michaelsen  r262257 : #i94949# fixed usage of invalid iterator, fixed invalid cast
2008-10-15 15:34:20 +0200 b_michaelsen  r262239 : #i94949# added moved files
2008-10-15 15:26:45 +0200 b_michaelsen  r262237 : #i94949# initial reimplementation of Bookmarks

4 files changed, 454 insertions, 33 deletions

diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
new file mode 100644
index 000000000000..d6d8fd63b9f5
--- /dev/null
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -0,0 +1,90 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: $
+ * $Revision: $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _SW_BOOKMARK_MARKMANAGER_HXX
+#define _SW_BOOKMARK_MARKMANAGER_HXX
+
+#include <IMark.hxx>
+#include <IDocumentMarkAccess.hxx>
+
+namespace sw { namespace mark
+{
+    class MarkManager
+        : private ::boost::noncopyable
+        , virtual public IDocumentMarkAccess
+    {
+        public:
+            MarkManager(/*[in/out]*/ SwDoc& rDoc);
+
+            // IDocumentMarkAccess
+            virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const ::rtl::OUString& rName, IDocumentMarkAccess::MarkType eMark);
+            virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode, IDocumentMarkAccess::MarkType eMark);
+
+            virtual void repositionMark(::sw::mark::IMark* io_pMark, const SwPaM& rPaM);
+            virtual bool renameMark(::sw::mark::IMark* io_pMark, const ::rtl::OUString& rNewName);
+            virtual void correctMarksAbsolute(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const xub_StrLen nOffset);
+            virtual void correctMarksRelative(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const xub_StrLen nOffset);
+
+            virtual void deleteMarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, ::std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, const SwIndex* pSttIdx, const SwIndex* pEndIdx);
+
+            // deleters
+            virtual void deleteMark(const const_iterator_t ppMark);
+            virtual void deleteMark(const ::sw::mark::IMark* const pMark);
+            virtual void clearAllMarks();
+
+            // marks
+            virtual const_iterator_t getMarksBegin() const;
+            virtual const_iterator_t getMarksEnd() const;
+            virtual sal_Int32 getMarksCount() const;
+            virtual const_iterator_t findMark(const ::rtl::OUString& rName) const;
+
+            // bookmarks
+            virtual const_iterator_t getBookmarksBegin() const;
+            virtual const_iterator_t getBookmarksEnd() const;
+            virtual sal_Int32 getBookmarksCount() const;
+            virtual const_iterator_t findBookmark(const ::rtl::OUString& rName) const;
+
+            // Fieldmarks
+            virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& rPos) const;
+            virtual ::sw::mark::IFieldmark* getFieldmarkBefore(const SwPosition& rPos) const;
+            virtual ::sw::mark::IFieldmark* getFieldmarkAfter(const SwPosition& rPos) const;
+
+        private:
+            // make names
+            ::rtl::OUString getUniqueMarkName(const ::rtl::OUString& rName) const;
+            void sortMarks();
+
+            container_t m_vMarks;
+            container_t m_vBookmarks;
+            container_t m_vFieldmarks;
+            SwDoc * const m_pDoc;
+    };
+}}
+#endif
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
new file mode 100644
index 000000000000..e1344138babf
--- /dev/null
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -0,0 +1,224 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: $
+ * $Revision: $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BOOKMRK_HXX
+#define _BOOKMRK_HXX
+
+#include <IMark.hxx>
+#include <boost/scoped_ptr.hpp>
+#include <boost/noncopyable.hpp>
+
+struct SwPosition;  // fwd Decl. wg. UI
+class SwDoc;
+
+namespace sw { namespace mark
+{
+    class MarkBase
+        : virtual public IMark
+        , private ::boost::noncopyable
+    {
+        public:
+            //getters
+            virtual const SwPosition& GetMarkPos() const
+                { return *m_pPos1; }
+            virtual const ::rtl::OUString& GetName() const
+                { return m_aName; }
+            virtual bool IsCoveringPosition(const SwPosition& rPos) const
+                { return GetMarkStart() <= rPos && rPos <= GetMarkEnd(); };
+            virtual const SwPosition& GetOtherMarkPos() const
+            {
+                OSL_PRECOND(IsExpanded(), "<SwPosition::GetOtherMarkPos(..)> - I have no other Pos set." );
+                return *m_pPos2;
+            }
+            virtual const SwPosition& GetMarkStart() const
+            {
+                if(!m_pPos2 /* !IsExpanded()*/) return *m_pPos1;
+                return *m_pPos1 < *m_pPos2 ? *m_pPos1 : *m_pPos2;
+            }
+            virtual const SwPosition& GetMarkEnd() const
+            {
+                if(!m_pPos2 /* !IsExpanded()*/ ) return *m_pPos1;
+                return *m_pPos1 > *m_pPos2 ? *m_pPos1 : *m_pPos2;
+            }
+            virtual bool IsExpanded() const
+                { return m_pPos2; }
+
+            //setters
+            virtual void SetName(const ::rtl::OUString& rName)
+                { m_aName = rName; }
+            virtual void SetMarkPos(const SwPosition& rNewPos);
+            virtual void SetOtherMarkPos(const SwPosition& rNewPos);
+            virtual void ClearOtherMarkPos()
+                { m_pPos2.reset(); }
+
+            virtual void Swap()
+            {
+                if(m_pPos2)
+                    m_pPos1.swap(m_pPos2);
+            }
+
+            virtual void InitDoc(SwDoc* const)
+            {}
+
+            virtual ~MarkBase();
+        protected:
+            MarkBase(const SwPaM& rPaM,
+                const ::rtl::OUString& rName);
+            ::boost::scoped_ptr<SwPosition> m_pPos1;
+            ::boost::scoped_ptr<SwPosition> m_pPos2;
+            ::rtl::OUString m_aName;
+            static ::rtl::OUString GenerateNewName(const ::rtl::OUString& rPrefix);
+    };
+
+    class NavigatorReminder
+        : public MarkBase
+        , virtual public IMark
+    {
+        public:
+            NavigatorReminder(const SwPaM& rPaM);
+        private:
+            static const ::rtl::OUString our_sNamePrefix;
+    };
+
+    class UnoMark
+        : public MarkBase
+    {
+        public:
+            UnoMark(const SwPaM& rPaM);
+        private:
+            static const ::rtl::OUString our_sNamePrefix;
+    };
+
+    class DdeBookmark
+        : public MarkBase
+    {
+        public:
+            DdeBookmark(const SwPaM& rPaM);
+
+            //getters
+            const SwServerObject* GetRefObject() const
+                { return &m_aRefObj; }
+            SwServerObject* GetRefObject()
+                { return &m_aRefObj; }
+
+            bool IsServer() const
+                { return m_aRefObj.Is(); }
+
+            //setters
+            void SetRefObject( SwServerObject* pObj );
+
+            void DeregisterFromDoc(SwDoc* const pDoc);
+            virtual ~DdeBookmark();
+        private:
+            SwServerObjectRef m_aRefObj;
+            static const ::rtl::OUString our_sNamePrefix;
+    };
+
+    class Bookmark
+        : virtual public IBookmark
+        , public DdeBookmark
+    {
+        public:
+            Bookmark(const SwPaM& rPaM,
+                const KeyCode& rCode,
+                const ::rtl::OUString& rName,
+                const ::rtl::OUString& rShortName);
+            virtual void InitDoc(SwDoc* const io_Doc);
+
+            virtual const ::rtl::OUString& GetShortName() const
+                { return m_sShortName; }
+            virtual const KeyCode& GetKeyCode() const
+                { return m_aCode; }
+            virtual void SetShortName(const ::rtl::OUString& rShortName)
+                { m_sShortName = rShortName; }
+            virtual void SetKeyCode(const KeyCode& rCode)
+                { m_aCode = rCode; }
+        private:
+            KeyCode m_aCode;
+            ::rtl::OUString m_sShortName;
+    };
+
+    class Fieldmark
+        : virtual public IFieldmark
+        , public MarkBase
+    {
+        public:
+            Fieldmark(const SwPaM& rPaM);
+
+            // getters
+            ::rtl::OUString GetFieldname() const
+                { return m_aFieldname; }
+            ::rtl::OUString GetFieldHelptext() const
+                { return m_aFieldHelptext; }
+
+            // setters
+            void SetFieldname(const ::rtl::OUString& aFieldname)
+                { m_aFieldname = aFieldname; }
+            void SetFieldHelptext(const ::rtl::OUString& aFieldHelptext)
+                { m_aFieldHelptext = aFieldHelptext; }
+        private:
+            //int fftype; // Type: 0 = Text, 1 = Check Box, 2 = List
+            //bool ffprot;
+
+            ::rtl::OUString m_aFieldname;
+            ::rtl::OUString m_aFieldHelptext;
+            static const ::rtl::OUString our_sNamePrefix;
+
+    };
+
+    class TextFieldmark
+        : public Fieldmark
+    {
+        public:
+            TextFieldmark(const SwPaM& rPaM);
+            virtual void InitDoc(SwDoc* const io_pDoc);
+        private:
+            //int fftypetxt; // Type of text field: 0 = Regular text, 1 = Number, 2 = Date, 3 = Current date, 4 = Current time, 5 = Calculation
+            //int ffmaxlen; // Number of characters for text field. Zero means unlimited.
+    };
+
+    class CheckboxFieldmark
+        : virtual public ICheckboxFieldmark
+        , public Fieldmark
+    {
+        public:
+            CheckboxFieldmark(const SwPaM& rPaM);
+            virtual void InitDoc(SwDoc* const io_pDoc);
+            bool IsChecked() const;
+            void SetChecked(bool checked);
+        private:
+            bool m_isChecked;
+            //bool ffsize; // 0 = Auto, 1=Exact (see ffhps)
+            //bool ffrecalc;
+            //int ffhps; // Check box size (half-point sizes).
+    };
+
+}}
+#endif
diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx
new file mode 100644
index 000000000000..3712950fbb23
--- /dev/null
+++ b/sw/source/core/inc/crossrefbookmark.hxx
@@ -0,0 +1,104 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: crossrefbookmark.hxx,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _CROSSREFBOOKMRK_HXX
+#define _CROSSREFBOOKMRK_HXX
+
+#include <IMark.hxx>
+#include <bookmrk.hxx>
+#include <rtl/ustring.hxx>
+
+
+namespace sw { namespace mark
+{
+    class CrossRefBookmark
+        : public Bookmark
+    {
+        public:
+            CrossRefBookmark(const SwPaM& rPaM,
+                const KeyCode& rCode,
+                const ::rtl::OUString& rName,
+                const ::rtl::OUString& rShortName,
+                const ::rtl::OUString& rPrefix);
+
+            // getters
+            virtual const SwPosition& GetOtherMarkPos() const;
+            virtual const SwPosition& GetMarkStart() const
+                { return *m_pPos1; }
+            virtual const SwPosition& GetMarkEnd() const
+                { return *m_pPos1; }
+            virtual bool IsExpanded() const
+                { return false; }
+
+            // setters
+            virtual void SetMarkPos(const SwPosition& rNewPos);
+            virtual void SetOtherMarkPos(const SwPosition&)
+            {
+                OSL_PRECOND(false,
+                    "<CrossRefBookmark::SetOtherMarkPos(..)>"
+                    " - misusage of CrossRefBookmark: other bookmark position isn't allowed to be set." );
+            }
+            virtual void ClearOtherMarkPos()
+            {
+                OSL_PRECOND(false,
+                    "<SwCrossRefBookmark::ClearOtherMarkPos(..)>"
+                    " - misusage of CrossRefBookmark: other bookmark position isn't allowed to be set or cleared." );
+            }
+
+            static bool IsLegalName(const ::rtl::OUString& rName);
+    };
+
+    class CrossRefHeadingBookmark
+        : public CrossRefBookmark
+    {
+        public:
+            CrossRefHeadingBookmark(const SwPaM& rPaM,
+                const KeyCode& rCode,
+                const ::rtl::OUString& rName,
+                const ::rtl::OUString& rShortName);
+            static ::rtl::OUString GenerateNewName();
+            static bool IsLegalName(const ::rtl::OUString& rName);
+            static const ::rtl::OUString our_sNamePrefix;
+    };
+
+    class CrossRefNumItemBookmark
+        : public CrossRefBookmark
+    {
+        public:
+            CrossRefNumItemBookmark(const SwPaM& rPaM,
+                const KeyCode& rCode,
+                const ::rtl::OUString& rName,
+                const ::rtl::OUString& rShortName);
+            static ::rtl::OUString GenerateNewName();
+            static bool IsLegalName(const ::rtl::OUString& rName);
+            static const ::rtl::OUString our_sNamePrefix;
+    };
+
+}}
+#endif
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 8cfa17fd4ea7..0ef3b673d57c 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -36,11 +36,12 @@
 #include <vcl/keycod.hxx>
 #endif
 #include <svtools/svarray.hxx>
-#include <IDocumentBookmarkAccess.hxx>
+#include <IDocumentMarkAccess.hxx>
+#include <vector>
 
 class SvNumberFormatter;
 class SvULongs;
-class SwBookmark;
+class ::sw::mark::IMark;
 class SwDoc;
 class SwFmtAnchor;
 class SwFrmFmt;
@@ -51,42 +52,44 @@ class SwPaM;
 class SwNode;
 struct SwPosition;
 
-typedef USHORT SaveBookmarkType;
-namespace nsSaveBookmarkType
+namespace sw { namespace mark
 {
-    const SaveBookmarkType BKMK_POS_NONE = 0;
-    const SaveBookmarkType BKMK_POS = 1;
-    const SaveBookmarkType BKMK_POS_OTHER = 2;
-}
-
-class SaveBookmark
-{
-    String  aName, aShortName;
-    ULONG nNode1, nNode2;
-    xub_StrLen nCntnt1, nCntnt2;
-    KeyCode aCode;
-    SaveBookmarkType eBkmkType;
-    IDocumentBookmarkAccess::BookmarkType eOrigBkmType;
-
-public:
-    SaveBookmark( int, const SwBookmark&, const SwNodeIndex&,
-                                    const SwIndex* pIdx = 0 );
-    void SetInDoc( SwDoc* pDoc, const SwNodeIndex&, const SwIndex* pIdx = 0);
-    IDocumentBookmarkAccess::BookmarkType GetOriginalBkmType() const {return eOrigBkmType;}
-};
-
-SV_DECL_PTRARR_DEL( SaveBookmarks, SaveBookmark*, 0, 10 )
-
-void _DelBookmarks( const SwNodeIndex& rStt,
-                    const SwNodeIndex& rEnd,
-                    SaveBookmarks* pSaveBkmk = 0,
-                    const SwIndex* pSttIdx = 0,
-                    const SwIndex* pEndIdx = 0 );
-
+    class SaveBookmark
+    {
+        public:
+            SaveBookmark(bool bSavePos,
+                bool bSaveOtherPos,
+                const ::sw::mark::IMark& rBkmk,
+                const SwNodeIndex& rMvPos,
+                const SwIndex* pIdx =0);
+            void SetInDoc(SwDoc* pDoc,
+                const SwNodeIndex&,
+                const SwIndex* pIdx =0);
+            IDocumentMarkAccess::MarkType GetOriginalBkmType() const
+                { return m_eOrigBkmType; }
+
+        private:
+            ::rtl::OUString m_aName;
+            ::rtl::OUString m_aShortName;
+            KeyCode m_aCode;
+            bool m_bSavePos;
+            bool m_bSaveOtherPos;
+            IDocumentMarkAccess::MarkType m_eOrigBkmType;
+            ULONG m_nNode1;
+            ULONG m_nNode2;
+            xub_StrLen m_nCntnt1;
+            xub_StrLen m_nCntnt2;
+    };
+}}
 
 #define SAVEFLY 1
 #define SAVEFLY_SPLIT 2
 
+void _DelBookmarks(const SwNodeIndex& rStt,
+    const SwNodeIndex& rEnd,
+    ::std::vector< ::sw::mark::SaveBookmark> * SaveBkmk =0,
+    const SwIndex* pSttIdx =0,
+    const SwIndex* pEndIdx =0);
 void _SaveCntntIdx( SwDoc* pDoc, ULONG nNode, xub_StrLen nCntnt,
                     SvULongs& rSaveArr, BYTE nSaveFly = 0 );
 void _RestoreCntntIdx( SwDoc* pDoc, SvULongs& rSaveArr,