From 93cc975553090eb2706d57cae8df9359b4f20d6b Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Mon, 24 Nov 2003 16:12:37 +0000 Subject: INTEGRATION: CWS aw003 (1.7.124); FILE MERGED 2003/06/06 13:05:37 aw 1.7.124.1: #109820# 2nd run of changes for ItemSet isolation --- sd/source/ui/func/fuexpand.cxx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'sd/source/ui/func/fuexpand.cxx') diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index f146496e39f8..c1df947d7ee5 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fuexpand.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: ka $ $Date: 2002-07-26 08:32:42 $ + * last change: $Author: rt $ $Date: 2003-11-24 17:12:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -281,9 +281,7 @@ FuExpandPage::FuExpandPage(SdViewShell* pViewSh, SdWindow* pWin, SdView* pView, SfxItemSet aAttr(pDoc->GetPool()); aAttr.Put(XLineStyleItem(XLINE_NONE)); aAttr.Put(XFillStyleItem(XFILL_NONE)); - -//-/ pTextObj->NbcSetAttributes(aAttr, TRUE); - pTextObj->SetItemSet(aAttr); + pTextObj->SetMergedItemSet(aAttr); } } -- cgit