diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-11-24 16:12:23 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-11-24 16:12:23 +0000 |
| commit | c29a5f2394b334563476c1fa1f9dce126ca61337 (patch) | |
| tree | 4066c8924934f83d3c58db3a3364c3f7670389b4 /sd | |
| parent | ee54a02311aedccdaa854e3192f2700604db1247 (diff) | |
INTEGRATION: CWS aw003 (1.6.138); FILE MERGED
2003/06/06 13:05:36 aw 1.6.138.1: #109820#
2nd run of changes for ItemSet isolation
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fuconstr.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index 666dbb74523c..ccadeb5e262a 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fuconstr.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: aw $ $Date: 2001-08-09 10:53:47 $ + * last change: $Author: rt $ $Date: 2003-11-24 17:12:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -471,18 +471,14 @@ void FuConstruct::SetStyleSheet(SfxItemSet& rAttr, SdrObject* pObj) // Default-Attr. und Fuellung aus Vorlage zuweisen SfxItemSet aAttr(*pView->GetDefaultAttr().Clone()); aAttr.Put(pSheet->GetItemSet().Get(XATTR_FILLSTYLE)); - -//-/ pObj->NbcSetAttributes(aAttr, FALSE); - pObj->SetItemSet(aAttr); + pObj->SetMergedItemSet(aAttr); } else { // Default-Attr. und "Leere-Fuellung" zuweisen SfxItemSet aAttr(*pView->GetDefaultAttr().Clone()); rAttr.Put(XFillStyleItem(XFILL_NONE)); - -//-/ pObj->NbcSetAttributes(aAttr, FALSE); - pObj->SetItemSet(aAttr); + pObj->SetMergedItemSet(aAttr); } } } |