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

3 files changed, 292 insertions, 5 deletions

diff --git a/sw/qa/complex/writer/CheckBookmarks.java b/sw/qa/complex/writer/CheckBookmarks.java
new file mode 100644
index 000000000000..c8f4a0355428
--- /dev/null
+++ b/sw/qa/complex/writer/CheckBookmarks.java
@@ -0,0 +1,280 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+package complex.writer;
+
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.container.XNamed;
+import com.sun.star.container.XNameAccess;
+import com.sun.star.frame.XStorable;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.text.XBookmarksSupplier;
+import com.sun.star.text.XSimpleText;
+import com.sun.star.text.XText;
+import com.sun.star.text.XTextContent;
+import com.sun.star.text.XTextCursor;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.text.XTextRange;
+import com.sun.star.uno.UnoRuntime;
+import complexlib.ComplexTestCase;
+import java.math.BigInteger;
+
+class BookmarkHashes {
+    public String m_sName;
+    public BigInteger m_nSetupHash;
+    public BigInteger m_nInsertRandomHash;
+    public BigInteger m_nDeleteRandomHash;
+    public BigInteger m_nLinebreakHash;
+    public BigInteger m_nOdfReloadHash;
+    public BigInteger m_nMsWordReloadHash;
+
+    public BookmarkHashes(String sName) {
+        m_sName = sName;
+    }
+
+    public String checkExpectationString(BookmarkHashes aExpectation) {
+        StringBuffer buffer = new StringBuffer();
+        buffer.append("Comparing " + m_sName + " to expectations from " + aExpectation.m_sName + "\n");
+        buffer.append(compareHashString("after setup", m_nSetupHash, aExpectation.m_nSetupHash));
+        buffer.append(compareHashString("after insert random", m_nInsertRandomHash, aExpectation.m_nInsertRandomHash));
+        buffer.append(compareHashString("after delete random", m_nDeleteRandomHash, aExpectation.m_nDeleteRandomHash));
+        buffer.append(compareHashString("after line breaks", m_nLinebreakHash, aExpectation.m_nLinebreakHash));
+        buffer.append(compareHashString("after ODF roundtrip", m_nOdfReloadHash, aExpectation.m_nOdfReloadHash));
+        buffer.append(compareHashString("after MsWord roundtrip", m_nMsWordReloadHash, aExpectation.m_nMsWordReloadHash));
+        return buffer.toString();
+    };
+
+    public boolean meetsExpectation(BookmarkHashes aExpectation) {
+        return m_nSetupHash.equals(aExpectation.m_nSetupHash)
+            && m_nInsertRandomHash.equals(aExpectation.m_nInsertRandomHash)
+            && m_nDeleteRandomHash.equals(aExpectation.m_nDeleteRandomHash)
+            && m_nLinebreakHash.equals(aExpectation.m_nLinebreakHash)
+            && m_nOdfReloadHash.equals(aExpectation.m_nOdfReloadHash)
+            && m_nMsWordReloadHash.equals(aExpectation.m_nMsWordReloadHash);
+    }
+
+    private String compareHashString(String sCheckName, BigInteger nActual, BigInteger nExpectation) {
+        StringBuffer buffer = new StringBuffer(sCheckName);
+        buffer.append(": ");
+        if(nActual.equals(nExpectation))
+            buffer.append("good (" + nActual.toString(16) + ")");
+        else
+            buffer.append("bad (actual:" + nActual.toString(16) + ", expected: " + nExpectation.toString(16) + ")");
+        buffer.append("\n");
+        return buffer.toString();
+    }
+
+    static public java.math.BigInteger getBookmarksHash(XTextDocument xDoc)
+        throws com.sun.star.uno.Exception, java.security.NoSuchAlgorithmException
+    {
+        StringBuffer buffer = new StringBuffer("");
+        XBookmarksSupplier xBookmarksSupplier = (XBookmarksSupplier)UnoRuntime.queryInterface(
+            XBookmarksSupplier.class,
+            xDoc);
+        XNameAccess xBookmarks = xBookmarksSupplier.getBookmarks();
+        for(String sBookmarkname : xBookmarks.getElementNames()) {
+            Object xBookmark = xBookmarks.getByName(sBookmarkname);
+            XTextContent xBookmarkAsContent = (XTextContent)UnoRuntime.queryInterface(
+                XTextContent.class,
+                xBookmark);
+            buffer.append(sBookmarkname);
+            buffer.append(":");
+            buffer.append(xBookmarkAsContent.getAnchor().getString());
+            buffer.append(";");
+        }
+        java.security.MessageDigest sha1 = java.security.MessageDigest.getInstance("SHA-1");
+        sha1.reset();
+        sha1.update(buffer.toString().getBytes());
+        return new java.math.BigInteger(sha1.digest());
+    }
+}
+
+public class CheckBookmarks extends ComplexTestCase {
+    private XMultiServiceFactory m_xMsf = null;
+    private XTextDocument m_xDoc = null;
+    private XTextDocument m_xOdfReloadedDoc = null;
+    private XTextDocument m_xMsWordReloadedDoc = null;
+
+    public String[] getTestMethodNames() {
+        return new String[]{"checkBookmarks"};
+    }
+
+    private BookmarkHashes getDEV300m41Expectations() {
+        BookmarkHashes result = new BookmarkHashes("DEV300m41");
+        result.m_nSetupHash = new BigInteger("-4b0706744e8452fe1ae9d5e1c28cf70fb6194795",16);
+        result.m_nInsertRandomHash = new BigInteger("25aa0fad3f4881832dcdfe658ec2efa8a1a02bc5",16);
+        result.m_nDeleteRandomHash = new BigInteger("-3ec87e810b46d734677c351ad893bbbf9ea10f55",16);
+        result.m_nLinebreakHash = new BigInteger("3ae08c284ea0d6e738cb43c0a8105e718a633550",16);
+        result.m_nOdfReloadHash = new BigInteger("3ae08c284ea0d6e738cb43c0a8105e718a633550",16);
+        result.m_nMsWordReloadHash = new BigInteger("3ae08c284ea0d6e738cb43c0a8105e718a633550",16);
+        return result;
+    }
+
+    public void checkBookmarks()
+        throws com.sun.star.uno.Exception,
+            com.sun.star.io.IOException,
+            java.security.NoSuchAlgorithmException
+    {
+        try {
+            m_xMsf = (XMultiServiceFactory)param.getMSF();
+            m_xDoc = util.WriterTools.createTextDoc(m_xMsf);
+            BookmarkHashes actualHashes = new BookmarkHashes("actual");
+            BookmarkHashes expectedHashes = getDEV300m41Expectations();
+            setupBookmarks();
+            actualHashes.m_nSetupHash = BookmarkHashes.getBookmarksHash(m_xDoc);
+            insertRandomParts(200177);
+            actualHashes.m_nInsertRandomHash = BookmarkHashes.getBookmarksHash(m_xDoc);
+            deleteRandomParts(4711);
+            actualHashes.m_nDeleteRandomHash = BookmarkHashes.getBookmarksHash(m_xDoc);
+            insertLinebreaks(007);
+            actualHashes.m_nLinebreakHash = BookmarkHashes.getBookmarksHash(m_xDoc);
+            m_xOdfReloadedDoc = reloadFrom("StarOffice XML (Writer)", "odf");
+            actualHashes.m_nOdfReloadHash = BookmarkHashes.getBookmarksHash(m_xOdfReloadedDoc);
+            m_xMsWordReloadedDoc = reloadFrom("MS Word 97", "doc");
+            actualHashes.m_nMsWordReloadHash = BookmarkHashes.getBookmarksHash(m_xMsWordReloadedDoc);
+            log.println(actualHashes.checkExpectationString(expectedHashes));
+            if(!actualHashes.meetsExpectation(expectedHashes))
+                failed("CheckBookmark did not meet expectations (" + expectedHashes.m_sName + ").");
+        } finally {
+            // closing test document
+            if(m_xDoc != null)
+                util.DesktopTools.closeDoc(m_xDoc);
+            if(m_xOdfReloadedDoc!= null)
+                util.DesktopTools.closeDoc(m_xOdfReloadedDoc);
+            if(m_xMsWordReloadedDoc!= null)
+                util.DesktopTools.closeDoc(m_xMsWordReloadedDoc);
+        }
+    }
+
+    private void setupBookmarks()
+        throws com.sun.star.uno.Exception
+    {
+        XText xText = m_xDoc.getText();
+        XSimpleText xSimpleText = (XSimpleText)UnoRuntime.queryInterface(
+            XSimpleText.class,
+            xText);
+        for(int nPara=0; nPara<10; ++nPara) {
+            for(int nBookmark=0; nBookmark<100; ++nBookmark){
+                insertBookmark(
+                    xText.createTextCursor(),
+                    "P" + nPara + "word" + nBookmark,
+                    "P" + nPara + "word" + nBookmark);
+                XTextCursor xWordCrsr = xText.createTextCursor();
+                xWordCrsr.setString(" ");
+            }
+            XTextCursor xParaCrsr = xText.createTextCursor();
+            XTextRange xParaCrsrAsRange = (XTextRange)UnoRuntime.queryInterface(
+                XTextRange.class,
+                xParaCrsr);
+            xText.insertControlCharacter(xParaCrsrAsRange, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false);
+        }
+    }
+
+    private void insertRandomParts(long seed)
+        throws com.sun.star.uno.Exception
+    {
+        java.util.Random rnd = new java.util.Random(seed);
+        XTextCursor xCrsr = m_xDoc.getText().createTextCursor();
+        for(int i=0; i<600; i++) {
+            xCrsr.goRight((short)rnd.nextInt(100), false);
+            xCrsr.setString(Long.toString(rnd.nextLong()));
+        }
+    }
+
+    private void deleteRandomParts(long seed)
+        throws com.sun.star.uno.Exception
+    {
+        java.util.Random rnd = new java.util.Random(seed);
+        XTextCursor xCrsr = m_xDoc.getText().createTextCursor();
+        for(int i=0; i<600; i++) {
+            xCrsr.goRight((short)rnd.nextInt(100), false);
+            xCrsr.goRight((short)rnd.nextInt(20), true);
+            xCrsr.setString("");
+        }
+    }
+
+    private void insertLinebreaks(long seed)
+        throws com.sun.star.uno.Exception
+    {
+        XText xText = m_xDoc.getText();
+        java.util.Random rnd = new java.util.Random(seed);
+        XTextCursor xCrsr = m_xDoc.getText().createTextCursor();
+        for(int i=0; i<30; i++) {
+            xCrsr.goRight((short)rnd.nextInt(300), false);
+            XTextRange xCrsrAsRange = (XTextRange)UnoRuntime.queryInterface(
+                XTextRange.class,
+                xCrsr);
+            xText.insertControlCharacter(xCrsrAsRange, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false);
+        }
+    }
+
+    private void insertBookmark(XTextCursor crsr, String name, String content)
+        throws com.sun.star.uno.Exception
+    {
+        XMultiServiceFactory xDocFactory = (XMultiServiceFactory)UnoRuntime.queryInterface(
+            XMultiServiceFactory.class,
+            m_xDoc);
+
+        Object xBookmark = xDocFactory.createInstance("com.sun.star.text.Bookmark");
+        XTextContent xBookmarkAsTextContent = (XTextContent)UnoRuntime.queryInterface(
+            XTextContent.class,
+            xBookmark);
+        crsr.setString(content);
+        XNamed xBookmarkAsNamed = (XNamed)UnoRuntime.queryInterface(
+            XNamed.class,
+            xBookmark);
+        xBookmarkAsNamed.setName(name);
+        m_xDoc.getText().insertTextContent(crsr, xBookmarkAsTextContent, true);
+    }
+
+    private XTextDocument reloadFrom(String sFilter, String sExtension)
+        throws com.sun.star.io.IOException
+    {
+        String sFileUrl = util.utils.getOfficeTemp(m_xMsf) + "/Bookmarktest." + sExtension;
+        try {
+            PropertyValue[] aStoreProperties = new PropertyValue[2];
+            aStoreProperties[0] = new PropertyValue();
+            aStoreProperties[1] = new PropertyValue();
+            aStoreProperties[0].Name = "Override";
+            aStoreProperties[0].Value = true;
+            aStoreProperties[1].Name = "FilterName";
+            aStoreProperties[1].Value = sFilter;
+            XStorable xStorable = (XStorable)UnoRuntime.queryInterface(
+                XStorable.class,
+                m_xDoc);
+            xStorable.storeToURL(sFileUrl, aStoreProperties);
+            return util.WriterTools.loadTextDoc(m_xMsf, sFileUrl);
+        } finally {
+            if(util.utils.fileExists(m_xMsf, sFileUrl))
+                util.utils.deleteFile(m_xMsf, sFileUrl);
+        }
+    }
+}
diff --git a/sw/qa/complex/writer/CheckCrossReferences.java b/sw/qa/complex/writer/CheckCrossReferences.java
index f740155fa412..7b469c0a4afc 100644
--- a/sw/qa/complex/writer/CheckCrossReferences.java
+++ b/sw/qa/complex/writer/CheckCrossReferences.java
@@ -267,9 +267,12 @@ public class CheckCrossReferences extends ComplexTestCase {
                 try {
                     xParaTextRange = (com.sun.star.text.XTextRange)UnoRuntime.queryInterface(
                             com.sun.star.text.XTextRange.class, xParaEnum.nextElement());
-                    if ( xParaTextRange.getString().equals( "*i*J" ) ) {
+                    if ( xParaTextRange.getString().equals( "J" ) ) {
                         break;
                     }
+                    else {
+                        xParaTextRange = null;
+                    }
                 } catch (com.sun.star.container.NoSuchElementException e) {
                     System.out.println("Cannot find paragraph to insert cross-reference bookmark.");
                     e.printStackTrace();
diff --git a/sw/qa/complex/writer/makefile.mk b/sw/qa/complex/writer/makefile.mk
index 31466555f50b..88ceec08dcd7 100755
--- a/sw/qa/complex/writer/makefile.mk
+++ b/sw/qa/complex/writer/makefile.mk
@@ -41,8 +41,8 @@ PACKAGE = complex$/writer
 #----- compile .java files -----------------------------------------
 
 JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = CheckIndexedPropertyValues.java CheckNamedPropertyValues.java CheckCrossReferences.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+JAVAFILES       = CheckIndexedPropertyValues.java CheckNamedPropertyValues.java CheckCrossReferences.java CheckBookmarks.java
+JAVACLASSFILES  = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
 #----- make a jar from compiled files ------------------------------
 
@@ -50,7 +50,7 @@ MAXLINELENGTH = 100000
 
 JARCLASSDIRS    = $(PACKAGE)
 JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
+JARCOMPRESS     = TRUE
 
 # --- Parameters for the test --------------------------------------
 
@@ -81,9 +81,10 @@ ALL: ALLDEP
 .INCLUDE :  target.mk
 
 run: \
+    CheckBookmarks \
+    CheckCrossReferences \
     CheckIndexedPropertyValues \
     CheckNamedPropertyValues \
-    CheckCrossReferences
 
 RUN: run
 
@@ -97,3 +98,6 @@ CheckNamedPropertyValues:
 CheckCrossReferences:
     +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) -tdoc $(PWD)$/testdocuments $(CT_PACKAGE).CheckCrossReferences
 
+CheckBookmarks:
+    +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) -tdoc $(PWD)$/testdocuments $(CT_PACKAGE).CheckBookmarks
+