[ooo-build-commit] Branch 'ooo/master' - sw/inc sw/source

[Jan Holesovsky]

 sw/inc/rolbck.hxx              |    3 +--
 sw/source/core/undo/rolbck.cxx |   15 +++------------
 2 files changed, 4 insertions(+), 14 deletions(-)

New commits:
commit fdb4f3c2e6e3191324ad031f073175db440d1e5e
Author: Release Engineers <releng at openoffice.org>
Date:   Fri Jul 10 09:34:54 2009 +0000

    #i103441# fix the crash by removing the constructor with buggy ASSERT

diff --git a/sw/inc/rolbck.hxx b/sw/inc/rolbck.hxx
index fabe234..6dd6a90 100644
--- a/sw/inc/rolbck.hxx
+++ b/sw/inc/rolbck.hxx
@@ -263,8 +263,7 @@ class SwHistoryTxtFlyCnt : public SwHistoryHint
     ::std::auto_ptr<SwUndoDelLayFmt> m_pUndo;
 
 public:
-    SwHistoryTxtFlyCnt( SwTxtFlyCnt* pTxtFly ); // for character-bound
-    SwHistoryTxtFlyCnt( SwFlyFrmFmt* pFlyFmt ); // for paragraph-bound
+    SwHistoryTxtFlyCnt( SwFrmFmt* const pFlyFmt );
     virtual ~SwHistoryTxtFlyCnt();
     virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
     SwUndoDelLayFmt* GetUDelLFmt() { return m_pUndo.get(); }
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 6bcf617..a6b7d35 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -566,17 +566,7 @@ void SwHistoryChangeFmtColl::SetInDoc( SwDoc* pDoc, bool )
 }
 
 
-SwHistoryTxtFlyCnt::SwHistoryTxtFlyCnt( SwTxtFlyCnt* pTxtFly )
-    : SwHistoryHint( HSTRY_FLYCNT )
-    , m_pUndo( new SwUndoDelLayFmt( pTxtFly->GetFlyCnt().GetFrmFmt() ) )
-{
-    ASSERT( pTxtFly->GetFlyCnt().GetFrmFmt(),
-            "SwHistoryTxtFlyCnt: FlyCntnt without Format" );
-    m_pUndo->ChgShowSel( FALSE );
-}
-
-
-SwHistoryTxtFlyCnt::SwHistoryTxtFlyCnt( SwFlyFrmFmt* pFlyFmt )
+SwHistoryTxtFlyCnt::SwHistoryTxtFlyCnt( SwFrmFmt* const pFlyFmt )
     : SwHistoryHint( HSTRY_FLYCNT )
     , m_pUndo( new SwUndoDelLayFmt( pFlyFmt ) )
 {
@@ -1065,7 +1055,8 @@ void SwHistory::Add( SwTxtAttr* pHint, ULONG nNodeIdx, bool bNewAttr )
                             static_cast<SwTxtFtn*>(pHint), nNodeIdx );
                 break;
             case RES_TXTATR_FLYCNT:
-                pHt = new SwHistoryTxtFlyCnt( static_cast<SwTxtFlyCnt*>(pHint) );
+                pHt = new SwHistoryTxtFlyCnt( static_cast<SwTxtFlyCnt*>(pHint)
+                            ->GetFlyCnt().GetFrmFmt() );
                 break;
             case RES_TXTATR_FIELD:
                 pHt = new SwHistorySetTxtFld(