From 48ce6b5d8e954d94d3cbc849300a87cbc9c291a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Mon, 24 Nov 2003 16:10:12 +0000
Subject: [PATCH] INTEGRATION: CWS aw003 (1.4.116); FILE MERGED 2003/06/06
 13:05:34 aw 1.4.116.1: #109820# 2nd run of changes for ItemSet isolation

---
 sd/source/ui/dlg/morphdlg.cxx | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index 02de158ee597..725ea92a7e9f 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -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();