diff options
author | Christian Lippka <cl@openoffice.org> | 2010-06-17 15:55:14 +0200 |
---|---|---|
committer | Christian Lippka <cl@openoffice.org> | 2010-06-17 15:55:14 +0200 |
commit | 482f6115f2c7ad0e4922902ad93b1bd37541f89c (patch) | |
tree | 851ade42b58e750db3ab2b115d00be91f1d4ef87 /sd | |
parent | 2230b3c83b46a425295d7a2f23e7fac7fec94add (diff) |
#i112439# correct presentation kind of 'collected' presentation shapes (table, media, graf and ole
Diffstat (limited to 'sd')
-rwxr-xr-x | sd/source/core/sdpage.cxx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 248a844a768d..c68b731f2000 100755 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2104,7 +2104,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR } } -SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj, PresObjKind eObjKind, bool bVertical, Rectangle aRect ) +SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj, PresObjKind& eObjKind, bool bVertical, Rectangle aRect ) { SdDrawDocument* pModel = static_cast< SdDrawDocument* >( rPage.GetModel() ); DBG_ASSERT( pModel, "sd::convertPresentationObjectImpl(), no model on page!" ); @@ -2219,6 +2219,16 @@ SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj, SdrObject::Free( pSourceObj ); } } + else if((eObjKind == PRESOBJ_OUTLINE) && (pSourceObj->GetObjIdentifier() != OBJ_OUTLINETEXT) ) + { + switch( pSourceObj->GetObjIdentifier() ) + { + case OBJ_TABLE: eObjKind = PRESOBJ_TABLE; break; + case OBJ_MEDIA: eObjKind = PRESOBJ_MEDIA; break; + case OBJ_GRAF: eObjKind = PRESOBJ_GRAPHIC; break; + case OBJ_OLE2: eObjKind = PRESOBJ_OBJECT; break; + } + } return pNewObj; } |