diff options
Diffstat (limited to 'svx/inc/svx/msdffimp.hxx')
| -rw-r--r-- | svx/inc/svx/msdffimp.hxx | 23 |
1 files changed, 15 insertions, 8 deletions
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. |