diff options
26 files changed, 300 insertions, 141 deletions
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 58c87905d42b..8966860bc97b 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdpage.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dl $ $Date: 2000-09-22 08:16:57 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:39:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -421,7 +421,8 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, const Rectangle& rRect, aTempAttr.Put(aAutoGrowHeight); } - pSdrObj->NbcSetAttributes(aTempAttr, FALSE); +//-/ pSdrObj->NbcSetAttributes(aTempAttr, FALSE); + pSdrObj->SetItemSet(aTempAttr); } if ( aString.Len() && pSdrObj->ISA(SdrTextObj) ) @@ -490,7 +491,9 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, const Rectangle& rRect, SfxItemSet aSet( ((SdDrawDocument*) pModel)->GetPool() ); aSet.Put( SdrTextContourFrameItem( TRUE ) ); aSet.Put( SvxAdjustItem( SVX_ADJUST_CENTER ) ); - pSdrObj->NbcSetAttributes( aSet, FALSE ); + +//-/ pSdrObj->NbcSetAttributes( aSet, FALSE ); + pSdrObj->SetItemSet(aSet); } if (bInsert) @@ -2057,12 +2060,17 @@ void __EXPORT SdPage::ScaleObjects(const Size& rNewPageSize, ******************************************************/ pObj->GetOutlinerParaObject()->RemoveCharAttribs( EE_CHAR_FONTHEIGHT ); SfxItemSet aSet( ((SdDrawDocument*) pModel)->GetPool(), EE_CHAR_FONTHEIGHT, EE_CHAR_FONTHEIGHT ); - pObj->TakeAttributes(aSet, TRUE, FALSE); + +//-/ pObj->TakeAttributes(aSet, TRUE, FALSE); + aSet.Put(pObj->GetItemSet()); + const SvxFontHeightItem& rOldHgt = (SvxFontHeightItem&) aSet.Get(EE_CHAR_FONTHEIGHT); ULONG nFontHeight = rOldHgt.GetHeight(); nFontHeight = long(nFontHeight * (double) aFractY); aSet.Put(SvxFontHeightItem(nFontHeight)); - pObj->NbcSetAttributes(aSet, FALSE); + +//-/ pObj->NbcSetAttributes(aSet, FALSE); + pObj->SetItemSet(aSet); } } } @@ -2168,14 +2176,19 @@ BOOL __EXPORT SdPage::InsertPresObj(SdrObject* pObj, PresObjKind eObjKind, aTempAttr.Put( aMinHeight ); SdrTextAutoGrowHeightItem aAutoGrowHeight(FALSE); aTempAttr.Put(aAutoGrowHeight); - pObj->NbcSetAttributes(aTempAttr, FALSE); + +//-/ pObj->NbcSetAttributes(aTempAttr, FALSE); + pObj->SetItemSet(aTempAttr); + pObj->SetLogicRect(aRect); // AutoGrowHeight einschalten SfxItemSet aAttr( ((SdDrawDocument*) pModel)->GetPool() ); SdrTextAutoGrowHeightItem aAutoGrowHeightOn(TRUE); aAttr.Put(aAutoGrowHeightOn); - pObj->NbcSetAttributes(aAttr, FALSE); + +//-/ pObj->NbcSetAttributes(aAttr, FALSE); + pObj->SetItemSet(aAttr); } } @@ -2234,9 +2247,14 @@ BOOL __EXPORT SdPage::InsertPresObj(SdrObject* pObj, PresObjKind eObjKind, // LRSpace-Item loeschen SfxItemSet aSet(((SdDrawDocument*) pModel)->GetPool(), EE_PARA_LRSPACE, EE_PARA_LRSPACE ); - pObj->TakeAttributes(aSet, TRUE, FALSE); + +//-/ pObj->TakeAttributes(aSet, TRUE, FALSE); + aSet.Put(pObj->GetItemSet()); + aSet.ClearItem(EE_PARA_LRSPACE); - pObj->NbcSetAttributes(aSet, FALSE); + +//-/ pObj->NbcSetAttributes(aSet, FALSE); + pObj->SetItemSet(aSet); // Untertitel loeschen aPresObjList.Remove(pSubtitle); @@ -2274,12 +2292,17 @@ BOOL __EXPORT SdPage::InsertPresObj(SdrObject* pObj, PresObjKind eObjKind, // Linken Einzug zuruecksetzen SfxItemSet aSet(((SdDrawDocument*) pModel)->GetPool(), EE_PARA_LRSPACE, EE_PARA_LRSPACE ); - pObj->TakeAttributes(aSet, TRUE, FALSE); + +//-/ pObj->TakeAttributes(aSet, TRUE, FALSE); + aSet.Put(pObj->GetItemSet()); + const SvxLRSpaceItem& rLRItem = (const SvxLRSpaceItem&) aSet.Get(EE_PARA_LRSPACE); SvxLRSpaceItem aNewLRItem(rLRItem); aNewLRItem.SetTxtLeft(0); aSet.Put(aNewLRItem); - pObj->NbcSetAttributes(aSet, FALSE); + +//-/ pObj->NbcSetAttributes(aSet, FALSE); + pObj->SetItemSet(aSet); SfxStyleSheet* pSheet = GetStyleSheetForPresObj(PRESOBJ_TEXT); diff --git a/sd/source/filter/pptin.cxx b/sd/source/filter/pptin.cxx index 4a5da27b819e..4d43ff415b5e 100644 --- a/sd/source/filter/pptin.cxx +++ b/sd/source/filter/pptin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pptin.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: sj $ $Date: 2000-10-24 11:50:47 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:40:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -723,21 +723,31 @@ BOOL SdPPTImport::Import() // Schatten am ersten Objekt (Hintergrundobjekt) entfernen (#57918#) SfxItemSet aTempAttr(pDoc->GetPool()); - pObj->TakeAttributes(aTempAttr, FALSE, TRUE); + +//-/ pObj->TakeAttributes(aTempAttr, FALSE, TRUE); + aTempAttr.Put(pObj->GetItemSet()); + BOOL bShadowIsOn = ( (SdrShadowItem&)( aTempAttr.Get( SDRATTR_SHADOW ) ) ).GetValue(); if( bShadowIsOn ) { aTempAttr.Put(SdrShadowItem( FALSE ) ); - pObj->NbcSetAttributes( aTempAttr, FALSE ); + +//-/ pObj->NbcSetAttributes( aTempAttr, FALSE ); + pObj->SetItemSet(aTempAttr); } SfxStyleSheet* pSheet = pMPage->GetStyleSheetForPresObj( PRESOBJ_BACKGROUND ); if ( pSheet ) { // StyleSheet fuellen und dem Objekt zuweisen pSheet->GetItemSet().ClearItem(); - pObj->TakeAttributes( pSheet->GetItemSet(), TRUE, FALSE ); + +//-/ pObj->TakeAttributes( pSheet->GetItemSet(), TRUE, FALSE ); + pSheet->GetItemSet().Put(pObj->GetItemSet()); + pObj->SetStyleSheet( pSheet, TRUE ); SfxItemSet aSet( pDoc->GetPool() ); - pObj->NbcSetAttributes( aSet, TRUE ); + +//-/ pObj->NbcSetAttributes( aSet, TRUE ); + pObj->SetItemSet(aSet); } pMPage->GetPresObjList()->Insert( pObj, LIST_APPEND ); } @@ -2203,7 +2213,9 @@ SdrObject* SdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj, Sd aTempAttr.Put( aMinHeight ); SdrTextAutoGrowHeightItem aAutoGrowHeight( FALSE ); aTempAttr.Put( aAutoGrowHeight ); - pText->NbcSetAttributes( aTempAttr, FALSE ); + +//-/ pText->NbcSetAttributes( aTempAttr, FALSE ); + pText->SetItemSet(aTempAttr); } else { @@ -2289,7 +2301,9 @@ SdrObject* SdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj, Sd SfxItemSet aSet( pSdrModel->GetItemPool() ); ApplyAttributes( rStCtrl, aSet, pPresObj ); - pPresObj->NbcSetAttributes( aSet, FALSE ); + +//-/ pPresObj->NbcSetAttributes( aSet, FALSE ); + pPresObj->SetItemSet(aSet); if ( ( eAktPageKind != PPT_NOTEPAGE ) && ( pSlideLayout->aPlacementId[ i ] != -1 ) ) { diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index 21b345317f90..eee563140355 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.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:48:33 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:41:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -137,8 +137,11 @@ SdMorphDlg::SdMorphDlg( Window* pParent, const SdrObject* pObj1, const SdrObject SfxItemSet aSet1( *pPool ); SfxItemSet aSet2( *pPool ); - pObj1->TakeAttributes( aSet1, TRUE, FALSE ); - pObj2->TakeAttributes( aSet2, TRUE, FALSE ); +//-/ pObj1->TakeAttributes( aSet1, TRUE, FALSE ); + aSet1.Put(pObj1->GetItemSet()); + +//-/ pObj2->TakeAttributes( aSet2, TRUE, FALSE ); + aSet2.Put(pObj2->GetItemSet()); const XLineStyle eLineStyle1 = ( (const XLineStyleItem&) aSet1.Get( XATTR_LINESTYLE ) ).GetValue(); const XLineStyle eLineStyle2 = ( (const XLineStyleItem&) aSet2.Get( XATTR_LINESTYLE ) ).GetValue(); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 1095751ee282..2c201206e8f7 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docshel4.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: pw $ $Date: 2000-10-27 14:29:25 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:42:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -132,9 +132,6 @@ #ifndef _SVXMSBAS_HXX #include <svx/svxmsbas.hxx> #endif -#ifndef INCLUDED_SVTOOLS_SAVEOPT_HXX -#include <svtools/saveopt.hxx> -#endif #pragma hdrstop @@ -600,17 +597,16 @@ BOOL SdDrawDocShell::Save() } // komprimiert/native speichern? - SvtSaveOptions aOptions; - const SvtSaveOptions::SaveGraphicsMode eSaveMode( aOptions.GetSaveGraphicsMode() ); - const BOOL bSaveCompressed = ( SvtSaveOptions::SaveGraphicsCompressed == eSaveMode ); - const BOOL bSaveNative = ( SvtSaveOptions::SaveGraphicsOriginal == eSaveMode ); - + BOOL bSaveCompressed = SFX_APP()->GetOptions().IsSaveGraphicsCompressed(); pDoc->SetSaveCompressed( bSaveCompressed ); + BOOL bSaveNative = SFX_APP()->GetOptions().IsSaveOriginalGraphics(); pDoc->SetSaveNative( bSaveNative ); if( bRet ) { - pDoc->PrepareStore(); + // prepare saving, pre-processing of objects +//-/ pDoc->PrepareStore(); + pDoc->PreSave(); SvStorage* pStor = GetStorage(); SvStorageStreamRef aPoolStm = pStor->OpenStream(pSfxStyleSheets, STREAM_READ | STREAM_WRITE | STREAM_TRUNC); @@ -687,6 +683,8 @@ BOOL SdDrawDocShell::Save() if (bRet && GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) AddXMLAsZipToTheStorage( *pStor ); + // save complete, post-process objects + pDoc->PostSave(); } if( pProgress ) @@ -728,12 +726,9 @@ BOOL SdDrawDocShell::SaveAs( SvStorage * pStor ) } } // komprimiert/native speichern? - SvtSaveOptions aOptions; - const SvtSaveOptions::SaveGraphicsMode eSaveMode( aOptions.GetSaveGraphicsMode() ); - const BOOL bSaveCompressed = ( SvtSaveOptions::SaveGraphicsCompressed == eSaveMode ); - const BOOL bSaveNative = ( SvtSaveOptions::SaveGraphicsOriginal == eSaveMode ); - + BOOL bSaveCompressed = SFX_APP()->GetOptions().IsSaveGraphicsCompressed(); pDoc->SetSaveCompressed( bSaveCompressed ); + BOOL bSaveNative = SFX_APP()->GetOptions().IsSaveOriginalGraphics(); pDoc->SetSaveNative( bSaveNative ); if (GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) @@ -760,7 +755,10 @@ BOOL SdDrawDocShell::SaveAs( SvStorage * pStor ) if (bRet) { - pDoc->PrepareStore(); + // prepare saving, pre-processing of objects +//-/ pDoc->PrepareStore(); + pDoc->PreSave(); + SvStorageStreamRef aStm = pStor->OpenStream(pSfxStyleSheets, STREAM_READ | STREAM_WRITE | STREAM_TRUNC); aStm->SetVersion(pStor->GetVersion()); @@ -821,6 +819,9 @@ BOOL SdDrawDocShell::SaveAs( SvStorage * pStor ) if ( !bRet || aStm->GetErrorCode() ) SetError( aStm->GetErrorCode() ); } + + // save complete, post-process objects + pDoc->PostSave(); } if (bRet && GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index db0835c0a7b9..5e66fa7fae67 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fucon3d.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: tbe $ $Date: 2000-10-23 10:26:10 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:46:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,6 +100,10 @@ #include "fucon3d.hxx" #include "drawdoc.hxx" +#ifndef _SVX3DITEMS_HXX +#include <svx/svx3ditems.hxx> +#endif + class SfxRequest; class SdDrawDocument; @@ -179,7 +183,8 @@ BOOL FuConst3dObj::MouseButtonDown(const MouseEvent& rMEvt) // Dies ist ein offenes Objekt, muss daher defaultmaessig // doppelseitig behandelt werden - p3DObj->SetDoubleSided(TRUE); +//-/ p3DObj->SetDoubleSided(TRUE); + p3DObj->SetItem(Svx3DDoubleSidedItem(TRUE)); } break; @@ -278,7 +283,8 @@ BOOL FuConst3dObj::MouseButtonDown(const MouseEvent& rMEvt) p3DObj = new E3dLatheObj( pView->Get3DDefaultAttributes(), aXPoly); - ((E3dLatheObj*)p3DObj)->SetHSegments(4); +//-/ ((E3dLatheObj*)p3DObj)->SetHSegments(4); + p3DObj->SetItem(Svx3DHorizontalSegmentsItem(4)); } break; } @@ -297,11 +303,11 @@ BOOL FuConst3dObj::MouseButtonDown(const MouseEvent& rMEvt) Vector3D aMaxVec (aBoundVol.MaxVec ()); double fDeepth = fabs (aMaxVec.Z () - aMinVec.Z ()); - aCamera.SetPRP (Vector3D (0, 0, 1000)); - aCamera.SetPosition (Vector3D (pView->DefaultCamPos ().X (), pView->DefaultCamPos ().Y (), - pView->DefaultCamPos ().Z () + fDeepth / 2)); - aCamera.SetFocalLength(pView->DefaultCamFocal ()); - pScene->SetCamera (aCamera); + aCamera.SetPRP(Vector3D(0, 0, 1000)); + aCamera.SetPosition(Vector3D( + 0.0, 0.0, pView->GetDefaultCamPosZ() + fDeepth / 2)); + aCamera.SetFocalLength(pView->GetDefaultCamFocal()); + pScene->SetCamera(aCamera); switch (nSlotId) { @@ -369,7 +375,11 @@ BOOL FuConst3dObj::MouseButtonDown(const MouseEvent& rMEvt) pScene->FitSnapRectToBoundVol(); SfxItemSet aAttr (pViewShell->GetPool()); - pScene->SetAttributes (aAttr, FALSE); + +//-/ pScene->SetAttributes (aAttr, FALSE); +//-/ SdrBroadcastItemChange aItemChange(*pScene); + pScene->SetItemSetAndBroadcast(aAttr); +//-/ pScene->BroadcastItemChange(aItemChange); bReturn = pView->BegCreateObj(aPnt, (OutputDevice*) NULL, nDrgLog); @@ -383,7 +393,8 @@ BOOL FuConst3dObj::MouseButtonDown(const MouseEvent& rMEvt) // LineStyle rausnehmen aAttr.Put(XLineStyleItem (XLINE_NONE)); - pObj->NbcSetAttributes(aAttr, FALSE); +//-/ pObj->NbcSetAttributes(aAttr, FALSE); + pObj->SetItemSet(aAttr); } } diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index 114743d654e9..507cb52d850c 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fuconarc.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: tbe $ $Date: 2000-10-23 10:27:12 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:46:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -178,7 +178,9 @@ BOOL FuConstArc::MouseButtonDown( const MouseEvent& rMEvt ) { SfxItemSet aAttr(pDoc->GetPool()); SetStyleSheet(aAttr, pObj); - pObj->NbcSetAttributes(aAttr, FALSE); + +//-/ pObj->NbcSetAttributes(aAttr, FALSE); + pObj->SetItemSet(aAttr); } bReturn = TRUE; diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index d4fb936b8439..e93a7ab88f20 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fuconbez.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: tbe $ $Date: 2000-10-23 10:28:08 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:46:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -178,7 +178,9 @@ BOOL FuConstBezPoly::MouseButtonDown(const MouseEvent& rMEvt) { SfxItemSet aAttr(pDoc->GetPool()); SetStyleSheet(aAttr, pObj); - pObj->NbcSetAttributes(aAttr, FALSE); + +//-/ pObj->NbcSetAttributes(aAttr, FALSE); + pObj->SetItemSet(aAttr); } } diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 0bde6943bec1..d48ad733834b 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fuconrec.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: tbe $ $Date: 2000-10-23 10:30:53 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:46:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -285,7 +285,9 @@ BOOL FuConstRectangle::MouseButtonDown(const MouseEvent& rMEvt) SetStyleSheet(aAttr, pObj); SetAttributes(aAttr, pObj); SetLineEnds(aAttr, pObj); - pObj->NbcSetAttributes(aAttr, FALSE); + +//-/ pObj->NbcSetAttributes(aAttr, FALSE); + pObj->SetItemSet(aAttr); } } diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index c472037fd5e6..a7b2e616a164 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.2 $ + * $Revision: 1.3 $ * - * last change: $Author: tbe $ $Date: 2000-10-23 10:31:42 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:46:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -469,14 +469,18 @@ 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->NbcSetAttributes(aAttr, FALSE); + pObj->SetItemSet(aAttr); } else { // Default-Attr. und "Leere-Fuellung" zuweisen SfxItemSet aAttr(*pView->GetDefaultAttr().Clone()); rAttr.Put(XFillStyleItem(XFILL_NONE)); - pObj->NbcSetAttributes(aAttr, FALSE); + +//-/ pObj->NbcSetAttributes(aAttr, FALSE); + pObj->SetItemSet(aAttr); } } } diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index e1be05b5ebdb..c02a069256ef 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.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:48:35 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:46:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -234,7 +234,9 @@ 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->NbcSetAttributes(aAttr, TRUE); + pTextObj->SetItemSet(aAttr); } } diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index 723f3b4023a6..8e2ddb0e87da 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fumorph.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:48:35 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:46:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -290,8 +290,11 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, BOOL bIgnoreLine = FALSE; BOOL bIgnoreFill = FALSE; - pObj1->TakeAttributes( aSet1, TRUE, FALSE ); - pObj2->TakeAttributes( aSet2, TRUE, FALSE ); +//-/ pObj1->TakeAttributes( aSet1, TRUE, FALSE ); + aSet1.Put(pObj1->GetItemSet()); + +//-/ pObj2->TakeAttributes( aSet2, TRUE, FALSE ); + aSet2.Put(pObj2->GetItemSet()); const XLineStyle eLineStyle1 = ITEMVALUE( aSet1, XATTR_LINESTYLE, XLineStyleItem ); const XLineStyle eLineStyle2 = ITEMVALUE( aSet2, XATTR_LINESTYLE, XLineStyleItem ); @@ -361,7 +364,11 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, if ( bLineWidth ) aSet.Put( XLineWidthItem( nStartLineWidth + (long) ( fFactor * fDelta + 0.5 ) ) ); - pNewObj->SetAttributes( aSet, FALSE ); +//-/ pNewObj->SetAttributes( aSet, FALSE ); +//-/ SdrBroadcastItemChange aItemChange(*pNewObj); + pNewObj->SetItemSetAndBroadcast(aSet); +//-/ pNewObj->BroadcastItemChange(aItemChange); + pObjList->InsertObject( pNewObj, LIST_APPEND ); } diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 6fd8bb2a65a2..0514b05a99bc 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.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:48:35 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:46:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -316,7 +316,8 @@ FuPage::FuPage( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView, SdrObject* pObj = pPage->GetBackgroundObj(); if( pObj ) { - pObj->TakeAttributes( aMergedAttr, TRUE, TRUE ); +//-/ pObj->TakeAttributes( aMergedAttr, TRUE, TRUE ); + aMergedAttr.Put(pObj->GetItemSet()); } else { @@ -426,7 +427,8 @@ FuPage::FuPage( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView, { // BackgroundObj: no hard attributes allowed SfxItemSet aSet( pDoc->GetPool() ); - pObj->NbcSetAttributes( aSet, TRUE ); +//-/ pObj->NbcSetAttributes( aSet, TRUE ); + pObj->SetItemSet(aSet); } aNewAttr.Put(aTempSet); @@ -553,7 +555,9 @@ FuPage::FuPage( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView, aSize.Height() -= nUpper + nLower - 1; Rectangle aRect( aPos, aSize ); pObj->SetLogicRect( aRect ); - pObj->NbcSetAttributes( *pArgs, FALSE ); + +//-/ pObj->NbcSetAttributes( *pArgs, FALSE ); + pObj->SetItemSet(*pArgs); } /////////////////////////////////////////////////////////////////////////// diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index a61a5adffdce..29e32cdca8e8 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fusel.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: tbe $ $Date: 2000-10-23 10:36:51 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:46:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1162,7 +1162,10 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) if (bClosed) { SfxItemSet aSet(pDoc->GetPool()); - pObj->TakeAttributes(aSet, TRUE, FALSE); + +//-/ pObj->TakeAttributes(aSet, TRUE, FALSE); + aSet.Put(pObj->GetItemSet()); + const XFillStyleItem& rFillStyle = (const XFillStyleItem&) aSet.Get(XATTR_FILLSTYLE); bFilled = rFillStyle.GetValue() != XFILL_NONE; } diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index 93142a60b1ed..cf050b6d89ca 100644 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fusumry.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:48:36 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:46:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -240,7 +240,9 @@ FuSummaryPage::FuSummaryPage(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->NbcSetAttributes(aAttr, TRUE); + pTextObj->SetItemSet(aAttr); pView->EndUndo(); delete pOutl; diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 88d627b52b9e..ec1734cb7583 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: futempl.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: tbe $ $Date: 2000-10-23 10:37:36 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:46:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -404,7 +404,7 @@ FuTemplate::FuTemplate( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView, // BulletItems if (aTempSet.GetItemState(EE_PARA_BULLET) == SFX_ITEM_SET) { - SvxBulletItem aOldBulItem((SvxBulletItem&)pStyleSheet->GetItemSet().Get(EE_PARA_BULLET)); + SvxBulletItem aOldBulItem((SvxBulletItem&)pStyleSheet->GetItem(EE_PARA_BULLET)); SvxBulletItem& rNewBulItem = (SvxBulletItem&)aTempSet.Get(EE_PARA_BULLET); aOldBulItem.CopyValidProperties(rNewBulItem); aTempSet.Put(aOldBulItem); diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 61ff5d9e1a9d..a8f5b8603d21 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: futext.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: dl $ $Date: 2000-10-25 10:28:40 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:46:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -624,11 +624,16 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) aSet.Put(aMinHeight); SdrTextAutoGrowHeightItem aAutoGrowHeight(TRUE); aSet.Put(aAutoGrowHeight); - pTextObj->NbcSetAttributes(aSet, FALSE); + +//-/ pTextObj->NbcSetAttributes(aSet, FALSE); + pTextObj->SetItemSet(aSet); + pTextObj->AdjustTextFrameWidthAndHeight(); SdrTextMaxFrameHeightItem aMaxHeight(pTextObj->GetLogicRect().GetSize().Height()); aSet.Put(aMaxHeight); - pTextObj->NbcSetAttributes(aSet, FALSE); + +//-/ pTextObj->NbcSetAttributes(aSet, FALSE); + pTextObj->SetItemSet(aSet); } if (!pView->EndCreateObj(SDRCREATE_FORCEEND)) @@ -645,7 +650,10 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) aSet.Put(SdrTextFitToSizeTypeItem(eFTS)); aSet.Put(SdrTextAutoGrowHeightItem(FALSE)); aSet.Put(SdrTextAutoGrowWidthItem(FALSE)); - pTextObj->NbcSetAttributes(aSet, FALSE); + +//-/ pTextObj->NbcSetAttributes(aSet, FALSE); + pTextObj->SetItemSet(aSet); + pTextObj->AdjustTextFrameWidthAndHeight(); SetInEditMode(rMEvt, FALSE); } @@ -662,7 +670,10 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) aSet.Put(aMaxHeight); SdrTextAutoGrowHeightItem aAutoGrowHeight(TRUE); aSet.Put(aAutoGrowHeight); - pTextObj->NbcSetAttributes(aSet, FALSE); + +//-/ pTextObj->NbcSetAttributes(aSet, FALSE); + pTextObj->SetItemSet(aSet); + pTextObj->AdjustTextFrameWidthAndHeight(); } @@ -744,7 +755,10 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) aSet.Put(aAutoGrowWidth); SdrTextHorzAdjustItem aTextHorzAdjust(SDRTEXTHORZADJUST_LEFT); aSet.Put(aTextHorzAdjust); - pTextObj->NbcSetAttributes(aSet, FALSE); + +//-/ pTextObj->NbcSetAttributes(aSet, FALSE); + pTextObj->SetItemSet(aSet); + pTextObj->SetDisableAutoWidthOnDragging(TRUE); SetInEditMode(rMEvt, FALSE); } diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 80e7fe557b96..83ef4360b56b 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unopage.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: sj $ $Date: 2000-10-25 09:49:14 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:47:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1335,7 +1335,9 @@ void SdDrawPage::setBackground( const uno::Any& rValue ) pBackground->fillItemSet( (SdDrawDocument*)mpPage->GetModel(), aSet ); } - pObj->NbcSetAttributes( aSet, sal_False ); +//-/ pObj->NbcSetAttributes( aSet, sal_False ); + pObj->SetItemSet(aSet); + mpPage->SendRepaintBroadcast(); } @@ -1637,7 +1639,9 @@ void SdMasterPage::setBackground( const uno::Any& rValue ) pBackground->fillItemSet( (SdDrawDocument*)mpPage->GetModel(), aSet ); } - pObj->NbcSetAttributes( aSet, sal_False ); +//-/ pObj->NbcSetAttributes( aSet, sal_False ); + pObj->SetItemSet(aSet); + mpPage->SendRepaintBroadcast(); } } diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index bb762d09c268..97b2b4a5286e 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unopback.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: cl $ $Date: 2000-09-29 12:52:40 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:47:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -108,7 +108,9 @@ SdUnoPageBackground::SdUnoPageBackground( SdDrawDocument* pDoc /* = NULL */, Sdr { StartListening( *pDoc ); mpSet = new SfxItemSet( pDoc->GetPool(), XATTR_FILL_FIRST, XATTR_FILLRESERVED_LAST ); - pObj->TakeAttributes( *mpSet, sal_False, sal_False ); + +//-/ pObj->TakeAttributes( *mpSet, sal_False, sal_False ); + mpSet->Put(pObj->GetItemSet()); } } diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 2aa0e2f015f1..fe603c7d2a7e 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drawview.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: ka $ $Date: 2000-10-24 11:19:49 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:50:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1035,7 +1035,9 @@ IMPL_LINK( SdDrawView, PaintProc, SdrPaintProcRec *, pRecord ) SfxItemSet aTempAttr( pDoc->GetPool(), SDRATTR_TEXT_ANIKIND, SDRATTR_TEXT_ANIKIND ); aTempAttr.InvalidateItem( SDRATTR_TEXT_ANIKIND ); aTempAttr.Put( SdrTextAniKindItem() ); - pClone->NbcSetAttributes( aTempAttr, FALSE ); + +//-/ pClone->NbcSetAttributes( aTempAttr, FALSE ); + pClone->SetItemSet(aTempAttr); } pClone->Paint( pRecord->rOut, pRecord->rInfoRec ); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 7927827177ac..1b69b438fe8f 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drviews2.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: tbe $ $Date: 2000-10-23 10:41:02 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:50:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -243,7 +243,9 @@ void SdDrawViewShell::FuTemporary(SfxRequest& rReq) SfxItemSet aAttr(pDoc->GetPool()); pObj = rMarkList.GetMark(i)->GetObj(); // Mergen: TRUE, OnlyHardAttr: FALSE - pObj->TakeAttributes(aAttr, TRUE, FALSE); + +//-/ pObj->TakeAttributes(aAttr, TRUE, FALSE); + aAttr.Put(pObj->GetItemSet()); INT32 nActLineWidth = ((const XLineWidthItem&)aAttr.Get(XATTR_LINEWIDTH)).GetValue(); @@ -272,7 +274,8 @@ void SdDrawViewShell::FuTemporary(SfxRequest& rReq) } if(bSetItemSet) - pObj->NbcSetAttributes(aAttr, FALSE); +//-/ pObj->NbcSetAttributes(aAttr, FALSE); + pObj->SetItemSet(aAttr); } } } @@ -289,7 +292,9 @@ void SdDrawViewShell::FuTemporary(SfxRequest& rReq) SfxItemSet aAttr(pDoc->GetPool()); pObj = rMarkList.GetMark(i)->GetObj(); // Mergen: TRUE, OnlyHardAttr: FALSE - pObj->TakeAttributes(aAttr, TRUE, FALSE); + +//-/ pObj->TakeAttributes(aAttr, TRUE, FALSE); + aAttr.Put(pObj->GetItemSet()); const XFillStyleItem& rFillStyle = (const XFillStyleItem&) aAttr.Get(XATTR_FILLSTYLE); @@ -308,7 +313,9 @@ void SdDrawViewShell::FuTemporary(SfxRequest& rReq) aAttr.Put(XFillStyleItem(XFILL_SOLID)); aAttr.Put(XFillColorItem(String(), COL_WHITE)); - pObj->NbcSetAttributes(aAttr, FALSE); + +//-/ pObj->NbcSetAttributes(aAttr, FALSE); + pObj->SetItemSet(aAttr); } } @@ -1167,7 +1174,10 @@ void SdDrawViewShell::FuTemporary(SfxRequest& rReq) if( pPresObjList->GetPos( pObj ) != LIST_ENTRY_NOTFOUND ) { SfxItemSet* pSet = new SfxItemSet( pDoc->GetPool(), SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT, 0 ); - pObj->TakeAttributes( *pSet, TRUE, TRUE ); + +//-/ pObj->TakeAttributes( *pSet, TRUE, TRUE ); + pSet->Put(pObj->GetItemSet()); + pAttrList->Insert( pSet, LIST_APPEND ); pAttrList->Insert( pObj->GetUserCall(), LIST_APPEND ); } @@ -1217,7 +1227,9 @@ void SdDrawViewShell::FuTemporary(SfxRequest& rReq) SdrTextMinFrameHeightItem aMinHeight( (const SdrTextMinFrameHeightItem&) pSet->Get(SDRATTR_TEXT_MINFRAMEHEIGHT) ); SfxItemSet aTempAttr( pDoc->GetPool(), SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_MINFRAMEHEIGHT, 0 ); aTempAttr.Put( aMinHeight ); - pObj->NbcSetAttributes(aTempAttr, FALSE); + +//-/ pObj->NbcSetAttributes(aTempAttr, FALSE); + pObj->SetItemSet(aTempAttr); } if ( pSet && pSet->GetItemState( SDRATTR_TEXT_AUTOGROWHEIGHT ) == SFX_ITEM_ON ) @@ -1225,7 +1237,9 @@ void SdDrawViewShell::FuTemporary(SfxRequest& rReq) SdrTextAutoGrowHeightItem aAutoGrowHeight( (const SdrTextAutoGrowHeightItem&) pSet->Get(SDRATTR_TEXT_AUTOGROWHEIGHT) ); SfxItemSet aTempAttr( pDoc->GetPool(), SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT, 0 ); aTempAttr.Put( aAutoGrowHeight ); - pObj->NbcSetAttributes(aTempAttr, FALSE); + +//-/ pObj->NbcSetAttributes(aTempAttr, FALSE); + pObj->SetItemSet(aTempAttr); } if( pUserCall ) diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 2eef5e12f6da..ac2fb5de504a 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drviewsb.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: ka $ $Date: 2000-09-21 16:12:20 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:50:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -575,7 +575,9 @@ void SdDrawViewShell::FuTemp02(SfxRequest& rReq) SfxItemSet aAttr( pDoc->GetPool() ); SdrTextAutoGrowWidthItem aAutoGrowWidthOn(TRUE); aAttr.Put( SdrTextAutoGrowWidthItem(TRUE) ); - pRectObj->NbcSetAttributes(aAttr, FALSE); + +//-/ pRectObj->NbcSetAttributes(aAttr, FALSE); + pRectObj->SetItemSet(aAttr); pOutl->UpdateFields(); pOutl->SetUpdateMode( TRUE ); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 5267a3741669..c781f04fb7c7 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: outlnvsh.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: dl $ $Date: 2000-10-25 10:34:04 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:50:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2200,7 +2200,11 @@ BOOL SdOutlineViewShell::UpdateLayoutObject( SdPage* pPage, Paragraph* pPara ) SfxItemSet aTempAttr( pDoc->GetPool() ); aTempAttr.Put( XLineStyleItem( XLINE_NONE ) ); aTempAttr.Put( XFillStyleItem( XFILL_NONE ) ); - pTO->SetAttributes( aTempAttr, FALSE ); + +//-/ pTO->SetAttributes( aTempAttr, FALSE ); +//-/ SdrBroadcastItemChange aItemChange(*pTO); + pTO->SetItemSetAndBroadcast(aTempAttr); +//-/ pTO->BroadcastItemChange(aItemChange); // als Listener anmelden /* diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index eee4e18d4298..338f125fb9f9 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: outlview.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: dl $ $Date: 2000-09-22 08:21:11 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:50:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1313,7 +1313,11 @@ BOOL SdOutlineView::PrepareClose(BOOL bUI) SfxItemSet aTempAttr(pDoc->GetPool()); aTempAttr.Put(XLineStyleItem(XLINE_NONE)); aTempAttr.Put(XFillStyleItem(XFILL_NONE)); - pTO->SetAttributes(aTempAttr, FALSE); + +//-/ pTO->SetAttributes(aTempAttr, FALSE); +//-/ SdrBroadcastItemChange aItemChange(*pTO); + pTO->SetItemSetAndBroadcast(aTempAttr); +//-/ pTO->BroadcastItemChange(aItemChange); // als Listener anmelden for (USHORT i = 1; i < 10; i++) @@ -1376,7 +1380,9 @@ BOOL SdOutlineView::PrepareClose(BOOL bUI) // Untertitel-Objekt statt Gliederung -> Linken Einzug zuruecksetzen SfxItemSet aSet(pDoc->GetPool(), EE_PARA_LRSPACE, EE_PARA_LRSPACE); - pTO->TakeAttributes(aSet, TRUE, FALSE); + +//-/ pTO->TakeAttributes(aSet, TRUE, FALSE); + aSet.Put(pTO->GetItemSet()); if (aSet.GetItemState(EE_PARA_LRSPACE) != SFX_ITEM_SET) { @@ -1384,7 +1390,9 @@ BOOL SdOutlineView::PrepareClose(BOOL bUI) SvxLRSpaceItem aNewLRItem(rLRItem); aNewLRItem.SetTxtLeft(0); aSet.Put(aNewLRItem); - pTO->NbcSetAttributes(aSet, FALSE); + +//-/ pTO->NbcSetAttributes(aSet, FALSE); + pTO->SetItemSet(aSet); } } } @@ -1427,12 +1435,17 @@ BOOL SdOutlineView::PrepareClose(BOOL bUI) // Linken Einzug zuruecksetzen SfxItemSet aSet(pDoc->GetPool(), EE_PARA_LRSPACE, EE_PARA_LRSPACE); - pTO->TakeAttributes(aSet, TRUE, FALSE); + +//-/ pTO->TakeAttributes(aSet, TRUE, FALSE); + aSet.Put(pTO->GetItemSet()); + const SvxLRSpaceItem& rLRItem = (const SvxLRSpaceItem&) aSet.Get(EE_PARA_LRSPACE); SvxLRSpaceItem aNewLRItem(rLRItem); aNewLRItem.SetTxtLeft(0); aSet.Put(aNewLRItem); - pTO->NbcSetAttributes(aSet, FALSE); + +//-/ pTO->NbcSetAttributes(aSet, FALSE); + pTO->SetItemSet(aSet); } pTO->SetEmptyPresObj(TRUE); diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 839e0e3d2386..10e3a231e827 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdview.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:48:44 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:50:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -911,8 +911,11 @@ BOOL SdView::IsMorphingAllowed() const SfxItemSet aSet1( pDoc->GetPool(), XATTR_FILLSTYLE, XATTR_FILLSTYLE ); SfxItemSet aSet2( pDoc->GetPool(), XATTR_FILLSTYLE, XATTR_FILLSTYLE ); - pObj1->TakeAttributes( aSet1, TRUE, FALSE ); - pObj2->TakeAttributes( aSet2, TRUE, FALSE ); +//-/ pObj1->TakeAttributes( aSet1, TRUE, FALSE ); + aSet1.Put(pObj1->GetItemSet()); + +//-/ pObj2->TakeAttributes( aSet2, TRUE, FALSE ); + aSet2.Put(pObj2->GetItemSet()); const XFillStyle eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue(); const XFillStyle eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue(); diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index d37d9eb6fef3..c56026b49308 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdview3.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:48:44 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:50:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -551,7 +551,9 @@ BOOL SdView::InsertData(SvDataObjectRef pDataObject, const Point& rPos, BegUndo(String(SdResId(STR_UNDO_DRAGDROP))); AddUndo(new SdrUndoAttrObj(*pPickObj)); SfxItemSet aSet(pDoc->GetPool()); - pObj->TakeAttributes(aSet, TRUE, FALSE); + +//-/ pObj->TakeAttributes(aSet, TRUE, FALSE); + aSet.Put(pObj->GetItemSet()); // Eckenradius soll nicht uebernommen werden. // In der Gallery stehen Farbverlauefe (Rechtecke) @@ -559,18 +561,30 @@ BOOL SdView::InsertData(SvDataObjectRef pDataObject, const Point& rPos, // nicht auf das Objekt uebertragen werden. aSet.ClearItem(SDRATTR_ECKENRADIUS); - pPickObj->SetAttributes(aSet, FALSE); +//-/ pPickObj->SetAttributes(aSet, FALSE); +//-/ SdrBroadcastItemChange aItemChange(*pPickObj); + pPickObj->SetItemSetAndBroadcast(aSet); +//-/ pPickObj->BroadcastItemChange(aItemChange); if(pPickObj->ISA(E3dObject) && pObj->ISA(E3dObject)) { // Zusaetzlich 3D Attribute handeln SfxItemSet aNewSet(pDoc->GetPool(), SID_ATTR_3D_START, SID_ATTR_3D_END, 0); SfxItemSet aOldSet(pDoc->GetPool(), SID_ATTR_3D_START, SID_ATTR_3D_END, 0); - pPickObj->TakeAttributes(aOldSet, TRUE, TRUE); - pObj->TakeAttributes(aNewSet, TRUE, TRUE); + +//-/ pPickObj->TakeAttributes(aOldSet, TRUE, TRUE); + aOldSet.Put(pPickObj->GetItemSet()); + +//-/ pObj->TakeAttributes(aNewSet, TRUE, TRUE); + aNewSet.Put(pObj->GetItemSet()); + AddUndo(new E3dAttributesUndoAction(*pDoc, this, (E3dObject*)pPickObj, aNewSet, aOldSet, FALSE)); - pPickObj->SetAttributes(aNewSet, FALSE); + +//-/ pPickObj->SetAttributes(aNewSet, FALSE); +//-/ SdrBroadcastItemChange aItemChange(*pPickObj); + pPickObj->SetItemSetAndBroadcast(aNewSet); +//-/ pPickObj->BroadcastItemChange(aItemChange); } EndUndo(); bChanged = TRUE; @@ -900,7 +914,10 @@ BOOL SdView::InsertData(SvDataObjectRef pDataObject, const Point& rPos, // Textfarbe hinzufuegen // aSet.Put(SvxColorItem(aColor, ITEMID_COLOR)); - pPickObj->SetAttributes(aSet, FALSE); +//-/ pPickObj->SetAttributes(aSet, FALSE); +//-/ SdrBroadcastItemChange aItemChange(*pPickObj); + pPickObj->SetItemSetAndBroadcast(aSet); +//-/ pPickObj->BroadcastItemChange(aItemChange); } } } diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx index a8b8ac1ef7d1..b176742acf88 100644 --- a/sd/source/ui/view/sdview5.cxx +++ b/sd/source/ui/view/sdview5.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdview5.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: pw $ $Date: 2000-10-12 11:42:18 $ + * last change: $Author: aw $ $Date: 2000-10-30 11:50:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -229,7 +229,11 @@ SdrGrafObj* SdView::InsertGraphic(const Graphic& rGraphic, DropAction& rAction, SfxItemSet aSet(pDocSh->GetPool(), XATTR_FILLSTYLE, XATTR_FILLBITMAP); aSet.Put(XFillStyleItem(XFILL_BITMAP)); aSet.Put(XFillBitmapItem(&pDocSh->GetPool(), aXOBitmap)); - pPickObj->SetAttributes(aSet, FALSE); + +//-/ pPickObj->SetAttributes(aSet, FALSE); +//-/ SdrBroadcastItemChange aItemChange(*pPickObj); + pPickObj->SetItemSetAndBroadcast(aSet); +//-/ pPickObj->BroadcastItemChange(aItemChange); } } else if ( pPV ) |