Commit(HEAD): 6959

From: Robert Wilhelm <robert.wilhelm_at_gmx.net>
Date: Sat Sep 25 2004 - 17:46:15 CEST

small workaround for bookmark import problem in 6959.

The doc still crashes later during layout,
but not connected with bookmarks,
as it does also happen when I disable bookmark
import in ie_img_MsWord97.cpp.

Index: fp_Run.cpp
===================================================================
RCS file: /cvsroot/abi/src/text/fmt/xp/fp_Run.cpp,v
retrieving revision 1.405
diff -u -r1.405 fp_Run.cpp
--- fp_Run.cpp 25 Sep 2004 11:53:34 -0000 1.405
+++ fp_Run.cpp 25 Sep 2004 15:35:09 -0000
@@ -2455,7 +2455,7 @@
        : fp_Run(pBL, iOffsetFirst, iLen, FPRUN_BOOKMARK)
 {
        m_pBookmark = getBlock()->getBookmark(iOffsetFirst);
- UT_ASSERT(m_pBookmark);
+ UT_return_if_fail(m_pBookmark);
  
        _setDirty(true);
  
[robert@tau xp]$ cvs commit fp_Run.cpp
Checking in fp_Run.cpp;
/cvsroot/abi/src/text/fmt/xp/fp_Run.cpp,v <-- fp_Run.cpp
new revision: 1.406; previous revision: 1.405
done
Received on Sat Sep 25 17:45:48 2004

This archive was generated by hypermail 2.1.8 : Sat Sep 25 2004 - 17:45:51 CEST