CWS-TOOLING: integrate CWS impress169

2009-05-13 17:37:21 +0200 sj  r271865 : #i100942# applied patch, removed oversafe buffer check (now without warnings on 64 bit platform)
2009-05-13 12:27:18 +0200 sj  r271855 : #i101769# fixed line/fill attributes for graphic objects
2009-05-12 10:25:17 +0200 cl  r271799 : report correct minimum cell hight for empty cells
2009-04-28 17:29:46 +0200 cl  r271334 : fixed merge error
2009-04-28 16:18:01 +0200 cl  r271330 : fixed build error
2009-04-28 12:38:09 +0200 cl  r271320 : #i100129# images for new layouts
2009-04-27 19:12:06 +0200 cl  r271302 : CWS-TOOLING: rebase CWS impress169 to trunk@270723 (milestone: DEV300:m46)
2009-04-20 19:13:28 +0200 sj  r271012 : #i100942# applied patch, removed oversafe buffer check
2009-04-09 18:00:01 +0200 sj  r270719 : #158488# added rectangular gradient support
2009-04-09 17:49:52 +0200 sj  r270718 : #158488# added rectangular gradient support
2009-04-09 17:46:24 +0200 sj  r270717 : #158488# added rectangular gradient support
2009-03-26 18:16:34 +0100 cl  r270098 : #i99867# applied patch from jlcheng to correctly register table design pane
2009-03-26 18:12:11 +0100 cl  r270097 : #i100220# leave some items default so they are not overridden if a new table style is set
2009-03-26 18:11:10 +0100 cl  r270096 : #i100220# clear only those items that are also in the style when assigning a new table layout
2009-03-26 15:56:24 +0100 cl  r270085 : #i99977# listen to outliner and dispose if outliner dies
2009-03-26 15:47:29 +0100 cl  r270084 : #i99977# made the Outliner a SfxBroadcaster so others can listen for its death
2009-03-24 19:10:05 +0100 sj  r269991 : #i100490# fixed text resize problem
2009-03-23 14:31:11 +0100 sj  r269872 : #i96083# added patch, (dubious && and ||)
2009-03-19 17:55:11 +0100 sj  r269764 : #i100275# applied patch, row height is now correct even for rows containing no text
2009-03-18 18:10:52 +0100 sj  r269701 : #i93616# solved performance problem when loading document
2009-03-18 16:20:40 +0100 sj  r269688 : removing unused code
2009-03-18 16:19:22 +0100 sj  r269687 : removing unused code
2009-03-18 16:17:54 +0100 sj  r269686 : removing unused code
2009-03-18 10:28:07 +0100 cl  r269643 : #i100029# let cells be disposed as soon as the table model is disposed
2009-03-17 15:56:50 +0100 cl  r269614 : #i99984# new impress photo layouts 3x2 and 2x2
2009-03-17 15:36:35 +0100 cl  r269611 : #i99984# adding new impress photo layouts 3x2 and 2x2
2009-03-16 18:43:48 +0100 cl  r269564 : #i55224# correct internal links if pages are changed
2009-03-16 16:40:38 +0100 cl  r269559 : #i55224# correct internal hyperlinks if slides are changed/renamed
2009-03-16 15:34:12 +0100 cl  r269553 : #i99427# invalidate slots after promote/demote
2009-03-13 18:18:20 +0100 sj  r269492 : #i92421# fixed loop if loading encrypted ppt file
2009-03-13 14:51:58 +0100 sj  r269481 : #i93002# fixed crash if saving presentation without master title placeholder
2009-03-13 12:26:21 +0100 sj  r269468 : #i100147# do not exceed the max point count if creating simple polygon via ::GetSimple
2009-03-12 17:00:45 +0100 sj  r269427 : #i82518# justifying rectangles for arc/pie and chord actions, fixed round rectangle problem

3 files changed, 24 insertions, 18 deletions

diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx
index 5aafb8c41c..4205b23393 100644
--- a/svx/inc/svx/msdffdef.hxx
+++ b/svx/inc/svx/msdffdef.hxx
@@ -1284,6 +1284,7 @@ class SVX_DLLPUBLIC DffPropSet : public Table
 
 class SfxItemSet;
 class SdrObject;
+struct DffObjData;
 
 class SVX_DLLPUBLIC DffPropertyReader : public DffPropSet
 {
@@ -1292,9 +1293,9 @@ class SVX_DLLPUBLIC DffPropertyReader : public DffPropSet
 
     void		ApplyCustomShapeTextAttributes( SfxItemSet& rSet ) const;
     void		ApplyCustomShapeAdjustmentAttributes( SfxItemSet& rSet ) const;
-    void		ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxItemSet& rSet, const MSO_SPT eShapeType, const sal_uInt32 nShapeFlags ) const;
+    void		ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxItemSet& rSet, const DffObjData& rObjData ) const;
     void		ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eShapeType ) const; // #i28269#
-    void		ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, const MSO_SPT eShapeType ) const;
+    void		ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, const DffObjData& rObjData ) const;
 
 public:
 
@@ -1311,7 +1312,8 @@ public:
 #endif
 
     void		SetDefaultPropSet( SvStream& rIn, UINT32 nOffDgg ) const;
-    void		ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, const MSO_SPT = mso_sptNil, const sal_uInt32 nShapeFlags = 0 ) const;
+    void		ApplyAttributes( SvStream& rIn, SfxItemSet& rSet ) const;
+    void		ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, const DffObjData& rObjData ) const;
 };
 
 #endif
diff --git a/svx/inc/svx/msdffimp.hxx b/svx/inc/svx/msdffimp.hxx
index 9168c2a08c..4feaead917 100644
--- a/svx/inc/svx/msdffimp.hxx
+++ b/svx/inc/svx/msdffimp.hxx
@@ -96,7 +96,6 @@ SV_DECL_PTRARR_SORT_VISIBILITY(SvxMSDffShapeTxBxSort,	SvxMSDffShapeOrder_Ptr,	16
 #define SVXMSDFF_SETTINGS_CROP_BITMAPS		1
 #define SVXMSDFF_SETTINGS_IMPORT_PPT		2
 #define SVXMSDFF_SETTINGS_IMPORT_EXCEL		4
-#define SVXMSDFF_SETTINGS_IMPORT_IAS		8
 
 #define SP_FGROUP		0x001	// This shape is a group shape
 #define SP_FCHILD		0x002	// Not a top-level shape
@@ -251,10 +250,10 @@ struct SvxMSDffImportData
 
 struct DffObjData
 {
-    Rectangle	aChildAnchor;
-
     const DffRecordHeader&	rSpHd;
-    Rectangle&				rBoundRect;
+
+    Rectangle	aBoundRect;
+    Rectangle	aChildAnchor;
 
     UINT32		nShapeId;
     UINT32		nSpFlags;
@@ -270,10 +269,18 @@ struct DffObjData
     int nCalledByGroup;
 
     DffObjData( const DffRecordHeader& rObjHd,
-                Rectangle&		rBdRect,
-                int 			nClByGroup ) :
+                const Rectangle& rBoundRect,
+                int 			 nClByGroup ) :
         rSpHd( rObjHd ),
-        rBoundRect(	rBdRect ),
+        aBoundRect(	rBoundRect ),
+        nShapeId( 0 ),
+        nSpFlags( 0 ),
+        eShapeType( mso_sptNil ),
+        bShapeType( FALSE ),
+        bClientAnchor( FALSE ),
+        bClientData( FALSE ),
+        bChildAnchor( FALSE ),
+        bOpt( FALSE ),
         bIsAutoText( FALSE ),
         nCalledByGroup(	nClByGroup ){}
 };
@@ -405,7 +412,7 @@ protected :
 
     FASTBOOL ReadGraphic( SvStream& rSt, ULONG nIndex, Graphic& rGraphic ) const;
     SdrObject* ImportFontWork( SvStream&, SfxItemSet&, Rectangle& rBoundRect ) const;
-    SdrObject* ImportGraphic( SvStream&, SfxItemSet&, Rectangle& rBoundRect, const DffObjData& ) const;
+    SdrObject* ImportGraphic( SvStream&, SfxItemSet&, const DffObjData& ) const;
     // --> OD 2004-12-14 #i32596# - pass <nCalledByGroup> to method
     // Needed in the Writer Microsoft Word import to avoid import of OLE objects
     // inside groups. Instead a graphic object is created.
diff --git a/svx/inc/svx/outliner.hxx b/svx/inc/svx/outliner.hxx
index 33818ccabc..23ed5266bf 100644
--- a/svx/inc/svx/outliner.hxx
+++ b/svx/inc/svx/outliner.hxx
@@ -33,22 +33,19 @@
 #include <tools/gen.hxx>
 #include <tools/string.hxx>
 #include <tools/debug.hxx>
-#ifndef _EDITDATA_HXX //autogen
+
+#include <svtools/brdcst.hxx>
+
 #include <svx/editdata.hxx>
-#endif
 #include <i18npool/lang.h>
-#ifndef _SV_COLOR_HXX //autogen
 #include <tools/color.hxx>
-#endif
 #include <vcl/graph.hxx>
 #include <tools/list.hxx>
 #include <tools/link.hxx>
 #include <rsc/rscsfx.hxx>
 #include "svx/svxdllapi.h"
 
-#ifndef _GRFMGR_HXX
 #include <goodies/grfmgr.hxx>
-#endif
 
 #include <tools/rtti.hxx>	// wegen typedef TypeId
 #include <vector>
@@ -585,7 +582,7 @@ struct EBulletInfo
 #define OUTLINERMODE_SUBTITLE		(0x0100|OUTLINERMODE_TEXTOBJECT)
 #define OUTLINERMODE_NOTE			(0x0200|OUTLINERMODE_TEXTOBJECT)
 
-class SVX_DLLPUBLIC Outliner
+class SVX_DLLPUBLIC Outliner : public SfxBroadcaster
 {
     friend class OutlinerView;
     friend class OutlinerEditEng;