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)

5 files changed, 6 insertions, 384 deletions

diff --git a/sw/source/ui/inc/insrc.hxx b/sw/source/ui/inc/insrc.hxx
deleted file mode 100644
index 025a027923..0000000000
--- 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 387678dec8..0000000000
--- 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 133bcf70c3..0000000000
--- 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 49eda12dc9..0000000000
--- 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 9838061807..c6b6be2a11 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * 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
@@ -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();
     }
+    // <--
 }
 
 /*--------------------------------------------------------------------