CWS-TOOLING: integrate CWS sw32bf02

2009-08-25 15:52:04 +0200 hde  r275366 : reactived testcases hit by issue 102752
2009-08-21 13:52:17 +0200 od  r275245 : #i102921# delete files whose deletion has been forgotten in cws impress172
2009-08-21 11:20:47 +0200 od  r275225 : CWS-TOOLING: rebase CWS sw32bf02 to trunk@275001 (milestone: DEV300:m55)
2009-08-20 16:21:30 +0200 od  r275191 : #i92511# method <lcl_MoveAllLowerObjs(..)>
- invalidation of cache for object rectangle inclusive spaces is needed.
2009-08-20 15:50:40 +0200 od  r275188 : #i96726# method <SwPagePreView::DocSzChgd(..)>
- trigger recalculation of page preview layout even if the count of pages is not changing
2009-08-20 12:37:32 +0200 od  r275172 : #i100466# correction for showing and hiding redlines
2009-08-18 13:25:18 +0200 od  r275100 : #i103817# method <XMLTextImportHelper::SetStyleAndAttrs(..)
- assure that a heading applies the outline style, if no other list style is applied.
2009-08-18 13:21:38 +0200 od  r275098 : #i103817# allow the outline style - list style for outline numbering - to be set directly at the paragraph
2009-08-17 14:13:02 +0200 od  r275052 : #i103684# add missing documentation for new optional OutlineLevel attribute introduced in OOo 3.1
2009-08-17 14:00:25 +0200 od  r275049 : #i100481# method <XMLTextFrameContext_Impl::CreateChildContext(..)>#
- correct condition for handling embedded documents and embedded math objects
2009-08-12 14:11:34 +0200 od  r274891 : #i97379# assure that columns are not applied to fly frames, which represent graphics or embedded objects
2009-08-12 12:51:43 +0200 od  r274889 : #i101870# method <SwTxtNode::_MakeNewTxtNode(..)>
- perform action on different paragraph styles before applying new paragraph style
2009-08-12 12:24:44 +0200 od  r274888 : #i101092# method <ViewShell::Paint(..)>
- encapsulate paint of document background and document into pre and post drawing layer paint calls
2009-08-12 11:38:48 +0200 od  r274886 : #i98766# minor adjustment in order to be warning free under Mac port builds
2009-08-12 11:33:54 +0200 od  r274885 : #i99267# method <SwTabFrm::MakeAll()>
- reset <bSplit> after forward move to assure that follows can be joined, if further space is available.
2009-08-12 11:11:49 +0200 od  r274882 : #i98766# method <ViewShell::SmoothScroll(..)
- disable smooth scroll for Mac port builds
2009-08-10 12:17:58 +0200 od  r274801 : CWS-TOOLING: rebase CWS sw32bf02 to trunk@274622 (milestone: DEV300:m54)
2009-07-21 16:56:45 +0200 od  r274206 : #i103685# method <SwTxtFormatter::NewTabPortion(..)>
- adjust condition to apply automatic tab stop at left margin correctly
in case that tab stops are not relative to indent
2009-07-10 11:53:53 +0200 od  r273883 : #i102752 method <SwDrawContact::Modify(..)>
- assure that a ShapePropertyChangeNotifier exists
2009-07-07 12:01:58 +0200 mst  r273788 : #i103304# apply patch by dtardon to fix bogus conditional
2009-07-07 09:01:13 +0200 od  r273767 : CWS-TOOLING: rebase CWS sw32bf02 to trunk@273468 (milestone: DEV300:m51)

19 files changed, 122 insertions, 425 deletions

diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx
index 55a0ca4082f1..9228e12d992c 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -85,9 +85,14 @@
     */
     virtual bool DelFullPara(SwPaM&) = 0;
 
-    /** komplett loeschen eines Bereiches
+    /** complete delete of a given PaM
+
+        OD 2009-08-20 #i100466#
+        Add optional parameter <bForceJoinNext>, default value <false>
+        Needed for hiding of deletion redlines
     */
-    virtual bool DeleteAndJoin(SwPaM&) = 0;
+    virtual bool DeleteAndJoin( SwPaM&,
+                                const bool bForceJoinNext = false ) = 0;
 
     /** verschieben eines Bereiches
     */
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index faa2d226b672..bd452fbaf15c 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -882,7 +882,12 @@ public:
     virtual void DeleteSection(SwNode* pNode);
     virtual bool Delete(SwPaM&);
     virtual bool DelFullPara(SwPaM&);
-    virtual bool DeleteAndJoin(SwPaM&);
+    // --> OD 2009-08-20 #i100466#
+    // Add optional parameter <bForceJoinNext>, default value <false>
+    // Needed for hiding of deletion redlines
+    virtual bool DeleteAndJoin( SwPaM&,
+                                const bool bForceJoinNext = false );
+    // <--
     virtual bool Move(SwPaM&, SwPosition&, SwMoveFlags);
     virtual bool Move(SwNodeRange&, SwNodeIndex&, SwMoveFlags);
     virtual bool MoveAndJoin(SwPaM&, SwPosition&, SwMoveFlags);
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 8db7bdfcb4e6..16ceedbeefc6 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -1219,20 +1219,11 @@ bool SwDoc::Move( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
         {
             if( pTNd->CanJoinNext())
             {
-                SwTxtNode *pNextTNd = 0;
-                if( !pTNd->Len() )
-                {
-                    SwNodeIndex aTmpIdx( *pTNd, 1 );
-                    pNextTNd = aTmpIdx.GetNode().GetTxtNode();
-                }
-                if( pNextTNd )
-                {
-                    if( !bNullCntnt )
-                        pSavePam->Move( fnMoveForward, fnGoCntnt );
-                    pNextTNd->JoinPrev();
-                }
-                else
-                    pTNd->JoinNext();
+                // --> OD 2009-08-20 #i100466#
+                // Always join next, because <pTNd> has to stay as it is.
+                // A join previous from its next would more or less delete <pTNd>
+                pTNd->JoinNext();
+                // <--
                 bRemove = false;
             }
         }
@@ -1602,12 +1593,26 @@ void lcl_JoinText( SwPaM& rPam, sal_Bool bJoinPrev )
             }
 
             pDoc->CorrRel( aIdx, *rPam.GetPoint(), 0, sal_True );
+            // --> OD 2009-08-20 #i100466#
+            // adjust given <rPam>, if it does not belong to the cursors
+            if ( pDelNd == rPam.GetBound( sal_True ).nContent.GetIdxReg() )
+            {
+                rPam.GetBound( sal_True ) = SwPosition( SwNodeIndex( *pTxtNd ), SwIndex( pTxtNd ) );
+            }
+            if( pDelNd == rPam.GetBound( sal_False ).nContent.GetIdxReg() )
+            {
+                rPam.GetBound( sal_False ) = SwPosition( SwNodeIndex( *pTxtNd ), SwIndex( pTxtNd ) );
+            }
+            // <--
             pTxtNd->JoinNext();
         }
     }
 }
 
-bool SwDoc::DeleteAndJoin( SwPaM & rPam )
+// OD 2009-08-20 #i100466#
+// Add handling of new optional parameter <bForceJoinNext>
+bool SwDoc::DeleteAndJoin( SwPaM & rPam,
+                           const bool bForceJoinNext )
 {
     if( lcl_StrLenOverFlow( rPam ) )
         return sal_False;
@@ -1656,7 +1661,12 @@ SetRedlineMode( eOld );
 
     sal_Bool bJoinTxt, bJoinPrev;
     lcl_GetJoinFlags( rPam, bJoinTxt, bJoinPrev );
-
+    // --> OD 2009-08-20 #i100466#
+    if ( bForceJoinNext )
+    {
+        bJoinPrev = sal_False;
+    }
+    // <--
     {
         // dann eine Kopie vom Cursor erzeugen um alle Pams aus den
         // anderen Sichten aus dem Loeschbereich zu verschieben
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 4720bcd6fef8..0d5fb13e7670 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1080,10 +1080,8 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
         // <--
     }
 
-    // --> OD 2006-01-13 #i60395#
-    // It's not allowed to apply the outline numbering rule as hard attribute
-    // to document content - typically paragraphs.
-    if ( bSetItem && pNew != GetOutlineNumRule() )
+    // --> OD 2009-08-18 #i103817#
+    if ( bSetItem )
     // <--
     {
         Insert( rPam, SwNumRuleItem( pNew->GetName() ), 0 );
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index a1dc2e7c7e9d..fe537adf82d8 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -3488,7 +3488,12 @@ void SwRedline::DelCopyOfSection()
         }
 
         if( pCSttNd && pCEndNd )
-            pDoc->DeleteAndJoin( aPam );
+        {
+            // --> OD 2009-08-20 #i100466#
+            // force a <join next> on <delete and join> operation
+            pDoc->DeleteAndJoin( aPam, true );
+            // <--
+        }
         else if( pCSttNd || pCEndNd )
         {
             if( pCSttNd && !pCEndNd )
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 99a984e8f2db..aa20281038da 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1653,7 +1653,12 @@ void SwDrawContact::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
                 {
                     ASSERT( maAnchoredDrawObj.DrawObj(), "SwDrawContact::Modify: no draw object here?" );
                     if ( maAnchoredDrawObj.DrawObj() )
-                        maAnchoredDrawObj.DrawObj()->getShapePropertyChangeNotifier().notifyPropertyChange( ::svx::eTextShapeAnchorType );
+                    {
+                        // --> OD 2009-07-10 #i102752#
+                        // assure that a ShapePropertyChangeNotifier exists
+                        maAnchoredDrawObj.DrawObj()->notifyShapePropertyChange( ::svx::eTextShapeAnchorType );
+                        // <--
+                    }
                 }
             }
         }
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index 291affe8e9f8..03df27c86c0c 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -213,6 +213,15 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
 {
     if ( rOld.GetNumCols() <= 1 && rNew.GetNumCols() <= 1 && !bChgFtn )
         return;
+    // --> OD 2009-08-12 #i97379#
+    // If current lower is a no text frame, then columns are not allowed
+    if ( Lower() && Lower()->IsNoTxtFrm() &&
+         rNew.GetNumCols() > 1 )
+    {
+        return;
+    }
+    // <--
+
     USHORT nNewNum, nOldNum = 1;
     if( Lower() && Lower()->IsColumnFrm() )
     {
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 808a5e4257e4..9ce3bc237db4 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -250,6 +250,18 @@ void SwFlyFrm::InsertCnt()
  // OD 2004-02-12 #110582#-2
  void SwFlyFrm::InsertColumns()
  {
+    // --> OD 2009-08-12 #i97379#
+    // Check, if column are allowed.
+    // Columns are not allowed for fly frames, which represent graphics or embedded objects.
+    const SwFmtCntnt& rCntnt = GetFmt()->GetCntnt();
+    ASSERT( rCntnt.GetCntntIdx(), "<SwFlyFrm::InsertColumns()> - no content prepared." );
+    SwNodeIndex aFirstCntnt( *(rCntnt.GetCntntIdx()), 1 );
+    if ( aFirstCntnt.GetNode().IsNoTxtNode() )
+    {
+        return;
+    }
+    // <--
+
     const SwFmtCol &rCol = GetFmt()->GetCol();
     if ( rCol.GetNumCols() > 1 )
     {
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 79d267c1f934..b73f8b4d1eeb 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -2062,6 +2062,10 @@ void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point& rOffset )
             pAnchoredDrawObj->DrawObj()->SetAnchorPos( aNewAnchorPos );
             pAnchoredDrawObj->SetLastObjRect( pAnchoredDrawObj->GetObjRect().SVRect() );
         }
+        // --> OD 2009-08-20 #i92511#
+        // cache for object rectangle inclusive spaces has to be invalidated.
+        pAnchoredObj->InvalidateObjRectWithSpaces();
+        // <--
     }
 }
 
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 0667add0e992..f2a507bbd764 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2103,6 +2103,11 @@ void SwTabFrm::MakeAll()
             {
                 bMovedFwd = TRUE;
                 bCalcLowers = TRUE;
+                // --> OD 2009-08-12 #i99267#
+                // reset <bSplit> after forward move to assure that follows
+                // can be joined, if further space is available.
+                bSplit = FALSE;
+                // <--
             }
 
         Point aOldPos( (Frm().*fnRect->fnGetPos)() );
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 7295acf3440a..f447e380aff9 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1040,7 +1040,7 @@ void SwTxtFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
                 _InvalidateRange( SwCharRange( nPos, nLen) );
                 MSHORT nTmp = ((SwUpdateAttr*)pNew)->nWhichAttr;
 
-                if( ! nTmp || RES_TXTATR_CHARFMT == nTmp || RES_TXTATR_AUTOFMT ||
+                if( ! nTmp || RES_TXTATR_CHARFMT == nTmp || RES_TXTATR_AUTOFMT == nTmp ||
                     RES_FMT_CHG == nTmp || RES_ATTRSET_CHG == nTmp )
                 {
                     SET_WRONG( nPos, nPos + nLen, false )
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 6bf343956749..8183d1c9b68b 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2271,17 +2271,6 @@ SwNumRule* SwTxtNode::_GetNumRule(BOOL bInParent) const
         if (sNumRuleName.Len() > 0)
         {
             pRet = GetDoc()->FindNumRulePtr( sNumRuleName );
-            // --> OD 2006-01-13 #i60395#
-            // It's not allowed to apply the outline numbering rule as hard
-            // attribute to a paragraph.
-            // Because currently not all situation are known, in which such
-            // a situation is triggered, it's asserted in order to find these.
-            ASSERT( !pRet || !HasSwAttrSet() ||
-                    pRet != GetDoc()->GetOutlineNumRule() ||
-                    SFX_ITEM_SET !=
-                      GetpSwAttrSet()->GetItemState( RES_PARATR_NUMRULE, FALSE ),
-                    "<SwTxtNode::_GetNumRule(..)> - found outline numbering rule as hard attribute at a paragraph. This isn't allowed. It's a serious defect, please inform OD" );
-            // <--
         }
         else // numbering is turned off
             bNoNumRule = true;
@@ -2556,8 +2545,8 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, BOOL bNext,
         return pNode;
 
     SwTxtFmtColl *pNextColl = &pColl->GetNextTxtFmtColl();
-    ChgFmtColl( pNextColl );
-
+    // --> OD 2009-08-12 #i101870#
+    // perform action on different paragraph styles before applying the new paragraph style
     if (pNextColl != pColl)
     {
         // --> OD 2007-07-10 #i75353#
@@ -2573,6 +2562,8 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, BOOL bNext,
         }
         // <--
     }
+    // <--
+    ChgFmtColl( pNextColl );
 
     return pNode;
 }
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 0d3b493af2f5..0db5039f6a31 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -585,9 +585,9 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
 
         if(pSwNum)
         {
+            SwDoc* pDoc = rPam.GetDoc();
             if(pSwNum->GetNumRule())
             {
-                SwDoc* pDoc = rPam.GetDoc();
                 SwNumRule aRule(*pSwNum->GetNumRule());
                 const String* pNewCharStyles =  pSwNum->GetNewCharStyleNames();
                 const String* pBulletFontNames = pSwNum->GetBulletFontNames();
@@ -680,7 +680,6 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
             }
             else if(pSwNum->GetCreatedNumRuleName().Len())
             {
-                SwDoc* pDoc = rPam.GetDoc();
                 UnoActionContext aAction(pDoc);
                 SwNumRule* pRule = pDoc->FindNumRulePtr( pSwNum->GetCreatedNumRuleName() );
                 if(!pRule)
@@ -690,6 +689,17 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
                 pDoc->SetNumRule( rPam, *pRule, false );
                 // <--
             }
+            // --> OD 2009-08-18 #i103817#
+            // outline numbering
+            else
+            {
+                UnoActionContext aAction(pDoc);
+                SwNumRule* pRule = pDoc->GetOutlineNumRule();
+                if(!pRule)
+                    throw RuntimeException();
+                pDoc->SetNumRule( rPam, *pRule, false );
+            }
+            // <--
         }
     }
     else if(rValue.getValueType() == ::getVoidCppuType())
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index e5f901b43f30..dddcd1152fd8 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1347,7 +1347,15 @@ BOOL ViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect )
     // #i75172# isolated static conditions
     const bool bOnlyYScroll(!lXDiff && Abs(lYDiff) != 0 && Abs(lYDiff) < lMax);
     const bool bAllowedWithChildWindows(GetWin()->GetWindowClipRegionPixel(WINDOW_GETCLIPREGION_NOCHILDREN|WINDOW_GETCLIPREGION_NULL).IsNull());
+// --> OD 2009-08-12 #i98766# - disable smooth scrolling for Mac port builds
+#ifdef QUARTZ
+    const bool bSmoothScrollAllowed(false);
+    (void) bOnlyYScroll;
+    (void) bAllowedWithChildWindows;
+#else
     const bool bSmoothScrollAllowed(bOnlyYScroll && bEnableSmooth && GetViewOptions()->IsSmoothScroll() &&  bAllowedWithChildWindows);
+#endif
+// <-
     const bool bIAmCursorShell(ISA(SwCrsrShell));
     (void) bIAmCursorShell;
 
@@ -1971,6 +1979,11 @@ void ViewShell::Paint(const Rectangle &rRect)
                 //angemeldet hat, so muessen Repaints ausgeloest werden.
                 if ( !CheckInvalidForPaint( aRect ) )
                 {
+                    // --> OD 2009-08-12 #i101192#
+                    // start Pre/PostPaint encapsulation to avoid screen blinking
+                    const Region aRepaintRegion(aRect.SVRect());
+                    DLPrePaint2(aRepaintRegion);
+                    // <--
                     PaintDesktop( aRect );
                     //Falls sinnvoll gleich das alte InvalidRect verarbeiten bzw.
                     //vernichten.
@@ -1979,6 +1992,10 @@ void ViewShell::Paint(const Rectangle &rRect)
                     ViewShell::bLstAct = TRUE;
                     GetLayout()->Paint( aRect );
                     ViewShell::bLstAct = FALSE;
+                    // --> OD 2009-08-12 #i101192#
+                    // end Pre/PostPaint encapsulation
+                    DLPostPaint2(true);
+                    // <--
                 }
 
                 //delete pSaveHdl;
@@ -2721,4 +2738,3 @@ const IDocumentOutlineNodes* ViewShell::getIDocumentOutlineNodesAccess() const
     return pDoc;
 }
 // <--
-
diff --git a/sw/source/ui/inc/insrc.hxx b/sw/source/ui/inc/insrc.hxx
deleted file mode 100644
index 85655f151bc5..000000000000
--- a/sw/source/ui/inc/insrc.hxx
+++ /dev/null
@@ -1,85 +0,0 @@
-/*************************************************************************
- *
- * 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: insrc.hxx,v $
- * $Revision: 1.4 $
- *
- * 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 _INSRC_HXX
-#define _INSRC_HXX
-
-#include <svx/stddlg.hxx>
-
-#ifndef _FIXED_HXX //autogen
-#include <vcl/fixed.hxx>
-#endif
-
-#ifndef _FIELD_HXX //autogen
-#include <vcl/field.hxx>
-#endif
-
-#ifndef _BUTTON_HXX //autogen
-#include <vcl/button.hxx>
-#endif
-
-#ifndef _GROUP_HXX //autogen
-#include <vcl/group.hxx>
-#endif
-#include <tools/string.hxx>
-
-#ifndef _BUTTON_HXX //autogen
-#include <vcl/button.hxx>
-#endif
-
-class SwView;
-class SwInsRowColDlg : public SvxStandardDialog
-{
-    FixedText       aCount;
-    NumericField    aCountEdit;
-    FixedLine        aInsFL;
-
-    RadioButton     aBeforeBtn;
-    RadioButton     aAfterBtn;
-    FixedLine        aPosFL;
-
-    String          aRow;
-    String          aCol;
-
-    OKButton        aOKBtn;
-    CancelButton    aCancelBtn;
-    HelpButton      aHelpBtn;
-
-    SwView&         rView;
-    BOOL            bColumn;
-
-protected:
-    virtual void Apply();
-
-public:
-    SwInsRowColDlg( SwView& rView, BOOL bCol );
-};
-
-#endif
-
diff --git a/sw/source/ui/table/insrc.cxx b/sw/source/ui/table/insrc.cxx
deleted file mode 100644
index 0589b1351538..000000000000
--- a/sw/source/ui/table/insrc.cxx
+++ /dev/null
@@ -1,94 +0,0 @@
-/*************************************************************************
- *
- * 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: insrc.cxx,v $
- * $Revision: 1.10 $
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sw.hxx"
-#ifdef SW_DLLIMPLEMENTATION
-#undef SW_DLLIMPLEMENTATION
-#endif
-
-
-#include <sfx2/dispatch.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-
-#include "cmdid.h"
-#include "swtypes.hxx"
-#include "insrc.hxx"
-#include "view.hxx"
-#include "table.hrc"
-#include "insrc.hrc"
-
-void SwInsRowColDlg::Apply()
-{
-    USHORT nSlot = bColumn ? FN_TABLE_INSERT_COL : FN_TABLE_INSERT_ROW;
-    SfxUInt16Item aCountItem( nSlot, static_cast< UINT16 >(aCountEdit.GetValue()) );
-    SfxBoolItem  aAfter( FN_PARAM_INSERT_AFTER, aAfterBtn.IsChecked() );
-    rView.GetViewFrame()->GetDispatcher()->Execute( nSlot,
-            SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD,
-            &aCountItem, &aAfter, 0L);
-}
-
-
-
-SwInsRowColDlg::SwInsRowColDlg(SwView& rVw, BOOL bCol )
-    : SvxStandardDialog( rVw.GetWindow(), SW_RES(DLG_INS_ROW_COL) ),
-    aCount( this, SW_RES( FT_COUNT ) ),
-    aCountEdit( this, SW_RES( ED_COUNT ) ),
-    aInsFL( this, SW_RES( FL_INS ) ),
-    aBeforeBtn( this, SW_RES( CB_POS_BEFORE ) ),
-    aAfterBtn( this, SW_RES( CB_POS_AFTER ) ),
-    aPosFL( this, SW_RES( FL_POS ) ),
-    aRow(SW_RES(STR_ROW)),
-    aCol(SW_RES(STR_COL)),
-    aOKBtn( this, SW_RES( BT_OK ) ),
-    aCancelBtn( this, SW_RES( BT_CANCEL ) ),
-    aHelpBtn( this, SW_RES( BT_HELP ) ),
-    rView(rVw),
-    bColumn( bCol )
-{
-    FreeResource();
-    String aTmp( GetText() );
-    if( bColumn )
-    {
-        aTmp += aCol;
-        SetHelpId( FN_TABLE_INSERT_COL_DLG );
-    }
-    else
-    {
-        aTmp += aRow;
-        SetHelpId( FN_TABLE_INSERT_ROW_DLG );
-    }
-    SetText( aTmp );
-}
-
-
-
-
diff --git a/sw/source/ui/table/insrc.hrc b/sw/source/ui/table/insrc.hrc
deleted file mode 100644
index e07c7cb2f1d5..000000000000
--- a/sw/source/ui/table/insrc.hrc
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************
- *
- * 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: insrc.hrc,v $
- * $Revision: 1.4 $
- *
- * 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.
- *
- ************************************************************************/
-#define FT_COUNT    1
-#define ED_COUNT    2
-#define FL_INS          3
-
-#define CB_POS_BEFORE   10
-#define CB_POS_AFTER    11
-#define FL_POS                  12
-
-#define STR_ROW         20
-#define STR_COL         21
-
-#define BT_OK       100
-#define BT_CANCEL   101
-#define BT_HELP     102
diff --git a/sw/source/ui/table/insrc.src b/sw/source/ui/table/insrc.src
deleted file mode 100644
index 3c8c0e1311ba..000000000000
--- a/sw/source/ui/table/insrc.src
+++ /dev/null
@@ -1,155 +0,0 @@
-/*************************************************************************
- *
- * 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: insrc.src,v $
- * $Revision: 1.32 $
- *
- * 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.
- *
- ************************************************************************/
-
-#include "table.hrc"
-#include "insrc.hrc"
-#include "helpid.h"
- // #define DLG_INS_ROW_COL 256
-ModalDialog DLG_INS_ROW_COL
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 136 , 84 ) ;
-    /* ### ACHTUNG: Neuer Text in Resource? Einf�gen : Einf�gen */
-    Text [ en-US ] = "Insert" ;
-    Moveable = TRUE ;
-    OKButton BT_OK
-    {
-        Pos = MAP_APPFONT ( 80 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BT_CANCEL
-    {
-        Pos = MAP_APPFONT ( 80 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BT_HELP
-    {
-        Pos = MAP_APPFONT ( 80 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    RadioButton CB_POS_BEFORE
-    {
-        Pos = MAP_APPFONT ( 12 , 49 ) ;
-        Size = MAP_APPFONT ( 56 , 10 ) ;
-        Text [ en-US ] = "~Before" ;
-        TabStop = TRUE ;
-    };
-    RadioButton CB_POS_AFTER
-    {
-        Pos = MAP_APPFONT ( 12 , 62 ) ;
-        Size = MAP_APPFONT ( 56 , 10 ) ;
-        Text [ en-US ] = "A~fter" ;
-        TabStop = TRUE ;
-        Check = TRUE ;
-    };
-    NumericField ED_COUNT
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 44 , 14 ) ;
-        Size = MAP_APPFONT ( 24 , 12 ) ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 1 ;
-        Maximum = 99 ;
-        Value = 1 ;
-        First = 1 ;
-        Last = 5 ;
-    };
-    FixedLine FL_INS
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 68 , 8 ) ;
-        Text [ en-US ] = "Insert" ;
-    };
-    FixedLine FL_POS
-    {
-        Pos = MAP_APPFONT ( 6 , 38 ) ;
-        Size = MAP_APPFONT ( 68 , 8 ) ;
-        Text [ en-US ] = "Position";
-    };
-    FixedText FT_COUNT
-    {
-        Pos = MAP_APPFONT ( 12 , 16 ) ;
-        Size = MAP_APPFONT ( 30 , 8 ) ;
-        Text [ en-US ] = "~Number" ;
-        Left = TRUE ;
-    };
-    String STR_ROW
-    {
-        Text [ en-US ] = " Rows" ;
-    };
-    String STR_COL
-    {
-        Text [ en-US ] = " Columns" ;
-    };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index 8fe6b9511f8f..bd1a00c2f120 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -2304,13 +2304,11 @@ void SwPagePreView::DocSzChgd( const Size &rSz )
 
     aDocSz = rSz;
 
-    // die neue Anzahl von Seiten bestimmen
-    USHORT nNewCnt = GetViewShell()->GetNumPages();
-    if( nNewCnt == mnPageCount )
-        return;
+    // --> OD 2009-08-20 #i96726#
+    // Due to the multiple page layout it is needed to trigger recalculation
+    // of the page preview layout, even if the count of pages is not changing.
+    mnPageCount = GetViewShell()->GetNumPages();
 
-    // dann eine neue Startseite berechnen
-    mnPageCount = nNewCnt;
     if( aVisArea.GetWidth() )
     {
         ChgPage( SwPagePreViewWin::MV_CALC, TRUE );
@@ -2318,6 +2316,7 @@ void SwPagePreView::DocSzChgd( const Size &rSz )
 
         aViewWin.Invalidate();
     }
+    // <--
 }
 
 /*--------------------------------------------------------------------