diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-11-24 16:13:03 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-11-24 16:13:03 +0000 |
| commit | bef3289839b8a1be2207d799b41e3548cb79e88c (patch) | |
| tree | fa90dc9db5933d5fe490bb07d4d12f984d7d3221 /sd/source/ui/func/fupage.cxx | |
| parent | dea94f71b6bd769cf4708d8ecbc8cdfca449adcf (diff) | |
INTEGRATION: CWS aw003 (1.14.26); FILE MERGED
2003/07/24 14:07:12 aw 1.14.26.2: #110094#
Adaptions for DrawingLayer changes
2003/06/06 13:05:37 aw 1.14.26.1: #109820#
2nd run of changes for ItemSet isolation
Diffstat (limited to 'sd/source/ui/func/fupage.cxx')
| -rw-r--r-- | sd/source/ui/func/fupage.cxx | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index dfd20ed7e2ae..431450b992fd 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fupage.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: hr $ $Date: 2003-03-27 10:57:50 $ + * last change: $Author: rt $ $Date: 2003-11-24 17:13:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -341,8 +341,7 @@ FuPage::FuPage( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView, SdrObject* pObj = pPage->GetBackgroundObj(); if( pObj ) { - //-/ pObj->TakeAttributes( aMergedAttr, TRUE, TRUE ); - aMergedAttr.Put(pObj->GetItemSet()); + aMergedAttr.Put(pObj->GetMergedItemSet()); } else { @@ -412,6 +411,10 @@ FuPage::FuPage( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView, { pBackgroundObjUndoAction = new SdBackgroundObjUndoAction( *pDoc, *pPage, pPage->GetBackgroundObj() ); pPage->SetBackgroundObj( NULL ); + + // #110094#-15 + // tell the page that it's visualization has changed + pPage->ActionChanged(); } } @@ -445,8 +448,7 @@ FuPage::FuPage( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView, { // BackgroundObj: no hard attributes allowed SfxItemSet aSet( pDoc->GetPool() ); - //-/ pObj->NbcSetAttributes( aSet, TRUE ); - pObj->SetItemSet(aSet); + pObj->SetMergedItemSet(aSet); } } @@ -600,7 +602,11 @@ FuPage::FuPage( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView, aSize.Height() -= nUpper + nLower - 1; Rectangle aRect( aPos, aSize ); pObj->SetLogicRect( aRect ); - pObj->SetItemSet(*pArgs); + pObj->SetMergedItemSet(*pArgs); + + // #110094#-15 + // tell the page that it's visualization has changed + pPage->ActionChanged(); } } |