5 files changed, 532 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/CheckFlies.java b/sw/qa/complex/writer/CheckFlies.java
new file mode 100644
index 000000000000..a54b02a3b58b
--- /dev/null
+++ b/sw/qa/complex/writer/CheckFlies.java
@@ -0,0 +1,236 @@
+/*************************************************************************
+ *
+ * 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.container.XIndexAccess;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.uno.UnoRuntime;
+import complexlib.ComplexTestCase;
+import java.math.BigInteger;
+import java.util.Collection;
+import java.util.ArrayList;
+
+public class CheckFlies extends ComplexTestCase {
+    private XMultiServiceFactory m_xMsf = null;
+    private XTextDocument m_xDoc = null;
+
+    public String[] getTestMethodNames() {
+        return new String[]{"checkFlies"};
+    }
+
+    public void checkFlies()
+        throws com.sun.star.uno.Exception,
+            com.sun.star.io.IOException
+    {
+        try {
+            m_xMsf = (XMultiServiceFactory)param.getMSF();
+            m_xDoc = util.WriterTools.loadTextDoc(m_xMsf, util.utils.getFullTestURL("CheckFlies.odt"));
+            com.sun.star.text.XTextFramesSupplier xTFS = (com.sun.star.text.XTextFramesSupplier)UnoRuntime.queryInterface(
+                com.sun.star.text.XTextFramesSupplier.class,
+                m_xDoc);
+            checkTextFrames(xTFS);
+            com.sun.star.text.XTextGraphicObjectsSupplier xTGOS = (com.sun.star.text.XTextGraphicObjectsSupplier)UnoRuntime.queryInterface(
+                com.sun.star.text.XTextGraphicObjectsSupplier.class,
+                m_xDoc);
+            checkGraphicFrames(xTGOS);
+            com.sun.star.text.XTextEmbeddedObjectsSupplier xTEOS = (com.sun.star.text.XTextEmbeddedObjectsSupplier)UnoRuntime.queryInterface(
+                com.sun.star.text.XTextEmbeddedObjectsSupplier.class,
+                m_xDoc);
+            checkEmbeddedFrames(xTEOS);
+        } finally {
+            // closing test document
+            if(m_xDoc != null)
+                util.DesktopTools.closeDoc(m_xDoc);
+        }
+    }
+
+    private void checkEmbeddedFrames(com.sun.star.text.XTextEmbeddedObjectsSupplier xTGOS)
+        throws com.sun.star.lang.WrappedTargetException
+    {
+        Collection<String> vExpectedEmbeddedFrames = new ArrayList<String>();
+        vExpectedEmbeddedFrames.add("Object1");
+        int nEmbeddedFrames = vExpectedEmbeddedFrames.size();
+        com.sun.star.container.XNameAccess xEmbeddedFrames = xTGOS.getEmbeddedObjects();
+        for(String sFrameName : xEmbeddedFrames.getElementNames())
+        {
+            if(!vExpectedEmbeddedFrames.remove(sFrameName))
+                failed("Unexpected frame name");
+            try
+            {
+                xEmbeddedFrames.getByName(sFrameName);
+            }
+            catch(com.sun.star.container.NoSuchElementException e)
+            {
+                failed("Could not get embedded frame by name.");
+            }
+            if(!xEmbeddedFrames.hasByName(sFrameName))
+                failed("Could not find embedded frame by name.");
+        }
+        if(!vExpectedEmbeddedFrames.isEmpty())
+            failed("Missing expected embedded frames.");
+        try
+        {
+            xEmbeddedFrames.getByName("Nonexisting embedded frame");
+            failed("Got nonexisting embedded frame");
+        }
+        catch(com.sun.star.container.NoSuchElementException e)
+        {}
+        if(xEmbeddedFrames.hasByName("Nonexisting embedded frame"))
+            failed("Has nonexisting embedded frame");
+
+        com.sun.star.container.XIndexAccess xEmbeddedFramesIdx = (com.sun.star.container.XIndexAccess)UnoRuntime.queryInterface(
+            com.sun.star.container.XIndexAccess.class,
+            xEmbeddedFrames);
+        if(xEmbeddedFramesIdx.getCount() != nEmbeddedFrames)
+            failed("Unexpected number of embedded frames reported.");
+        for(int nCurrentFrameIdx = 0; nCurrentFrameIdx < xEmbeddedFramesIdx.getCount(); nCurrentFrameIdx++)
+        {
+            try
+            {
+                xEmbeddedFramesIdx.getByIndex(nCurrentFrameIdx);
+            }
+            catch(com.sun.star.lang.IndexOutOfBoundsException e)
+            {
+                failed("Could not get embedded frame by index.");
+            }
+        }
+    }
+
+    private void checkGraphicFrames(com.sun.star.text.XTextGraphicObjectsSupplier xTGOS)
+        throws com.sun.star.lang.WrappedTargetException
+    {
+        Collection<String> vExpectedGraphicFrames = new ArrayList<String>();
+        vExpectedGraphicFrames.add("graphics1");
+        int nGraphicFrames = vExpectedGraphicFrames.size();
+        com.sun.star.container.XNameAccess xGraphicFrames = xTGOS.getGraphicObjects();
+        for(String sFrameName : xGraphicFrames.getElementNames())
+        {
+            if(!vExpectedGraphicFrames.remove(sFrameName))
+                failed("Unexpected frame name");
+            try
+            {
+                xGraphicFrames.getByName(sFrameName);
+            }
+            catch(com.sun.star.container.NoSuchElementException e)
+            {
+                failed("Could not get graphics frame by name.");
+            }
+            if(!xGraphicFrames.hasByName(sFrameName))
+                failed("Could not find graphics frame by name.");
+        }
+        if(!vExpectedGraphicFrames.isEmpty())
+            failed("Missing expected graphics frames.");
+        try
+        {
+            xGraphicFrames.getByName("Nonexisting graphics frame");
+            failed("Got nonexisting graphics frame");
+        }
+        catch(com.sun.star.container.NoSuchElementException e)
+        {}
+        if(xGraphicFrames.hasByName("Nonexisting graphics frame"))
+            failed("Has nonexisting graphics frame");
+
+        com.sun.star.container.XIndexAccess xGraphicFramesIdx = (com.sun.star.container.XIndexAccess)UnoRuntime.queryInterface(
+            com.sun.star.container.XIndexAccess.class,
+            xGraphicFrames);
+        if(xGraphicFramesIdx.getCount() != nGraphicFrames)
+            failed("Unexpected number of graphics frames reported.");
+        for(int nCurrentFrameIdx = 0; nCurrentFrameIdx < xGraphicFramesIdx.getCount(); nCurrentFrameIdx++)
+        {
+            try
+            {
+                xGraphicFramesIdx.getByIndex(nCurrentFrameIdx);
+            }
+            catch(com.sun.star.lang.IndexOutOfBoundsException e)
+            {
+                failed("Could not get graphics frame by index.");
+            }
+        }
+    }
+
+    private void checkTextFrames(com.sun.star.text.XTextFramesSupplier xTFS)
+        throws com.sun.star.lang.WrappedTargetException
+    {
+        Collection<String> vExpectedTextFrames = new ArrayList<String>();
+        vExpectedTextFrames.add("Frame1");
+        vExpectedTextFrames.add("Frame2");
+
+        int nTextFrames = vExpectedTextFrames.size();
+        com.sun.star.container.XNameAccess xTextFrames = xTFS.getTextFrames();
+        for(String sFrameName : xTextFrames.getElementNames())
+        {
+            if(!vExpectedTextFrames.remove(sFrameName))
+                failed("Unexpected frame name");
+            try
+            {
+                xTextFrames.getByName(sFrameName);
+            }
+            catch(com.sun.star.container.NoSuchElementException e)
+            {
+                failed("Could not get text frame by name.");
+            }
+            if(!xTextFrames.hasByName(sFrameName))
+                failed("Could not find text frame by name.");
+        }
+        if(!vExpectedTextFrames.isEmpty())
+            failed("Missing expected text frames.");
+        try
+        {
+            xTextFrames.getByName("Nonexisting Textframe");
+            failed("Got nonexisting text frame.");
+        }
+        catch(com.sun.star.container.NoSuchElementException e)
+        {}
+        if(xTextFrames.hasByName("Nonexisting text frame"))
+            failed("Has nonexisting text frame.");
+
+        com.sun.star.container.XIndexAccess xTextFramesIdx = (com.sun.star.container.XIndexAccess)UnoRuntime.queryInterface(
+            com.sun.star.container.XIndexAccess.class,
+            xTextFrames);
+        if(xTextFramesIdx.getCount() != nTextFrames)
+            failed("Unexpected number of text frames reported.");
+        for(int nCurrentFrameIdx = 0; nCurrentFrameIdx < xTextFramesIdx.getCount(); nCurrentFrameIdx++)
+        {
+            try
+            {
+                xTextFramesIdx.getByIndex(nCurrentFrameIdx);
+            }
+            catch(com.sun.star.lang.IndexOutOfBoundsException e)
+            {
+                failed("Could not get text frame by index.");
+            }
+        }
+    }
+}
diff --git a/sw/qa/complex/writer/makefile.mk b/sw/qa/complex/writer/makefile.mk
index 31466555f50b..7bcc7fe934c9 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 CheckFlies.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,11 @@ ALL: ALLDEP
 .INCLUDE :  target.mk
 
 run: \
+    CheckBookmarks \
+    CheckCrossReferences \
     CheckIndexedPropertyValues \
     CheckNamedPropertyValues \
-    CheckCrossReferences
+    CheckFlies
 
 RUN: run
 
@@ -97,3 +99,9 @@ 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
+
+CheckFlies:
+    +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) -tdoc $(PWD)$/testdocuments $(CT_PACKAGE).CheckFlies
+
diff --git a/sw/qa/complex/writer/testdocuments/CheckFlies.odt b/sw/qa/complex/writer/testdocuments/CheckFlies.odt
new file mode 100644
index 000000000000..8f42989b3a0d
--- /dev/null
+++ b/sw/qa/complex/writer/testdocuments/CheckFlies.odt