|
Lines 3721-3727
Link Here
|
| 3721 |
} |
3721 |
} |
| 3722 |
|
3722 |
|
| 3723 |
// Textrahmen, auch Title oder Outline |
3723 |
// Textrahmen, auch Title oder Outline |
| 3724 |
SdrObject* pOrgObj = pObj; |
|
|
| 3725 |
SdrRectObj* pTextObj = 0; |
3724 |
SdrRectObj* pTextObj = 0; |
| 3726 |
UINT32 nTextId = GetPropertyValue( DFF_Prop_lTxid, 0 ); |
3725 |
UINT32 nTextId = GetPropertyValue( DFF_Prop_lTxid, 0 ); |
| 3727 |
if( nTextId ) |
3726 |
if( nTextId ) |
|
Lines 3752-3758
Link Here
|
| 3752 |
if (bTextFrame) |
3751 |
if (bTextFrame) |
| 3753 |
{ |
3752 |
{ |
| 3754 |
delete pObj; |
3753 |
delete pObj; |
| 3755 |
pObj = pOrgObj = 0; |
3754 |
pObj = 0; |
| 3756 |
} |
3755 |
} |
| 3757 |
pTextObj = new SdrRectObj(OBJ_TEXT, rTextRect); |
3756 |
pTextObj = new SdrRectObj(OBJ_TEXT, rTextRect); |
| 3758 |
pTextImpRec = new SvxMSDffImportRec(*pImpRec); |
3757 |
pTextImpRec = new SvxMSDffImportRec(*pImpRec); |
|
Lines 3946-3952
Link Here
|
| 3946 |
SdrObject* pGroup = new SdrObjGroup; |
3945 |
SdrObject* pGroup = new SdrObjGroup; |
| 3947 |
pGroup->GetSubList()->NbcInsertObject( pObj ); |
3946 |
pGroup->GetSubList()->NbcInsertObject( pObj ); |
| 3948 |
pGroup->GetSubList()->NbcInsertObject( pTextObj ); |
3947 |
pGroup->GetSubList()->NbcInsertObject( pTextObj ); |
| 3949 |
pOrgObj = pObj; |
|
|
| 3950 |
pObj = pGroup; |
3948 |
pObj = pGroup; |
| 3951 |
} |
3949 |
} |
| 3952 |
} |
3950 |
} |
|
Lines 3957-3963
Link Here
|
| 3957 |
// this is OK for Draw but not for Calc and Writer |
3955 |
// this is OK for Draw but not for Calc and Writer |
| 3958 |
// cause here these objects have a default border |
3956 |
// cause here these objects have a default border |
| 3959 |
pObj = new SdrRectObj(rTextRect); |
3957 |
pObj = new SdrRectObj(rTextRect); |
| 3960 |
pOrgObj = pObj; |
|
|
| 3961 |
pObj->SetModel( pSdrModel ); |
3958 |
pObj->SetModel( pSdrModel ); |
| 3962 |
SfxItemSet aSet( pSdrModel->GetItemPool() ); |
3959 |
SfxItemSet aSet( pSdrModel->GetItemPool() ); |
| 3963 |
ApplyAttributes( rSt, aSet, pObj ); |
3960 |
ApplyAttributes( rSt, aSet, pObj ); |
|
Lines 4016-4028
Link Here
|
| 4016 |
if( pImpRec->nShapeId ) |
4013 |
if( pImpRec->nShapeId ) |
| 4017 |
{ |
4014 |
{ |
| 4018 |
// Import-Record-Liste ergaenzen |
4015 |
// Import-Record-Liste ergaenzen |
| 4019 |
if( pOrgObj ) |
4016 |
if( pObj ) |
| 4020 |
{ |
4017 |
{ |
| 4021 |
pImpRec->pObj = pOrgObj; |
4018 |
pImpRec->pObj = pObj; |
| 4022 |
rImportData.aRecords.Insert( pImpRec ); |
4019 |
rImportData.aRecords.Insert( pImpRec ); |
| 4023 |
} |
4020 |
} |
| 4024 |
|
4021 |
|
| 4025 |
if( pTextObj && (pOrgObj != pTextObj) ) |
4022 |
if( pTextObj && (pObj != pTextObj) ) |
| 4026 |
{ |
4023 |
{ |
| 4027 |
// Modify ShapeId (must be unique) |
4024 |
// Modify ShapeId (must be unique) |
| 4028 |
pImpRec->nShapeId |= 0x8000000; |
4025 |
pImpRec->nShapeId |= 0x8000000; |