strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS aw003 (1.4.116); FILE MERGED

Browse source 
2003/06/06 13:05:34 aw 1.4.116.1: #109820#
2nd run of changes for ItemSet isolation
This commit is contained in:
Rüdiger Timm 2003-11-24 16:10:12 +00:00
parent 4336dbb058
commit 48ce6b5d8e
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sd/source/ui/dlg/morphdlg.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: morphdlg.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: ka $ $Date: 2002-11-21 10:00:37 $
* last change: $Author: rt $ $Date: 2003-11-24 17:10:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -127,11 +127,8 @@ SdMorphDlg::SdMorphDlg( Window* pParent, const SdrObject* pObj1, const SdrObject
SfxItemSet aSet1( *pPool );
SfxItemSet aSet2( *pPool );
//-/ pObj1->TakeAttributes( aSet1, TRUE, FALSE );
aSet1.Put(pObj1->GetItemSet());
//-/ pObj2->TakeAttributes( aSet2, TRUE, FALSE );
aSet2.Put(pObj2->GetItemSet());
aSet1.Put(pObj1->GetMergedItemSet());
aSet2.Put(pObj2->GetMergedItemSet());
const XLineStyle eLineStyle1 = ( (const XLineStyleItem&) aSet1.Get( XATTR_LINESTYLE ) ).GetValue();
const XLineStyle eLineStyle2 = ( (const XLineStyleItem&) aSet2.Get( XATTR_LINESTYLE ) ).GetValue();